From 336d980b7b514a2d873b1c76773bff19dd5cc3ad Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Thu, 21 Sep 2023 11:27:32 -0500 Subject: [PATCH] [#378] Java package refactor jaxb2_commons to jaxb --- .../plugin/AnnotationTarget.java | 10 +- .../plugin/annotate/AnnotatePlugin.java | 10 +- .../annotate/AnnotatingArrayValueVisitor.java | 4 +- .../AnnotatingSingleValueVisitor.java | 4 +- .../plugin/annotate/AnnotatingVisitor.java | 2 +- .../plugin/annotate/Annotator.java | 2 +- .../RemoveAnnotationPlugin.java | 8 +- .../services/com.sun.tools.xjc.Plugin | 4 +- .../plugin/annotate/tests/A.java | 2 +- .../plugin/annotate/tests/B.java | 2 +- .../plugin/annotate/tests/D.java | 2 +- .../plugin/annotate/tests/E.java | 2 +- .../plugin/annotate/tests/F.java | 2 +- .../plugin/src/test/resources/schema.xsd | 62 ++++---- .../samples/annotate/project-build.xml | 2 +- .../samples/annotate/project-pom.xml | 2 +- .../tests/annotate/IssueJAP9TypeTest.java | 2 +- .../tests/annotate/RunAnnotatePlugin.java | 2 +- .../{jaxb2_commons => jaxb}/xjc/XJCTask.java | 2 +- .../i18n/Reportable.java | 2 +- .../lang/ClassUtils.java | 2 +- .../lang/ContextUtils.java | 2 +- .../lang/CopyStrategy.java | 4 +- .../lang/CopyStrategy2.java | 4 +- .../{jaxb2_commons => jaxb}/lang/CopyTo.java | 4 +- .../{jaxb2_commons => jaxb}/lang/CopyTo2.java | 4 +- .../lang/DefaultCopyStrategy.java | 6 +- .../lang/DefaultEqualsStrategy.java | 6 +- .../lang/DefaultHashCodeStrategy.java | 6 +- .../lang/DefaultMergeStrategy.java | 4 +- .../lang/DefaultToStringStrategy.java | 8 +- .../lang/EnumValue.java | 2 +- .../{jaxb2_commons => jaxb}/lang/Equals.java | 4 +- .../{jaxb2_commons => jaxb}/lang/Equals2.java | 4 +- .../lang/EqualsStrategy.java | 4 +- .../lang/EqualsStrategy2.java | 4 +- .../lang/HashCode.java | 4 +- .../lang/HashCode2.java | 4 +- .../lang/HashCodeStrategy.java | 4 +- .../lang/HashCodeStrategy2.java | 4 +- .../lang/JAXBCopyStrategy.java | 8 +- .../lang/JAXBEqualsStrategy.java | 10 +- .../lang/JAXBHashCodeStrategy.java | 10 +- .../lang/JAXBMergeCollectionsStrategy.java | 4 +- .../lang/JAXBMergeStrategy.java | 4 +- .../lang/JAXBToStringStrategy.java | 6 +- .../lang/MergeFrom.java | 4 +- .../lang/MergeFrom2.java | 4 +- .../lang/MergeStrategy.java | 4 +- .../lang/MergeStrategy2.java | 4 +- .../lang/StringUtils.java | 2 +- .../lang/ToString.java | 4 +- .../lang/ToString2.java | 4 +- .../lang/ToStringStrategy.java | 4 +- .../lang/ToStringStrategy2.java | 4 +- .../lang/Validate.java | 2 +- .../locator/AbstractObjectLocator.java | 2 +- .../locator/DefaultItemObjectLocator.java | 2 +- .../locator/DefaultPropertyObjectLocator.java | 2 +- .../locator/DefaultRootObjectLocator.java | 2 +- .../locator/ItemObjectLocator.java | 2 +- .../locator/ObjectLocator.java | 6 +- .../locator/PropertyObjectLocator.java | 2 +- .../locator/RootObjectLocator.java | 2 +- .../locator/util/LocatorUtils.java | 8 +- .../xml/bind/AfterMarshallCallback.java | 2 +- .../xml/bind/AfterUnmarshallCallback.java | 2 +- .../xml/bind/BeforeMarshallCallback.java | 2 +- .../xml/bind/BeforeUnmarshallCallback.java | 2 +- .../xml/bind/ContextPathAware.java | 2 +- .../adapters/CommaDelimitedStringAdapter.java | 6 +- .../bind/model/MAnyAttributePropertyInfo.java | 2 +- .../bind/model/MAnyElementPropertyInfo.java | 2 +- .../bind/model/MAttributePropertyInfo.java | 2 +- .../jaxb/xml/bind/model/MBuiltinLeafInfo.java | 9 ++ .../xml/bind/model/MClassInfo.java | 4 +- .../jvnet/jaxb/xml/bind/model/MClassRef.java | 7 + .../xml/bind/model/MClassTypeInfo.java | 4 +- .../xml/bind/model/MClassTypeInfoVisitor.java | 2 +- .../xml/bind/model/MContained.java | 2 +- .../xml/bind/model/MContainer.java | 2 +- .../xml/bind/model/MCustomizable.java | 2 +- .../jaxb/xml/bind/model/MCustomization.java | 5 + .../xml/bind/model/MCustomizations.java | 2 +- .../xml/bind/model/MDefaultValue.java | 2 +- .../jvnet/jaxb/xml/bind/model/MElement.java | 8 + .../xml/bind/model/MElementInfo.java | 4 +- .../xml/bind/model/MElementPropertyInfo.java | 4 +- .../bind/model/MElementRefPropertyInfo.java | 4 +- .../bind/model/MElementRefsPropertyInfo.java | 4 +- .../xml/bind/model/MElementTypeInfo.java | 4 +- .../xml/bind/model/MElementTypeInfos.java | 2 +- .../jaxb/xml/bind/model/MElementTypeRef.java | 8 + .../xml/bind/model/MElementsPropertyInfo.java | 4 +- .../xml/bind/model/MEnumConstantInfo.java | 10 ++ .../xml/bind/model/MEnumLeafInfo.java | 6 +- .../xml/bind/model/MID.java | 2 +- .../xml/bind/model/MIDREF.java | 2 +- .../xml/bind/model/MIDREFS.java | 2 +- .../xml/bind/model/MList.java | 2 +- .../xml/bind/model/MMixable.java | 2 +- .../xml/bind/model/MModelInfo.java | 6 +- .../xml/bind/model/MNillable.java | 2 +- .../jaxb/xml/bind/model/MPackageInfo.java | 12 ++ .../xml/bind/model/MPackaged.java | 2 +- .../xml/bind/model/MPackagedTypeInfo.java | 2 +- .../bind/model/MPackagedTypeInfoVisitor.java | 2 +- .../xml/bind/model/MPropertyInfo.java | 6 +- .../xml/bind/model/MPropertyInfoVisitor.java | 2 +- .../bind/model/MSingleTypePropertyInfo.java | 2 +- .../xml/bind/model/MSourced.java | 2 +- .../xml/bind/model/MTargeted.java | 2 +- .../bind/model/MTransientPropertyInfo.java | 5 + .../xml/bind/model/MTypeInfo.java | 2 +- .../xml/bind/model/MTypeInfoVisitor.java | 2 +- .../xml/bind/model/MTyped.java | 2 +- .../xml/bind/model/MValuePropertyInfo.java | 2 +- .../xml/bind/model/MWildcard.java | 2 +- .../xml/bind/model/MWildcardTypeInfo.java | 9 ++ .../xml/bind/model/MWrappable.java | 2 +- .../concrete/CMAnyAttributePropertyInfo.java | 10 +- .../concrete/CMAnyElementPropertyInfo.java | 10 +- .../concrete/CMAttributePropertyInfo.java | 14 +- .../model/concrete/CMBuiltinLeafInfo.java | 12 +- .../xml/bind/model/concrete/CMClassInfo.java | 29 ++-- .../xml/bind/model/concrete/CMClassRef.java | 20 +-- .../bind/model/concrete/CMCustomization.java | 4 +- .../bind/model/concrete/CMCustomizations.java | 8 +- .../xml/bind/model/concrete/CMElement.java | 8 +- .../bind/model/concrete/CMElementInfo.java | 16 +- .../model/concrete/CMElementPropertyInfo.java | 12 +- .../concrete/CMElementRefPropertyInfo.java | 12 +- .../concrete/CMElementRefsPropertyInfo.java | 14 +- .../model/concrete/CMElementTypeInfo.java | 8 +- .../bind/model/concrete/CMElementTypeRef.java | 8 +- .../concrete/CMElementsPropertyInfo.java | 14 +- .../model/concrete/CMEnumConstantInfo.java | 10 +- .../bind/model/concrete/CMEnumLeafInfo.java | 31 ++-- .../xml/bind/model/concrete/CMID.java | 14 +- .../xml/bind/model/concrete/CMIDREF.java | 14 +- .../xml/bind/model/concrete/CMIDREFS.java | 10 +- .../bind/model/concrete/CMInfoFactory.java | 71 ++++----- .../xml/bind/model/concrete/CMList.java | 12 +- .../xml/bind/model/concrete/CMModel.java | 29 ++-- .../bind/model/concrete/CMPackageInfo.java | 10 +- .../bind/model/concrete/CMPropertyInfo.java | 14 +- .../concrete/CMSingleTypePropertyInfo.java | 12 +- .../model/concrete/CMValuePropertyInfo.java | 12 +- .../model/concrete/CMWildcardTypeInfo.java | 12 +- .../origin/BuiltinLeafInfoOrigin.java | 5 +- .../CMAnyAttributePropertyInfoOrigin.java | 7 + .../origin/CMBuiltinLeafInfoOrigin.java | 7 +- .../origin/CMClassElementInfoOrigin.java | 7 +- .../concrete/origin/CMClassInfoOrigin.java | 9 +- .../concrete/origin/CMElementInfoOrigin.java | 7 +- .../concrete/origin/CMElementOrigin.java | 7 +- .../origin/CMElementTypeRefOrigin.java | 7 +- .../origin/CMEnumConstantInfoOrigin.java | 7 +- .../origin/CMEnumElementInfoOrigin.java | 7 +- .../concrete/origin/CMEnumLeafInfoOrigin.java | 9 +- .../concrete/origin/CMModelInfoOrigin.java | 7 +- .../concrete/origin/CMPackageInfoOrigin.java | 7 + .../concrete/origin/CMPropertyInfoOrigin.java | 7 +- .../origin/CMWildcardTypeInfoOrigin.java | 7 +- .../concrete/origin/ClassInfoOrigin.java | 5 +- .../concrete/origin/ElementInfoOrigin.java | 5 +- .../model/concrete/origin/ElementOrigin.java | 5 +- .../concrete/origin/EnumConstantOrigin.java | 5 +- .../concrete/origin/EnumLeafInfoOrigin.java | 5 +- .../concrete/origin/PropertyInfoOrigin.java | 5 +- .../concrete/origin/TypeInfoSetOrigin.java | 5 +- .../origin/WildcardTypeInfoOrigin.java | 5 +- .../model/origin/MBuiltinLeafInfoOrigin.java | 5 + .../bind/model/origin/MClassInfoOrigin.java | 2 +- .../bind/model/origin/MClassRefOrigin.java | 5 + .../bind/model/origin/MElementInfoOrigin.java | 5 + .../xml/bind/model/origin/MElementOrigin.java | 2 +- .../model/origin/MElementTypeRefOrigin.java | 2 +- .../model/origin/MEnumConstantInfoOrigin.java | 5 + .../model/origin/MEnumLeafInfoOrigin.java | 2 +- .../bind/model/origin/MModelInfoOrigin.java | 5 + .../xml/bind/model/origin/MOriginated.java | 2 +- .../bind/model/origin/MPackageInfoOrigin.java | 5 + .../model/origin/MPropertyInfoOrigin.java | 5 + .../model/origin/MWildcardTypeInfoOrigin.java | 5 + .../util/DefaultPropertyInfoVisitor.java | 24 +-- .../model/util/DefaultTypeInfoVisitor.java | 26 +-- .../model/util/PackageInfoQNameAnalyzer.java | 16 +- .../QNameCollectingPropertyInfoVisitor.java | 26 +-- .../xml/bind/model/util/QNameCollector.java | 2 +- .../xml/bind/model/util/XmlTypeUtils.java | 5 +- .../xml/namespace/util/QNameUtils.java | 2 +- .../xmlschema/XmlSchemaConstants.java | 2 +- .../xml/bind/model/MBuiltinLeafInfo.java | 9 -- .../xml/bind/model/MClassRef.java | 7 - .../xml/bind/model/MCustomization.java | 5 - .../xml/bind/model/MElement.java | 8 - .../xml/bind/model/MElementTypeRef.java | 8 - .../xml/bind/model/MEnumConstantInfo.java | 10 -- .../xml/bind/model/MPackageInfo.java | 12 -- .../bind/model/MTransientPropertyInfo.java | 5 - .../xml/bind/model/MWildcardTypeInfo.java | 9 -- .../CMAnyAttributePropertyInfoOrigin.java | 7 - .../concrete/origin/CMPackageInfoOrigin.java | 7 - .../model/origin/MBuiltinLeafInfoOrigin.java | 5 - .../bind/model/origin/MClassRefOrigin.java | 5 - .../bind/model/origin/MElementInfoOrigin.java | 5 - .../model/origin/MEnumConstantInfoOrigin.java | 5 - .../bind/model/origin/MModelInfoOrigin.java | 5 - .../bind/model/origin/MPackageInfoOrigin.java | 5 - .../model/origin/MPropertyInfoOrigin.java | 5 - .../model/origin/MWildcardTypeInfoOrigin.java | 5 - .../lang/tests/CopyStrategyTest.java | 10 +- .../lang/tests/CyclicTests.java | 14 +- .../lang/tests/DefaultCopyStrategyTest.java | 6 +- .../lang/tests/pojo/CloneableNoClone.java | 2 +- .../model/util/tests/XmlTypeUtilsTest.java | 150 ++++++++++++++++++ .../xml/bind/model/util/tests/alpha/A1.java | 5 + .../xml/bind/model/util/tests/alpha}/A2.java | 2 +- .../xml/bind/model/util/tests/alpha}/A3.java | 2 +- .../xml/bind/model/util/tests/alpha}/A4.java | 2 +- .../xml/bind/model/util/tests/alpha}/A5.java | 2 +- .../xml/bind/model/util/tests/alpha}/A6.java | 2 +- .../xml/bind/model/util/tests/alpha}/A7.java | 2 +- .../xml/bind/model/util/tests/alpha}/A8.java | 2 +- .../xml/bind/model/util/tests/alpha}/A9.java | 2 +- .../xml/bind/model/util/tests/beta/A1.java | 5 + .../xml/bind/model/util/tests/beta}/A2.java | 2 +- .../xml/bind/model/util/tests/beta}/A3.java | 2 +- .../xml/bind/model/util/tests/beta}/A4.java | 2 +- .../xml/bind/model/util/tests/beta}/A5.java | 2 +- .../xml/bind/model/util/tests/beta}/A6.java | 2 +- .../xml/bind/model/util/tests/beta}/A7.java | 2 +- .../xml/bind/model/util/tests/beta}/A8.java | 2 +- .../xml/bind/model/util/tests/beta}/A9.java | 2 +- .../model/util/tests/beta/package-info.java | 5 + .../xml/bind/model/util/tests/delta/A1.java | 5 + .../xml/bind/model/util/tests/delta}/A2.java | 2 +- .../xml/bind/model/util/tests/delta}/A3.java | 2 +- .../xml/bind/model/util/tests/delta}/A4.java | 2 +- .../xml/bind/model/util/tests/delta}/A5.java | 2 +- .../xml/bind/model/util/tests/delta}/A6.java | 2 +- .../xml/bind/model/util/tests/delta}/A7.java | 2 +- .../xml/bind/model/util/tests/delta}/A8.java | 2 +- .../xml/bind/model/util/tests/delta/A9.java | 2 +- .../model/util/tests/delta/package-info.java | 2 +- .../xml/bind/model/util/tests/gamma/A1.java | 5 + .../xml/bind/model/util/tests/gamma}/A2.java | 2 +- .../xml/bind/model/util/tests/gamma/A3.java | 2 +- .../xml/bind/model/util/tests/gamma/A4.java | 2 +- .../xml/bind/model/util/tests/gamma}/A5.java | 2 +- .../xml/bind/model/util/tests/gamma}/A6.java | 2 +- .../xml/bind/model/util/tests/gamma/A7.java | 2 +- .../xml/bind/model/util/tests/gamma/A8.java | 2 +- .../xml/bind/model/util/tests/gamma/A9.java | 2 +- .../model/util/tests/gamma/package-info.java | 2 +- .../namespace/util/tests/QNameUtilsTest.java | 4 +- .../model/util/tests/XmlTypeUtilsTest.java | 150 ------------------ .../xml/bind/model/util/tests/alpha/A1.java | 5 - .../xml/bind/model/util/tests/beta/A1.java | 5 - .../model/util/tests/beta/package-info.java | 5 - .../xml/bind/model/util/tests/delta/A1.java | 5 - .../xml/bind/model/util/tests/gamma/A1.java | 5 - .../lang/tests/Test[0].xml | 0 .../java/org/jvnet/jaxb/plugin/Dummy.java | 3 + .../org/jvnet/jaxb2_commons/plugin/Dummy.java | 3 - .../lang/ExtendedJAXBEqualsStrategy.java | 6 +- .../test/AbstractSamplesTest.java | 2 +- .../test/tests/TrivialSamplesTest.java | 4 +- .../codemodel/DefaultJCMTypeVisitor.java | 2 +- .../codemodel/JCMArrayClass.java | 2 +- .../codemodel/JCMClass.java | 2 +- .../codemodel/JCMNullType.java | 2 +- .../codemodel/JCMPrimitiveType.java | 2 +- .../codemodel/JCMType.java | 2 +- .../codemodel/JCMTypeFactory.java | 2 +- .../codemodel/JCMTypeVar.java | 2 +- .../codemodel/JCMTypeVisitor.java | 2 +- .../codemodel/JCMTypeWildcard.java | 2 +- .../codemodel/JConditionable.java | 2 +- .../plugin/AbstractParameterizablePlugin.java | 2 +- .../plugin/AbstractPlugin.java | 2 +- .../AbstractSpringConfigurablePlugin.java | 4 +- .../reflection/util/Accessor.java | 2 +- .../reflection/util/FieldAccessor.java | 2 +- .../strategy/ClassOutlineProcessor.java | 2 +- .../strategy/FieldOutlineProcessor.java | 2 +- .../strategy/OutlineProcessor.java | 2 +- .../strategy/PackageOutlineProcessor.java | 2 +- .../impl/DefaultOutlineProcessor.java | 6 +- .../util/ClassUtils.java | 2 +- .../util/CodeModelUtils.java | 2 +- .../util/CustomizationUtils.java | 2 +- .../util/FieldAccessorFactory.java | 4 +- .../util/FieldAccessorUtils.java | 2 +- .../util/FieldUtils.java | 2 +- .../util/GeneratorContextUtils.java | 4 +- .../util/JClassUtils.java | 2 +- .../util/OutlineUtils.java | 2 +- .../util/PropertyFieldAccessorFactory.java | 4 +- .../xjc/generator/MClassOutlineGenerator.java | 16 ++ .../generator/MElementOutlineGenerator.java | 17 ++ .../MEnumConstantOutlineGenerator.java | 10 +- .../xjc/generator/MEnumOutlineGenerator.java | 16 ++ .../xjc/generator/MModelOutlineGenerator.java | 6 +- .../MObjectFactoryOutlineGenerator.java | 16 ++ .../generator/MPackageOutlineGenerator.java | 16 ++ .../generator/MPropertyOutlineGenerator.java | 10 +- .../WrapperPropertyOutlineGenerator.java | 18 +-- .../concrete/CMClassOutlineGenerator.java | 24 +-- .../concrete/CMElementOutlineGenerator.java | 14 +- .../CMEnumConstantOutlineGenerator.java | 14 +- .../concrete/CMEnumOutlineGenerator.java | 20 +-- .../concrete/CMModelOutlineGenerator.java | 38 ++--- .../concrete/CMPackageOutlineGenerator.java | 14 +- .../concrete/CMPropertyOutlineGenerator.java | 22 +-- .../ClassOutlineGeneratorFactory.java | 8 + .../ElementOutlineGeneratorFactory.java | 8 + .../EnumConstantOutlineGeneratorFactory.java | 8 + .../concrete/EnumOutlineGeneratorFactory.java | 8 + .../ModelOutlineGeneratorFactory.java | 8 + .../concrete/OutlineGeneratorFactory.java | 2 +- .../PackageOutlineGeneratorFactory.java | 8 + .../PropertyOutlineGeneratorFactory.java | 8 + .../xjc/model/concrete/XJCCMInfoFactory.java | 62 ++++---- .../origin/DefaultPropertyInfoOrigin.java | 10 +- .../origin/DummyPropertyInfoOrigin.java | 7 + .../concrete/origin/PackageInfoOrigin.java | 9 ++ .../concrete/origin/XJCCMClassInfoOrigin.java | 10 +- .../concrete/origin/XJCCMClassRefOrigin.java | 6 +- .../origin/XJCCMElementInfoOrigin.java | 10 +- .../concrete/origin/XJCCMElementOrigin.java | 4 +- .../origin/XJCCMElementTypeRefOrigin.java | 4 +- .../origin/XJCCMEnumConstantInfoOrigin.java | 10 +- .../origin/XJCCMEnumLeafInfoOrigin.java | 10 +- .../concrete/origin/XJCCMModelInfoOrigin.java | 10 +- .../origin/XJCCMPackageInfoOrigin.java | 10 +- .../origin/XJCCMPropertyInfoOrigin.java | 10 +- .../xjc/outline/FieldAccessorEx.java | 2 +- .../xjc/outline/MChildOutline.java | 2 +- .../xjc/outline/MClassOutline.java | 6 +- .../xjc/outline/MElementOutline.java | 6 +- .../xjc/outline/MEnumConstantOutline.java | 6 +- .../xjc/outline/MEnumOutline.java | 6 +- .../xjc/outline/MModelOutline.java | 14 +- .../xjc/outline/MObjectFactoryOutline.java | 2 +- .../xjc/outline/MPackageOutline.java | 6 +- .../xjc/outline/MPackagedOutline.java | 2 +- .../xjc/outline/MPropertyAccessor.java | 2 +- .../xjc/outline/MPropertyAccessorFactory.java | 2 +- .../xjc/outline/MPropertyOutline.java | 6 +- .../AbstractPropertyAccessorFactory.java | 5 + .../artificial/AbstractPropertyOutline.java | 12 +- .../AbstractSinglePropertyOutline.java | 6 +- .../artificial/AnnotatePropertyVisitor.java | 20 +-- .../AnyAttributePropertyOutline.java | 8 +- .../artificial/ConstantPropertyOutline.java | 8 +- .../artificial/PropertyTypeVisitor.java | 22 +-- .../artificial/SinglePropertyOutline.java | 8 +- .../xjc/outline/concrete/CMClassOutline.java | 12 +- .../outline/concrete/CMElementOutline.java | 10 +- .../concrete/CMEnumConstantOutline.java | 8 +- .../xjc/outline/concrete/CMEnumOutline.java | 12 +- .../xjc/outline/concrete/CMModelOutline.java | 22 +-- .../concrete/CMObjectFactoryOutline.java | 8 +- .../outline/concrete/CMPackageOutline.java | 16 +- .../outline/concrete/CMPropertyAccessor.java | 6 +- .../concrete/CMPropertyAccessorFactory.java | 10 +- .../outline/concrete/CMPropertyOutline.java | 12 +- .../xjc/generator/MClassOutlineGenerator.java | 16 -- .../generator/MElementOutlineGenerator.java | 17 -- .../xjc/generator/MEnumOutlineGenerator.java | 16 -- .../MObjectFactoryOutlineGenerator.java | 16 -- .../generator/MPackageOutlineGenerator.java | 16 -- .../ClassOutlineGeneratorFactory.java | 8 - .../ElementOutlineGeneratorFactory.java | 8 - .../EnumConstantOutlineGeneratorFactory.java | 8 - .../concrete/EnumOutlineGeneratorFactory.java | 8 - .../ModelOutlineGeneratorFactory.java | 8 - .../PackageOutlineGeneratorFactory.java | 8 - .../PropertyOutlineGeneratorFactory.java | 8 - .../origin/DummyPropertyInfoOrigin.java | 7 - .../concrete/origin/PackageInfoOrigin.java | 9 -- .../AbstractPropertyAccessorFactory.java | 5 - .../util/test/FieldAccessorTest.java | 6 +- .../reflection/util/test/URIInternalTest.java | 2 +- .../util/tests/JClassUtilsTest.java | 4 +- .../tests/ahpla/KnownReferencedType.java | 2 +- .../concrete/tests/ahpla/package-info.java | 2 +- .../tests/alpha/AlphaMInfoFactoryTest.java | 16 +- .../model/concrete/tests/alpha/binding.xjb | 0 .../xjc/model/concrete/tests/alpha/schema.xsd | 6 +- .../plugin/Customizations.java | 2 +- .../plugin/CustomizedIgnoring.java | 4 +- .../plugin/Ignoring.java | 2 +- .../AutoInheritancePlugin.java | 4 +- .../AbstractCodeGenerationImplementor.java | 2 +- .../codegenerator/AbstractCodeGenerator.java | 2 +- .../AbstractCodeGeneratorPlugin.java | 14 +- .../plugin/codegenerator/Arguments.java | 2 +- .../codegenerator/ArrayCodeGenerator.java | 2 +- .../codegenerator/BooleanCodeGenerator.java | 2 +- .../codegenerator/ByteCodeGenerator.java | 2 +- .../codegenerator/CharCodeGenerator.java | 2 +- .../CodeGenerationAbstraction.java | 6 +- .../CodeGenerationImplementor.java | 2 +- .../plugin/codegenerator/CodeGenerator.java | 2 +- .../codegenerator/DoubleCodeGenerator.java | 2 +- .../codegenerator/FloatCodeGenerator.java | 2 +- .../codegenerator/IntCodeGenerator.java | 2 +- .../JAXBElementCodeGenerator.java | 4 +- .../codegenerator/ListCodeGenerator.java | 2 +- .../codegenerator/LongCodeGenerator.java | 2 +- .../codegenerator/ObjectCodeGenerator.java | 6 +- .../codegenerator/ShortCodeGenerator.java | 2 +- .../commons_lang/XjcCommonsLangPlugin.java | 2 +- .../plugin/copyable/CopyablePlugin.java | 36 ++--- .../plugin/copyable/Customizations.java | 2 +- .../plugin/customizations/Customizations.java | 2 +- .../customizations/CustomizationsPlugin.java | 6 +- .../DefaultValuePlugin.java | 2 +- .../plugin/elementwrapper/Customizations.java | 2 +- .../elementwrapper/ElementWrapperPlugin.java | 40 ++--- .../plugin/enumvalue/Customizations.java | 2 +- .../plugin/enumvalue/EnumValuePlugin.java | 20 +-- .../plugin/equals/Customizations.java | 2 +- .../plugin/equals/EqualsPlugin.java | 36 ++--- .../plugin/fixjaxb1058/FixJAXB1058Plugin.java | 6 +- .../plugin/fluent_api/Customizations.java | 2 +- .../plugin/fluent_api/FluentApiPlugin.java | 20 +-- .../plugin/fluent_api/FluentMethodInfo.java | 2 +- .../plugin/fluent_api/FluentMethodType.java | 2 +- .../plugin/hashcode/Customizations.java | 2 +- .../plugin/hashcode/HashCodePlugin.java | 36 ++--- .../plugin/inheritance/Customizations.java | 4 +- .../plugin/inheritance/ExtendsClass.java | 2 +- .../inheritance/ImplementsInterface.java | 2 +- .../plugin/inheritance/InheritancePlugin.java | 10 +- .../plugin/inheritance/ObjectFactory.java | 2 +- .../ObjectFactoryCustomization.java | 2 +- .../inheritance/util/JavaTypeParser.java | 2 +- .../util/TypeToJTypeConvertingVisitor.java | 2 +- .../plugin/jaxbindex/JaxbIndexPlugin.java | 4 +- .../plugin/mergeable/Customizations.java | 2 +- .../plugin/mergeable/MergeablePlugin.java | 36 ++--- .../plugin/model/AbstractModelPlugin.java | 14 +- .../NamespacePrefixPlugin.java | 2 +- .../plugin/setters/Customizations.java | 2 +- .../plugin/setters/SettersPlugin.java | 14 +- .../plugin/simpleequals/EqualsArguments.java | 4 +- .../EqualsCodeGenerationImplementor.java | 4 +- .../simpleequals/EqualsCodeGenerator.java | 4 +- .../simpleequals/SimpleEqualsPlugin.java | 16 +- .../simplehashcode/HashCodeArguments.java | 4 +- .../HashCodeCodeGenerationImplementor.java | 4 +- .../simplehashcode/HashCodeCodeGenerator.java | 4 +- .../simplehashcode/SimpleHashCodePlugin.java | 16 +- .../simpletostring/SimpleToStringPlugin.java | 34 ++-- .../plugin/simplify/Customizations.java | 2 +- .../plugin/simplify/SimplifyPlugin.java | 34 ++-- .../plugin/tostring/Customizations.java | 2 +- .../plugin/tostring/ToStringPlugin.java | 34 ++-- .../plugin/util/ArrayUtils.java | 2 +- .../plugin/util/FieldOutlineUtils.java | 4 +- .../plugin/util/Predicate.java | 2 +- .../plugin/util/StrategyClassUtils.java | 6 +- .../value_constructor/Customizations.java | 2 +- .../ValueConstructorPlugin.java | 2 +- .../plugin/wildcard/Customizations.java | 2 +- .../plugin/wildcard/WildcardPlugin.java | 12 +- .../services/com.sun.tools.xjc.Plugin | 44 ++--- .../copyable/tests/RunCopyablePlugin.java | 2 +- .../plugin/equals/tests/RunEqualsPlugin.java | 2 +- .../inheritance/tests/JavaParserTest.java | 4 +- .../inheritance/tests/JavaTypeParserTest.java | 2 +- .../mergeable/tests/RunMergeablePlugin.java | 2 +- .../tostring/tests/RunToStringPlugin.java | 4 +- .../src/test/resources/schema.xsd | 2 +- .../samples/basic/project-build.xml | 4 +- .../basic/src/main/resources/schema.xsd | 2 +- .../jvnet/jaxb/tests/one}/CopyableTest.java | 8 +- .../org/jvnet/jaxb/tests/one}/EqualsTest.java | 6 +- .../jvnet/jaxb/tests/one}/ToStringTest.java | 6 +- .../cxf/src/main/resources/bindings.xjb | 2 +- .../cxf/src/main/resources/wsdl-bindings.xjb | 4 +- .../samples/po-simple/project-build.xml | 4 +- .../po-simple/src/main/resources/bindings.xjb | 2 +- .../tests/posimple/EqualsTest.java | 4 +- .../samples/po/project-build.xml | 4 +- .../po/src/main/resources/bindings.xjb | 2 +- .../jvnet/jaxb/tests/po}/CopyableTest.java | 8 +- .../org/jvnet/jaxb/tests/po}/EqualsTest.java | 6 +- .../jvnet/jaxb/tests/po}/ToStringTest.java | 6 +- .../episodes/a/src/main/resources/binding.xjb | 2 +- .../episodes/b/src/main/resources/binding.xjb | 2 +- jaxb-plugins-parent/tests/issues/pom.xml | 14 +- .../jaxb/tests/issues/IssueGH70Interface.java | 4 + .../tests/issues/IssueJIIB14BaseClass.java | 5 + .../issues/IssueJIIB14BaseInterfaceFour.java | 2 +- .../issues/IssueJIIB14BaseInterfaceOne.java | 2 +- .../issues/IssueJIIB14BaseInterfaceThree.java | 2 +- .../issues/IssueJIIB14BaseInterfaceTwo.java | 2 +- .../issues/IssueJIIB42EqualsStrategy.java | 6 +- .../tests/issues/IssueJIIB48Interface.java | 2 +- .../tests/issues/IssueJIIB53ABaseClass.java | 5 + .../tests/issues/IssueGH70Interface.java | 4 - .../tests/issues/IssueJIIB14BaseClass.java | 5 - .../tests/issues/IssueJIIB53ABaseClass.java | 5 - .../issues/src/main/resources/binding.xjb | 2 +- .../tests/issues/IssueJIIB38Type.xml | 0 .../issues/src/main/resources/schema.xsd | 10 +- .../tests/issues/CopyableTest.java | 12 +- .../tests/issues/GH22Test.java | 4 +- .../tests/issues/GH26Test.java | 18 +-- .../tests/issues/GH31Test.java | 12 +- .../tests/issues/GH37Test.java | 10 +- .../tests/issues/JIIB10Test.java | 2 +- .../tests/issues/JIIB14Test.java | 7 +- .../tests/issues/JIIB20Test.java | 2 +- .../tests/issues/JIIB35Test.java | 6 +- .../tests/issues/JIIB36Test.java | 2 +- .../tests/issues/JIIB38Test.java | 2 +- .../tests/issues/JIIB8Test.java | 2 +- .../tests/issues/RunIssuesPlugin.java | 12 +- .../tests/issues/RunPlugins.java | 2 +- .../namespace/src/main/resources/binding.xjb | 4 +- .../jaxb2_commons/tests/one/CopyableTest.java | 7 +- .../jaxb2_commons/tests/one/EqualsTest.java | 4 +- .../jaxb2_commons/tests/one/HashCodeTest.java | 6 +- .../jaxb2_commons/tests/one/ToStringTest.java | 4 +- .../simplify/tests01/BaseElementRef.java | 2 +- .../plugin/simplify/tests01/DateAdapter.java | 2 +- .../src/main/resources/binding.xjb | 4 +- .../simplify-01/src/main/resources/schema.xsd | 2 +- .../plugin/simplify/tests01/Gh18Test.java | 2 +- .../plugin/simplify/tests01/Gh1Test.java | 2 +- .../plugin/simplify/tests01/Gh2Test.java | 2 +- .../plugin/simplify/tests01/Gh4Test.java | 2 +- .../plugin/simplify/tests01/Gh5Test.java | 2 +- .../plugin/simplify/tests01/Gh6Test.java | 2 +- .../simplify/tests01/RunSimplifyPlugin.java | 2 +- ...plifyElementsPropertyAsElementProperty.xml | 0 ...ifyReferencesPropertyAsElementProperty.xml | 0 ...yReferencesPropertyAsReferenceProperty.xml | 0 .../a/src/main/resources/binding.xjb | 2 +- .../b/src/main/resources/binding.xjb | 4 +- .../test/superclass/b/tests/CopyToTest.java | 4 +- .../test/superclass/b/tests/RunPlugins.java | 2 +- .../jaxb2_commons/tests/zj/EqualsTest.java | 4 +- 549 files changed, 1916 insertions(+), 1936 deletions(-) rename jaxb-annotate-parent/plugin/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/AnnotationTarget.java (97%) rename jaxb-annotate-parent/plugin/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/AnnotatePlugin.java (98%) rename jaxb-annotate-parent/plugin/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/AnnotatingArrayValueVisitor.java (98%) rename jaxb-annotate-parent/plugin/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/AnnotatingSingleValueVisitor.java (98%) rename jaxb-annotate-parent/plugin/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/AnnotatingVisitor.java (98%) rename jaxb-annotate-parent/plugin/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/Annotator.java (98%) rename jaxb-annotate-parent/plugin/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/removeannotation/RemoveAnnotationPlugin.java (98%) rename jaxb-annotate-parent/plugin/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/tests/A.java (97%) rename jaxb-annotate-parent/plugin/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/tests/B.java (97%) rename jaxb-annotate-parent/plugin/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/tests/D.java (96%) rename jaxb-annotate-parent/plugin/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/tests/E.java (96%) rename jaxb-annotate-parent/plugin/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/annotate/tests/F.java (96%) rename jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/annotate/IssueJAP9TypeTest.java (96%) rename jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/annotate/RunAnnotatePlugin.java (97%) rename jaxb-plugins-parent/jaxb-plugins-ant/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/XJCTask.java (96%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/i18n/Reportable.java (95%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/ClassUtils.java (97%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/ContextUtils.java (96%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/CopyStrategy.java (92%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/CopyStrategy2.java (94%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/CopyTo.java (69%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/CopyTo2.java (68%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/DefaultCopyStrategy.java (98%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/DefaultEqualsStrategy.java (98%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/DefaultHashCodeStrategy.java (98%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/DefaultMergeStrategy.java (99%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/DefaultToStringStrategy.java (99%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/EnumValue.java (61%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/Equals.java (64%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/Equals2.java (63%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/EqualsStrategy.java (95%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/EqualsStrategy2.java (96%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/HashCode.java (57%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/HashCode2.java (55%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/HashCodeStrategy.java (93%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/HashCodeStrategy2.java (94%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/JAXBCopyStrategy.java (89%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/JAXBEqualsStrategy.java (89%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/JAXBHashCodeStrategy.java (90%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/JAXBMergeCollectionsStrategy.java (93%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/JAXBMergeStrategy.java (92%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/JAXBToStringStrategy.java (94%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/MergeFrom.java (75%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/MergeFrom2.java (74%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/MergeStrategy.java (95%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/MergeStrategy2.java (96%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/StringUtils.java (98%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/ToString.java (76%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/ToString2.java (75%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/ToStringStrategy.java (98%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/ToStringStrategy2.java (98%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/Validate.java (96%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/locator/AbstractObjectLocator.java (98%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/locator/DefaultItemObjectLocator.java (96%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/locator/DefaultPropertyObjectLocator.java (96%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/locator/DefaultRootObjectLocator.java (92%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/locator/ItemObjectLocator.java (85%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/locator/ObjectLocator.java (93%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/locator/PropertyObjectLocator.java (87%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/locator/RootObjectLocator.java (60%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/locator/util/LocatorUtils.java (94%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/AfterMarshallCallback.java (75%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/AfterUnmarshallCallback.java (78%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/BeforeMarshallCallback.java (76%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/BeforeUnmarshallCallback.java (79%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/ContextPathAware.java (88%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java (87%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MAnyAttributePropertyInfo.java (65%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MAnyElementPropertyInfo.java (70%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MAttributePropertyInfo.java (78%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MBuiltinLeafInfo.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MClassInfo.java (82%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassRef.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MClassTypeInfo.java (68%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MClassTypeInfoVisitor.java (77%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MContained.java (72%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MContainer.java (74%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MCustomizable.java (63%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomization.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MCustomizations.java (78%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MDefaultValue.java (78%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElement.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MElementInfo.java (70%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MElementPropertyInfo.java (54%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MElementRefPropertyInfo.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MElementRefsPropertyInfo.java (61%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MElementTypeInfo.java (62%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MElementTypeInfos.java (76%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeRef.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MElementsPropertyInfo.java (58%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MEnumConstantInfo.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MEnumLeafInfo.java (76%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MID.java (70%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MIDREF.java (70%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MIDREFS.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MList.java (70%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MMixable.java (55%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MModelInfo.java (85%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MNillable.java (56%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackageInfo.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MPackaged.java (60%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MPackagedTypeInfo.java (77%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MPackagedTypeInfoVisitor.java (94%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MPropertyInfo.java (64%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MPropertyInfoVisitor.java (93%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MSingleTypePropertyInfo.java (71%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MSourced.java (54%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MTargeted.java (55%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTransientPropertyInfo.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MTypeInfo.java (84%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MTypeInfoVisitor.java (90%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MTyped.java (63%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MValuePropertyInfo.java (66%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MWildcard.java (69%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWildcardTypeInfo.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/MWrappable.java (69%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java (57%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMAnyElementPropertyInfo.java (74%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMAttributePropertyInfo.java (67%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMBuiltinLeafInfo.java (74%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMClassInfo.java (83%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMClassRef.java (79%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMCustomization.java (67%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMCustomizations.java (72%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMElement.java (71%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMElementInfo.java (85%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMElementPropertyInfo.java (81%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMElementRefPropertyInfo.java (84%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMElementRefsPropertyInfo.java (81%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMElementTypeInfo.java (85%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMElementTypeRef.java (71%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMElementsPropertyInfo.java (76%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMEnumConstantInfo.java (70%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMEnumLeafInfo.java (82%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMID.java (72%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMIDREF.java (72%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMIDREFS.java (61%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMInfoFactory.java (89%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMList.java (76%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMModel.java (90%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMPackageInfo.java (74%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMPropertyInfo.java (74%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMSingleTypePropertyInfo.java (74%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMValuePropertyInfo.java (63%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/CMWildcardTypeInfo.java (70%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java (58%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java (67%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java (66%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMClassInfoOrigin.java (65%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMElementInfoOrigin.java (66%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMElementOrigin.java (65%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java (75%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java (67%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java (67%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java (66%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMModelInfoOrigin.java (67%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java (66%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java (67%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/ClassInfoOrigin.java (55%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/ElementInfoOrigin.java (56%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/ElementOrigin.java (53%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/EnumConstantOrigin.java (57%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java (57%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/PropertyInfoOrigin.java (57%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java (57%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java (59%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/origin/MClassInfoOrigin.java (63%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MClassRefOrigin.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementInfoOrigin.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/origin/MElementOrigin.java (54%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/origin/MElementTypeRefOrigin.java (56%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MEnumConstantInfoOrigin.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/origin/MEnumLeafInfoOrigin.java (64%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MModelInfoOrigin.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/origin/MOriginated.java (52%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MPackageInfoOrigin.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MPropertyInfoOrigin.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MWildcardTypeInfoOrigin.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/DefaultPropertyInfoVisitor.java (59%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/DefaultTypeInfoVisitor.java (57%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/PackageInfoQNameAnalyzer.java (86%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java (72%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/QNameCollector.java (73%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/XmlTypeUtils.java (96%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xml/namespace/util/QNameUtils.java (92%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xmlschema/XmlSchemaConstants.java (98%) delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/lang/tests/CopyStrategyTest.java (89%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/lang/tests/CyclicTests.java (85%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/lang/tests/DefaultCopyStrategyTest.java (90%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/lang/tests/pojo/CloneableNoClone.java (83%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/XmlTypeUtilsTest.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A1.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/beta => jaxb/xml/bind/model/util/tests/alpha}/A2.java (54%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/beta => jaxb/xml/bind/model/util/tests/alpha}/A3.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/beta => jaxb/xml/bind/model/util/tests/alpha}/A4.java (61%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/beta => jaxb/xml/bind/model/util/tests/alpha}/A5.java (63%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/beta => jaxb/xml/bind/model/util/tests/alpha}/A6.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/beta => jaxb/xml/bind/model/util/tests/alpha}/A7.java (60%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/beta => jaxb/xml/bind/model/util/tests/alpha}/A8.java (62%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/beta => jaxb/xml/bind/model/util/tests/alpha}/A9.java (64%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A1.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/alpha => jaxb/xml/bind/model/util/tests/beta}/A2.java (53%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/delta => jaxb/xml/bind/model/util/tests/beta}/A3.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/delta => jaxb/xml/bind/model/util/tests/beta}/A4.java (61%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/delta => jaxb/xml/bind/model/util/tests/beta}/A5.java (63%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/delta => jaxb/xml/bind/model/util/tests/beta}/A6.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/delta => jaxb/xml/bind/model/util/tests/beta}/A7.java (60%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/delta => jaxb/xml/bind/model/util/tests/beta}/A8.java (62%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/alpha => jaxb/xml/bind/model/util/tests/beta}/A9.java (64%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/package-info.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A1.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/gamma => jaxb/xml/bind/model/util/tests/delta}/A2.java (53%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/alpha => jaxb/xml/bind/model/util/tests/delta}/A3.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/alpha => jaxb/xml/bind/model/util/tests/delta}/A4.java (61%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/gamma => jaxb/xml/bind/model/util/tests/delta}/A5.java (63%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/gamma => jaxb/xml/bind/model/util/tests/delta}/A6.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/alpha => jaxb/xml/bind/model/util/tests/delta}/A7.java (60%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/alpha => jaxb/xml/bind/model/util/tests/delta}/A8.java (62%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/tests/delta/A9.java (64%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/tests/delta/package-info.java (79%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A1.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/delta => jaxb/xml/bind/model/util/tests/gamma}/A2.java (53%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/tests/gamma/A3.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/tests/gamma/A4.java (61%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/alpha => jaxb/xml/bind/model/util/tests/gamma}/A5.java (63%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons/xml/bind/model/util/tests/alpha => jaxb/xml/bind/model/util/tests/gamma}/A6.java (58%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/tests/gamma/A7.java (60%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/tests/gamma/A8.java (62%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/tests/gamma/A9.java (64%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xml/bind/model/util/tests/gamma/package-info.java (56%) rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xml/namespace/util/tests/QNameUtilsTest.java (80%) delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java rename jaxb-plugins-parent/jaxb-plugins-runtime/src/test/resources/org/jvnet/{jaxb2_commons => jaxb}/lang/tests/Test[0].xml (100%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-shaded/src/main/java/org/jvnet/jaxb/plugin/Dummy.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-shaded/src/main/java/org/jvnet/jaxb2_commons/plugin/Dummy.java rename jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/lang/ExtendedJAXBEqualsStrategy.java (92%) rename jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/test/AbstractSamplesTest.java (98%) rename jaxb-plugins-parent/jaxb-plugins-testing/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/test/tests/TrivialSamplesTest.java (70%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/DefaultJCMTypeVisitor.java (93%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JCMArrayClass.java (96%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JCMClass.java (97%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JCMNullType.java (96%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JCMPrimitiveType.java (96%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JCMType.java (94%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JCMTypeFactory.java (97%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JCMTypeVar.java (96%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JCMTypeVisitor.java (85%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JCMTypeWildcard.java (96%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/codemodel/JConditionable.java (80%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/AbstractParameterizablePlugin.java (97%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/AbstractPlugin.java (98%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/spring/AbstractSpringConfigurablePlugin.java (95%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/reflection/util/Accessor.java (68%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/reflection/util/FieldAccessor.java (97%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/strategy/ClassOutlineProcessor.java (84%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/strategy/FieldOutlineProcessor.java (84%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/strategy/OutlineProcessor.java (82%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/strategy/PackageOutlineProcessor.java (84%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/strategy/impl/DefaultOutlineProcessor.java (86%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/ClassUtils.java (98%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/CodeModelUtils.java (99%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/CustomizationUtils.java (99%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/FieldAccessorFactory.java (70%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/FieldAccessorUtils.java (98%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/FieldUtils.java (99%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/GeneratorContextUtils.java (93%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/JClassUtils.java (96%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/OutlineUtils.java (97%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/util/PropertyFieldAccessorFactory.java (98%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MClassOutlineGenerator.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MElementOutlineGenerator.java rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/MEnumConstantOutlineGenerator.java (50%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MEnumOutlineGenerator.java rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/MModelOutlineGenerator.java (55%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MObjectFactoryOutlineGenerator.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MPackageOutlineGenerator.java rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/MPropertyOutlineGenerator.java (50%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java (52%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/concrete/CMClassOutlineGenerator.java (74%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/concrete/CMElementOutlineGenerator.java (70%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java (73%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/concrete/CMEnumOutlineGenerator.java (70%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/concrete/CMModelOutlineGenerator.java (79%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/concrete/CMPackageOutlineGenerator.java (68%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/concrete/CMPropertyOutlineGenerator.java (62%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ClassOutlineGeneratorFactory.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ElementOutlineGeneratorFactory.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/EnumOutlineGeneratorFactory.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ModelOutlineGeneratorFactory.java rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/generator/concrete/OutlineGeneratorFactory.java (71%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/PackageOutlineGeneratorFactory.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/XJCCMInfoFactory.java (85%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java (56%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/PackageInfoOrigin.java rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java (65%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMClassRefOrigin.java (63%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java (70%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMElementOrigin.java (78%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java (87%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java (65%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java (66%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java (62%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java (60%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java (65%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/FieldAccessorEx.java (85%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MChildOutline.java (61%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MClassOutline.java (79%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MElementOutline.java (63%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MEnumConstantOutline.java (64%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MEnumOutline.java (69%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MModelOutline.java (66%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MObjectFactoryOutline.java (77%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MPackageOutline.java (73%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MPackagedOutline.java (65%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MPropertyAccessor.java (90%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MPropertyAccessorFactory.java (77%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/MPropertyOutline.java (60%) create mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractPropertyAccessorFactory.java rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/artificial/AbstractPropertyOutline.java (92%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/artificial/AbstractSinglePropertyOutline.java (91%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/artificial/AnnotatePropertyVisitor.java (76%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/artificial/AnyAttributePropertyOutline.java (92%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/artificial/ConstantPropertyOutline.java (88%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/artificial/PropertyTypeVisitor.java (69%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/artificial/SinglePropertyOutline.java (85%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMClassOutline.java (89%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMElementOutline.java (77%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMEnumConstantOutline.java (78%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMEnumOutline.java (82%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMModelOutline.java (85%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMObjectFactoryOutline.java (76%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMPackageOutline.java (84%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMPropertyAccessor.java (85%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMPropertyAccessorFactory.java (72%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/outline/concrete/CMPropertyOutline.java (74%) delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MClassOutlineGenerator.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MElementOutlineGenerator.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumOutlineGenerator.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MObjectFactoryOutlineGenerator.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPackageOutlineGenerator.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ClassOutlineGeneratorFactory.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumOutlineGeneratorFactory.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ModelOutlineGeneratorFactory.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/PackageInfoOrigin.java delete mode 100644 jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyAccessorFactory.java rename jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/reflection/util/test/FieldAccessorTest.java (76%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/reflection/util/test/URIInternalTest.java (87%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/util/tests/JClassUtilsTest.java (93%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/tests/ahpla/KnownReferencedType.java (87%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/tests/ahpla/package-info.java (79%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java (89%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/tests/alpha/binding.xjb (100%) rename jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/{jaxb2_commons => jaxb}/xjc/model/concrete/tests/alpha/schema.xsd (95%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/Customizations.java (91%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/CustomizedIgnoring.java (95%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/Ignoring.java (94%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/autoinheritance/AutoInheritancePlugin.java (96%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/AbstractCodeGenerationImplementor.java (88%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/AbstractCodeGenerator.java (93%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/AbstractCodeGeneratorPlugin.java (84%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/Arguments.java (93%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/ArrayCodeGenerator.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/BooleanCodeGenerator.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/ByteCodeGenerator.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/CharCodeGenerator.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/CodeGenerationAbstraction.java (96%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/CodeGenerationImplementor.java (94%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/CodeGenerator.java (83%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/DoubleCodeGenerator.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/FloatCodeGenerator.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/IntCodeGenerator.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/JAXBElementCodeGenerator.java (97%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/ListCodeGenerator.java (97%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/LongCodeGenerator.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/ObjectCodeGenerator.java (96%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/codegenerator/ShortCodeGenerator.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/commons_lang/XjcCommonsLangPlugin.java (99%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/copyable/CopyablePlugin.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/copyable/Customizations.java (83%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/customizations/Customizations.java (86%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/customizations/CustomizationsPlugin.java (97%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/defaultvalueplugin/DefaultValuePlugin.java (99%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/elementwrapper/Customizations.java (82%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/elementwrapper/ElementWrapperPlugin.java (87%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/enumvalue/Customizations.java (83%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/enumvalue/EnumValuePlugin.java (78%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/equals/Customizations.java (83%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/equals/EqualsPlugin.java (87%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/fixjaxb1058/FixJAXB1058Plugin.java (95%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/fluent_api/Customizations.java (83%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/fluent_api/FluentApiPlugin.java (91%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/fluent_api/FluentMethodInfo.java (97%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/fluent_api/FluentMethodType.java (99%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/hashcode/Customizations.java (83%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/hashcode/HashCodePlugin.java (84%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/Customizations.java (94%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/ExtendsClass.java (93%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/ImplementsInterface.java (93%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/InheritancePlugin.java (97%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/ObjectFactory.java (88%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/ObjectFactoryCustomization.java (96%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/util/JavaTypeParser.java (97%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java (98%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/jaxbindex/JaxbIndexPlugin.java (91%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/mergeable/Customizations.java (83%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/mergeable/MergeablePlugin.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/model/AbstractModelPlugin.java (83%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/namespace_prefix/NamespacePrefixPlugin.java (99%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/setters/Customizations.java (84%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/setters/SettersPlugin.java (90%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simpleequals/EqualsArguments.java (98%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simpleequals/EqualsCodeGenerationImplementor.java (96%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simpleequals/EqualsCodeGenerator.java (69%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simpleequals/SimpleEqualsPlugin.java (89%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplehashcode/HashCodeArguments.java (96%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java (96%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplehashcode/HashCodeCodeGenerator.java (70%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplehashcode/SimpleHashCodePlugin.java (87%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simpletostring/SimpleToStringPlugin.java (87%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/Customizations.java (91%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/SimplifyPlugin.java (91%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/tostring/Customizations.java (83%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/tostring/ToStringPlugin.java (87%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/util/ArrayUtils.java (92%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/util/FieldOutlineUtils.java (82%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/util/Predicate.java (61%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/util/StrategyClassUtils.java (96%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/value_constructor/Customizations.java (81%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/value_constructor/ValueConstructorPlugin.java (99%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/wildcard/Customizations.java (88%) rename jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/wildcard/WildcardPlugin.java (88%) rename jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/copyable/tests/RunCopyablePlugin.java (92%) rename jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/equals/tests/RunEqualsPlugin.java (92%) rename jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/tests/JavaParserTest.java (85%) rename jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/inheritance/tests/JavaTypeParserTest.java (97%) rename jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/mergeable/tests/RunMergeablePlugin.java (92%) rename jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/tostring/tests/RunToStringPlugin.java (86%) rename jaxb-plugins-parent/samples/{po/src/test/java/org/jvnet/jaxb2_commons/tests/po => basic/src/test/java/org/jvnet/jaxb/tests/one}/CopyableTest.java (68%) rename jaxb-plugins-parent/samples/{po/src/test/java/org/jvnet/jaxb2_commons/tests/po => basic/src/test/java/org/jvnet/jaxb/tests/one}/EqualsTest.java (72%) rename jaxb-plugins-parent/samples/{po/src/test/java/org/jvnet/jaxb2_commons/tests/po => basic/src/test/java/org/jvnet/jaxb/tests/one}/ToStringTest.java (68%) rename jaxb-plugins-parent/samples/po-simple/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/posimple/EqualsTest.java (82%) rename jaxb-plugins-parent/samples/{basic/src/test/java/org/jvnet/jaxb2_commons/tests/one => po/src/test/java/org/jvnet/jaxb/tests/po}/CopyableTest.java (68%) rename jaxb-plugins-parent/samples/{basic/src/test/java/org/jvnet/jaxb2_commons/tests/one => po/src/test/java/org/jvnet/jaxb/tests/po}/EqualsTest.java (72%) rename jaxb-plugins-parent/samples/{basic/src/test/java/org/jvnet/jaxb2_commons/tests/one => po/src/test/java/org/jvnet/jaxb/tests/po}/ToStringTest.java (68%) create mode 100644 jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueGH70Interface.java create mode 100644 jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseClass.java rename jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/IssueJIIB14BaseInterfaceFour.java (53%) rename jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/IssueJIIB14BaseInterfaceOne.java (52%) rename jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/IssueJIIB14BaseInterfaceThree.java (53%) rename jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/IssueJIIB14BaseInterfaceTwo.java (52%) rename jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/IssueJIIB42EqualsStrategy.java (73%) rename jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/IssueJIIB48Interface.java (60%) create mode 100644 jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB53ABaseClass.java delete mode 100644 jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueGH70Interface.java delete mode 100644 jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseClass.java delete mode 100644 jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB53ABaseClass.java rename jaxb-plugins-parent/tests/issues/src/main/resources/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/IssueJIIB38Type.xml (100%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/CopyableTest.java (65%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/GH22Test.java (85%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/GH26Test.java (84%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/GH31Test.java (66%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/GH37Test.java (78%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/JIIB10Test.java (91%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/JIIB14Test.java (65%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/JIIB20Test.java (90%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/JIIB35Test.java (91%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/JIIB36Test.java (88%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/JIIB38Test.java (88%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/JIIB8Test.java (88%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/RunIssuesPlugin.java (78%) rename jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/tests/issues/RunPlugins.java (96%) rename jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/BaseElementRef.java (90%) rename jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/DateAdapter.java (92%) rename jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/Gh18Test.java (77%) rename jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/Gh1Test.java (94%) rename jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/Gh2Test.java (86%) rename jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/Gh4Test.java (94%) rename jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/Gh5Test.java (94%) rename jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/Gh6Test.java (94%) rename jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/RunSimplifyPlugin.java (95%) rename jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/simplifyElementsPropertyAsElementProperty.xml (100%) rename jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/simplifyReferencesPropertyAsElementProperty.xml (100%) rename jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/{jaxb2_commons => jaxb}/plugin/simplify/tests01/simplifyReferencesPropertyAsReferenceProperty.xml (100%) rename jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/test/superclass/b/tests/CopyToTest.java (79%) rename jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/{jaxb2_commons => jaxb}/test/superclass/b/tests/RunPlugins.java (95%) diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/AnnotationTarget.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/AnnotationTarget.java similarity index 97% rename from jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/AnnotationTarget.java rename to jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/AnnotationTarget.java index b97e0d7ad..249d716dd 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/AnnotationTarget.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/AnnotationTarget.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb.plugin; import java.text.MessageFormat; import java.util.Arrays; @@ -37,10 +37,10 @@ import javax.xml.namespace.QName; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.plugin.annotate.AnnotatePlugin; -import org.jvnet.jaxb2_commons.plugin.removeannotation.RemoveAnnotationPlugin; -import org.jvnet.jaxb2_commons.util.FieldAccessorUtils; -import org.jvnet.jaxb2_commons.util.OutlineUtils; +import org.jvnet.jaxb.plugin.annotate.AnnotatePlugin; +import org.jvnet.jaxb.plugin.removeannotation.RemoveAnnotationPlugin; +import org.jvnet.jaxb.util.FieldAccessorUtils; +import org.jvnet.jaxb.util.OutlineUtils; import org.w3c.dom.Element; import com.sun.codemodel.JAnnotatable; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatePlugin.java similarity index 98% rename from jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java rename to jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatePlugin.java index e13eb3697..cb7871c3d 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatePlugin.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatePlugin.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.plugin.annotate; +package org.jvnet.jaxb.plugin.annotate; import java.util.Arrays; import java.util.Collection; @@ -40,10 +40,10 @@ import org.jvnet.jaxb.annox.Constants; import org.jvnet.jaxb.annox.model.XAnnotation; import org.jvnet.jaxb.annox.parser.XAnnotationParser; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.AnnotationTarget; -import org.jvnet.jaxb2_commons.plugin.removeannotation.RemoveAnnotationPlugin; -import org.jvnet.jaxb2_commons.util.CustomizationUtils; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.AnnotationTarget; +import org.jvnet.jaxb.plugin.removeannotation.RemoveAnnotationPlugin; +import org.jvnet.jaxb.util.CustomizationUtils; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingArrayValueVisitor.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatingArrayValueVisitor.java similarity index 98% rename from jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingArrayValueVisitor.java rename to jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatingArrayValueVisitor.java index a815d0348..98111ebe4 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingArrayValueVisitor.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatingArrayValueVisitor.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.plugin.annotate; +package org.jvnet.jaxb.plugin.annotate; import org.jvnet.jaxb.annox.model.XAnnotation; import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; @@ -46,7 +46,7 @@ import org.jvnet.jaxb.annox.model.annotation.value.XShortAnnotationValue; import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue; import org.jvnet.jaxb.annox.model.annotation.value.XXAnnotationAnnotationValue; -import org.jvnet.jaxb2_commons.util.CodeModelUtils; +import org.jvnet.jaxb.util.CodeModelUtils; import com.sun.codemodel.JAnnotationArrayMember; import com.sun.codemodel.JAnnotationUse; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingSingleValueVisitor.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatingSingleValueVisitor.java similarity index 98% rename from jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingSingleValueVisitor.java rename to jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatingSingleValueVisitor.java index bd17eb655..c6d0e1083 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingSingleValueVisitor.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatingSingleValueVisitor.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.plugin.annotate; +package org.jvnet.jaxb.plugin.annotate; import org.jvnet.jaxb.annox.model.XAnnotation; import org.jvnet.jaxb.annox.model.annotation.field.XAnnotationField; @@ -46,7 +46,7 @@ import org.jvnet.jaxb.annox.model.annotation.value.XShortAnnotationValue; import org.jvnet.jaxb.annox.model.annotation.value.XStringAnnotationValue; import org.jvnet.jaxb.annox.model.annotation.value.XXAnnotationAnnotationValue; -import org.jvnet.jaxb2_commons.util.CodeModelUtils; +import org.jvnet.jaxb.util.CodeModelUtils; import com.sun.codemodel.JAnnotationUse; import com.sun.codemodel.JClass; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingVisitor.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatingVisitor.java similarity index 98% rename from jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingVisitor.java rename to jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatingVisitor.java index ad3df2527..92a5cd4a0 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/AnnotatingVisitor.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/AnnotatingVisitor.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.plugin.annotate; +package org.jvnet.jaxb.plugin.annotate; import org.jvnet.jaxb.annox.model.XAnnotationFieldVisitor; import org.jvnet.jaxb.annox.model.annotation.field.XArrayAnnotationField; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/Annotator.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/Annotator.java similarity index 98% rename from jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/Annotator.java rename to jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/Annotator.java index 6da2b0249..8dedfab20 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/annotate/Annotator.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/annotate/Annotator.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.plugin.annotate; +package org.jvnet.jaxb.plugin.annotate; import java.util.Collection; diff --git a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/removeannotation/RemoveAnnotationPlugin.java b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/removeannotation/RemoveAnnotationPlugin.java similarity index 98% rename from jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/removeannotation/RemoveAnnotationPlugin.java rename to jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/removeannotation/RemoveAnnotationPlugin.java index de1cbcf47..c396b9516 100644 --- a/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb2_commons/plugin/removeannotation/RemoveAnnotationPlugin.java +++ b/jaxb-annotate-parent/plugin/src/main/java/org/jvnet/jaxb/plugin/removeannotation/RemoveAnnotationPlugin.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.plugin.removeannotation; +package org.jvnet.jaxb.plugin.removeannotation; import java.text.MessageFormat; import java.util.Arrays; @@ -39,9 +39,9 @@ import org.apache.commons.lang3.StringUtils; import org.jvnet.jaxb.annox.Constants; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; -import org.jvnet.jaxb2_commons.plugin.AnnotationTarget; -import org.jvnet.jaxb2_commons.util.CustomizationUtils; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.AnnotationTarget; +import org.jvnet.jaxb.util.CustomizationUtils; import org.w3c.dom.Element; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; diff --git a/jaxb-annotate-parent/plugin/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin b/jaxb-annotate-parent/plugin/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin index e9bc51133..10354ecb9 100644 --- a/jaxb-annotate-parent/plugin/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin +++ b/jaxb-annotate-parent/plugin/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin @@ -1,2 +1,2 @@ -org.jvnet.jaxb2_commons.plugin.annotate.AnnotatePlugin -org.jvnet.jaxb2_commons.plugin.removeannotation.RemoveAnnotationPlugin +org.jvnet.jaxb.plugin.annotate.AnnotatePlugin +org.jvnet.jaxb.plugin.removeannotation.RemoveAnnotationPlugin diff --git a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/A.java b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/A.java similarity index 97% rename from jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/A.java rename to jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/A.java index 31ce634fb..68ff34a8e 100644 --- a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/A.java +++ b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/A.java @@ -29,7 +29,7 @@ /** * */ -package org.jvnet.jaxb2_commons.plugin.annotate.tests; +package org.jvnet.jaxb.plugin.annotate.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/B.java b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/B.java similarity index 97% rename from jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/B.java rename to jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/B.java index 91e8f140c..a998198fd 100644 --- a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/B.java +++ b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/B.java @@ -29,7 +29,7 @@ /** * */ -package org.jvnet.jaxb2_commons.plugin.annotate.tests; +package org.jvnet.jaxb.plugin.annotate.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/D.java b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/D.java similarity index 96% rename from jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/D.java rename to jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/D.java index dedc6d892..0324bbdfa 100644 --- a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/D.java +++ b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/D.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.plugin.annotate.tests; +package org.jvnet.jaxb.plugin.annotate.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/E.java b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/E.java similarity index 96% rename from jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/E.java rename to jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/E.java index dfe7f6d8e..596982ecf 100644 --- a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/E.java +++ b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/E.java @@ -29,7 +29,7 @@ /** * */ -package org.jvnet.jaxb2_commons.plugin.annotate.tests; +package org.jvnet.jaxb.plugin.annotate.tests; public enum E { diff --git a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/F.java b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/F.java similarity index 96% rename from jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/F.java rename to jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/F.java index a6a7e1e81..991f7a339 100644 --- a/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb2_commons/plugin/annotate/tests/F.java +++ b/jaxb-annotate-parent/plugin/src/test/java/org/jvnet/jaxb/plugin/annotate/tests/F.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.plugin.annotate.tests; +package org.jvnet.jaxb.plugin.annotate.tests; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxb-annotate-parent/plugin/src/test/resources/schema.xsd b/jaxb-annotate-parent/plugin/src/test/resources/schema.xsd index c7579d3f0..c6951111a 100644 --- a/jaxb-annotate-parent/plugin/src/test/resources/schema.xsd +++ b/jaxb-annotate-parent/plugin/src/test/resources/schema.xsd @@ -42,7 +42,7 @@ - + @@ -53,16 +53,16 @@ 17 + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> @@ -88,7 +88,7 @@ 17 + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> @@ -119,7 +119,7 @@ 17 + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> @@ -150,7 +150,7 @@ 17 + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> @@ -181,7 +181,7 @@ 17 + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> + annox:class="org.jvnet.jaxb.plugin.annotate.tests.B$C"/> @@ -222,7 +222,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -244,33 +244,33 @@ - @org.jvnet.jaxb2_commons.plugin.annotate.tests.A( + @org.jvnet.jaxb.plugin.annotate.tests.A( booleanField = false, byteField = 0, charField = 'a', classField = java.lang.String[][][].class, - anotherClassField=org.jvnet.jaxb2_commons.plugin.annotate.tests.One.class, + anotherClassField=org.jvnet.jaxb.plugin.annotate.tests.One.class, doubleField = 1, - enumField = org.jvnet.jaxb2_commons.plugin.annotate.tests.E.ONE, + enumField = org.jvnet.jaxb.plugin.annotate.tests.E.ONE, floatField = 2.3f, intField = 4, longField = 5, shortField = 6, stringField = "7", - annotationField = @org.jvnet.jaxb2_commons.plugin.annotate.tests.B( + annotationField = @org.jvnet.jaxb.plugin.annotate.tests.B( booleanArrayField = { false, true }, byteArrayField = { 0, 1 }, charArrayField = { 'a', 'b' }, classArrayField = { java.lang.String.class, java.lang.Boolean.class }, - anotherClassArrayField= {org.jvnet.jaxb2_commons.plugin.annotate.tests.One.class, org.jvnet.jaxb2_commons.plugin.annotate.tests.Two.class }, + anotherClassArrayField= {org.jvnet.jaxb.plugin.annotate.tests.One.class, org.jvnet.jaxb.plugin.annotate.tests.Two.class }, doubleArrayField = { 2, 3 }, - enumArrayField = { org.jvnet.jaxb2_commons.plugin.annotate.tests.E.ONE, org.jvnet.jaxb2_commons.plugin.annotate.tests.E.TWO }, + enumArrayField = { org.jvnet.jaxb.plugin.annotate.tests.E.ONE, org.jvnet.jaxb.plugin.annotate.tests.E.TWO }, floatArrayField = { 4.5f, 6.7f }, intArrayField = { 8, 9 }, longArrayField = { 10, -9223372036854775808L }, shortArrayField = { 12, 13 }, stringArrayField = { "14", "15", "16", "17" }, - annotationArrayField = { @org.jvnet.jaxb2_commons.plugin.annotate.tests.B.C, @org.jvnet.jaxb2_commons.plugin.annotate.tests.B.C })) + annotationArrayField = { @org.jvnet.jaxb.plugin.annotate.tests.B.C, @org.jvnet.jaxb.plugin.annotate.tests.B.C })) diff --git a/jaxb-annotate-parent/samples/annotate/project-build.xml b/jaxb-annotate-parent/samples/annotate/project-build.xml index 9ce1e5312..2655d2095 100644 --- a/jaxb-annotate-parent/samples/annotate/project-build.xml +++ b/jaxb-annotate-parent/samples/annotate/project-build.xml @@ -74,7 +74,7 @@ - + diff --git a/jaxb-annotate-parent/samples/annotate/project-pom.xml b/jaxb-annotate-parent/samples/annotate/project-pom.xml index e28e6982f..411787ce9 100644 --- a/jaxb-annotate-parent/samples/annotate/project-pom.xml +++ b/jaxb-annotate-parent/samples/annotate/project-pom.xml @@ -32,7 +32,7 @@ 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 + org.jvnet.jaxb jaxb2-annotate-plugin-sample-annotate-maven ${project.version} jar diff --git a/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/IssueJAP9TypeTest.java b/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb/tests/annotate/IssueJAP9TypeTest.java similarity index 96% rename from jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/IssueJAP9TypeTest.java rename to jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb/tests/annotate/IssueJAP9TypeTest.java index d086627a2..0e14212f1 100644 --- a/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/IssueJAP9TypeTest.java +++ b/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb/tests/annotate/IssueJAP9TypeTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.annotate; +package org.jvnet.jaxb.tests.annotate; import generated.IssueJAP9Type; import org.junit.Assert; diff --git a/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/RunAnnotatePlugin.java b/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb/tests/annotate/RunAnnotatePlugin.java similarity index 97% rename from jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/RunAnnotatePlugin.java rename to jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb/tests/annotate/RunAnnotatePlugin.java index 186664a2b..65209cfc9 100644 --- a/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb2_commons/tests/annotate/RunAnnotatePlugin.java +++ b/jaxb-annotate-parent/tests/annotate/src/test/java/org/jvnet/jaxb/tests/annotate/RunAnnotatePlugin.java @@ -26,7 +26,7 @@ * of the authors and should not be interpreted as representing official policies, * either expressed or implied, of the FreeBSD Project. */ -package org.jvnet.jaxb2_commons.tests.annotate; +package org.jvnet.jaxb.tests.annotate; import java.util.ArrayList; import java.util.List; diff --git a/jaxb-plugins-parent/jaxb-plugins-ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJCTask.java b/jaxb-plugins-parent/jaxb-plugins-ant/src/main/java/org/jvnet/jaxb/xjc/XJCTask.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJCTask.java rename to jaxb-plugins-parent/jaxb-plugins-ant/src/main/java/org/jvnet/jaxb/xjc/XJCTask.java index 899b1e5cb..119533fb0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-ant/src/main/java/org/jvnet/jaxb2_commons/xjc/XJCTask.java +++ b/jaxb-plugins-parent/jaxb-plugins-ant/src/main/java/org/jvnet/jaxb/xjc/XJCTask.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc; +package org.jvnet.jaxb.xjc; import org.apache.tools.ant.BuildException; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/i18n/Reportable.java similarity index 95% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/i18n/Reportable.java index 20e638deb..94c6f6650 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/i18n/Reportable.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/i18n/Reportable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.i18n; +package org.jvnet.jaxb.i18n; import java.util.ResourceBundle; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ClassUtils.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ClassUtils.java index 37e3b98e6..c0fb67ed4 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ClassUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ClassUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; public class ClassUtils { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ContextUtils.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ContextUtils.java index 95dd5aab8..f3ad3ecd9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ContextUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ContextUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; import java.io.StringWriter; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyStrategy.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyStrategy.java index 13aca06c9..d1004f16e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface CopyStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyStrategy2.java similarity index 94% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyStrategy2.java index b0ebfb182..bbf7f85e8 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyStrategy2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface CopyStrategy2 { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyTo.java similarity index 69% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyTo.java index 9eeabe007..6e311a13a 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyTo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface CopyTo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyTo2.java similarity index 68% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyTo2.java index de83c7393..eb2654d75 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/CopyTo2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/CopyTo2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface CopyTo2 { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultCopyStrategy.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultCopyStrategy.java index 5f5ce4e7d..574f4c0e0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultCopyStrategy.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb.locator.util.LocatorUtils.item; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultCopyStrategy implements CopyStrategy2, CopyStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultEqualsStrategy.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultEqualsStrategy.java index 8ed827d77..d40bcb880 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultEqualsStrategy.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb.locator.util.LocatorUtils.item; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultEqualsStrategy implements EqualsStrategy2, EqualsStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultHashCodeStrategy.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultHashCodeStrategy.java index e35ec8287..67b4ebb46 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultHashCodeStrategy.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import static org.jvnet.jaxb2_commons.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb.locator.util.LocatorUtils.item; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultHashCodeStrategy implements HashCodeStrategy2, HashCodeStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultMergeStrategy.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultMergeStrategy.java index 0a9563047..d0a44de4f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultMergeStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultMergeStrategy implements MergeStrategy2, MergeStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultToStringStrategy.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultToStringStrategy.java index 79f7cd14b..3017d33c8 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/DefaultToStringStrategy.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.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.jaxb.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb.locator.util.LocatorUtils.property; import java.util.Collection; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @SuppressWarnings("deprecation") public class DefaultToStringStrategy implements ToStringStrategy2, diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/EnumValue.java similarity index 61% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/EnumValue.java index 34f30ce9e..9a70a691a 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EnumValue.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/EnumValue.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; public interface EnumValue { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/Equals.java similarity index 64% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/Equals.java index d0091b65b..7ec887165 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/Equals.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface Equals { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/Equals2.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/Equals2.java index 541762673..d8699fa99 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Equals2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/Equals2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface Equals2 { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/EqualsStrategy.java similarity index 95% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/EqualsStrategy.java index 53d78c5af..f1737f122 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/EqualsStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface EqualsStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/EqualsStrategy2.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/EqualsStrategy2.java index e5c0e61ac..ebca14ed3 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/EqualsStrategy2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/EqualsStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface EqualsStrategy2 { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCode.java similarity index 57% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCode.java index 95890cc67..aeb9275d4 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCode.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface HashCode { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCode2.java similarity index 55% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCode2.java index 1de23ad88..9bd1d3066 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCode2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCode2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface HashCode2 { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCodeStrategy.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCodeStrategy.java index 2f645089a..32d753ff5 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCodeStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface HashCodeStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCodeStrategy2.java similarity index 94% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCodeStrategy2.java index ca6738ea8..e92bb1e10 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/HashCodeStrategy2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/HashCodeStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface HashCodeStrategy2 { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBCopyStrategy.java similarity index 89% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBCopyStrategy.java index bacd215ab..9a2885043 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBCopyStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBCopyStrategy.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.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.jaxb.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb.locator.util.LocatorUtils.property; import java.util.ArrayList; import java.util.List; import jakarta.xml.bind.JAXBElement; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; import org.w3c.dom.Node; public class JAXBCopyStrategy extends DefaultCopyStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBEqualsStrategy.java similarity index 89% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBEqualsStrategy.java index 1f81e802e..bf6b64e0a 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBEqualsStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBEqualsStrategy.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.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.jaxb.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb.locator.util.LocatorUtils.property; import java.util.Iterator; import java.util.List; -import jakarta.xml.bind.JAXBElement; +import org.jvnet.jaxb.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import jakarta.xml.bind.JAXBElement; public class JAXBEqualsStrategy extends DefaultEqualsStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBHashCodeStrategy.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBHashCodeStrategy.java index 98bb765d1..16b82e014 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBHashCodeStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBHashCodeStrategy.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.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.jaxb.locator.util.LocatorUtils.item; +import static org.jvnet.jaxb.locator.util.LocatorUtils.property; import java.util.List; -import jakarta.xml.bind.JAXBElement; +import org.jvnet.jaxb.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import jakarta.xml.bind.JAXBElement; public class JAXBHashCodeStrategy extends DefaultHashCodeStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBMergeCollectionsStrategy.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBMergeCollectionsStrategy.java index 4f5e41a03..1d8e66536 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBMergeCollectionsStrategy.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.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.jaxb.locator.ObjectLocator; public class JAXBMergeCollectionsStrategy extends JAXBMergeStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBMergeStrategy.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBMergeStrategy.java index 588b8a4fe..775449795 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBMergeStrategy.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; import java.util.Collection; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public class JAXBMergeStrategy extends DefaultMergeStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBToStringStrategy.java similarity index 94% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBToStringStrategy.java index 079bcfe8e..438484f79 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/JAXBToStringStrategy.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import jakarta.xml.bind.JAXBElement; +import org.jvnet.jaxb.locator.ObjectLocator; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import jakarta.xml.bind.JAXBElement; public class JAXBToStringStrategy extends DefaultToStringStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeFrom.java similarity index 75% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeFrom.java index 216943725..dd4397f10 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeFrom.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface MergeFrom { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeFrom2.java similarity index 74% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeFrom2.java index 8e9597816..9d0dc4c88 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeFrom2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeFrom2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface MergeFrom2 { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeStrategy.java similarity index 95% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeStrategy.java index c365bf638..40f3eae9e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface MergeStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeStrategy2.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeStrategy2.java index 2b1b1e783..659f0cf37 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/MergeStrategy2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/MergeStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface MergeStrategy2 { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/StringUtils.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/StringUtils.java index 078239edb..b6e2a07ef 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/StringUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/StringUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; import java.util.ArrayList; import java.util.Iterator; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToString.java similarity index 76% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToString.java index 68977f6d4..a6e45dc34 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToString.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface ToString { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToString2.java similarity index 75% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToString2.java index 830648796..724f98329 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToString2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToString2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface ToString2 { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToStringStrategy.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToStringStrategy.java index b7ab9afb5..8a5d5d809 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToStringStrategy.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; @Deprecated public interface ToStringStrategy { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToStringStrategy2.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToStringStrategy2.java index 1a992868b..4c8b1ed32 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/ToStringStrategy2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/ToStringStrategy2.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; public interface ToStringStrategy2 { /* diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/Validate.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/Validate.java index cb2bdd724..ae12c12c3 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/lang/Validate.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/lang/Validate.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; import java.util.Collection; import java.util.Iterator; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/AbstractObjectLocator.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/AbstractObjectLocator.java index 8bdd4c8d1..c2249335b 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/AbstractObjectLocator.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/AbstractObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb.locator; import java.net.URL; import java.text.MessageFormat; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/DefaultItemObjectLocator.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/DefaultItemObjectLocator.java index c27d0a384..fa090e29e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultItemObjectLocator.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/DefaultItemObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb.locator; import java.text.MessageFormat; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/DefaultPropertyObjectLocator.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/DefaultPropertyObjectLocator.java index dba481082..4d1ca5d38 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultPropertyObjectLocator.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/DefaultPropertyObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb.locator; import java.text.MessageFormat; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/DefaultRootObjectLocator.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/DefaultRootObjectLocator.java index 201dcd304..00db8fde6 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/DefaultRootObjectLocator.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/DefaultRootObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb.locator; import java.text.MessageFormat; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/ItemObjectLocator.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/ItemObjectLocator.java index 701565ce8..75b4b992e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ItemObjectLocator.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/ItemObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb.locator; /** * Models item locator. diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/ObjectLocator.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/ObjectLocator.java index 4491907d0..f633733d5 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/ObjectLocator.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/ObjectLocator.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb.locator; -import jakarta.xml.bind.ValidationEventLocator; +import org.jvnet.jaxb.i18n.Reportable; -import org.jvnet.jaxb2_commons.i18n.Reportable; +import jakarta.xml.bind.ValidationEventLocator; /** * Object locator denotes a location in an object structure. diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/PropertyObjectLocator.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/PropertyObjectLocator.java index 99af29717..a8a2bf7ee 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/PropertyObjectLocator.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/PropertyObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb.locator; /** * Models a property locator. diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/RootObjectLocator.java similarity index 60% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/RootObjectLocator.java index 72f23926d..ff037d42f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/RootObjectLocator.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/RootObjectLocator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.locator; +package org.jvnet.jaxb.locator; public interface RootObjectLocator extends ObjectLocator { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/util/LocatorUtils.java similarity index 94% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/util/LocatorUtils.java index e87563841..b41f3065e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/locator/util/LocatorUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/locator/util/LocatorUtils.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.locator.util; +package org.jvnet.jaxb.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.jaxb.locator.ItemObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; +import org.jvnet.jaxb.locator.PropertyObjectLocator; import org.xml.sax.Locator; public class LocatorUtils { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/AfterMarshallCallback.java similarity index 75% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/AfterMarshallCallback.java index 5dfed2431..d8cd9e891 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterMarshallCallback.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/AfterMarshallCallback.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb.xml.bind; import jakarta.xml.bind.Marshaller; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/AfterUnmarshallCallback.java similarity index 78% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/AfterUnmarshallCallback.java index d9ac42afb..bab764621 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/AfterUnmarshallCallback.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/AfterUnmarshallCallback.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb.xml.bind; import jakarta.xml.bind.Unmarshaller; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/BeforeMarshallCallback.java similarity index 76% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/BeforeMarshallCallback.java index 58a900d38..15e9aa085 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeMarshallCallback.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/BeforeMarshallCallback.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb.xml.bind; import jakarta.xml.bind.Marshaller; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/BeforeUnmarshallCallback.java similarity index 79% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/BeforeUnmarshallCallback.java index 42eef5892..510914cc7 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/BeforeUnmarshallCallback.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/BeforeUnmarshallCallback.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb.xml.bind; import jakarta.xml.bind.Unmarshaller; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/ContextPathAware.java similarity index 88% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/ContextPathAware.java index 72ec8a490..2ca2cf649 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/ContextPathAware.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/ContextPathAware.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind; +package org.jvnet.jaxb.xml.bind; /** diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java index 4379b2a8e..b09cae666 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/annotation/adapters/CommaDelimitedStringAdapter.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.annotation.adapters; +package org.jvnet.jaxb.xml.bind.annotation.adapters; import java.util.LinkedList; import java.util.List; -import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import org.jvnet.jaxb.lang.StringUtils; -import org.jvnet.jaxb2_commons.lang.StringUtils; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class CommaDelimitedStringAdapter extends XmlAdapter> { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MAnyAttributePropertyInfo.java similarity index 65% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MAnyAttributePropertyInfo.java index cd8fbec03..df3bcff59 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyAttributePropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MAnyAttributePropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MAnyAttributePropertyInfo extends MPropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MAnyElementPropertyInfo.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MAnyElementPropertyInfo.java index b8fc4ddf4..4116e1a68 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAnyElementPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MAnyElementPropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MAnyElementPropertyInfo extends MPropertyInfo, MWildcard, MMixable { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MAttributePropertyInfo.java similarity index 78% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MAttributePropertyInfo.java index 2a094bd34..b8ea022b3 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MAttributePropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MAttributePropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MBuiltinLeafInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MBuiltinLeafInfo.java new file mode 100644 index 000000000..48152709a --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MBuiltinLeafInfo.java @@ -0,0 +1,9 @@ +package org.jvnet.jaxb.xml.bind.model; + +import org.jvnet.jaxb.xml.bind.model.origin.MBuiltinLeafInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MOriginated; + +public interface MBuiltinLeafInfo extends MTypeInfo, + MOriginated { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassInfo.java similarity index 82% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassInfo.java index de99ef1dd..ee3bd3aa7 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassInfo.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.origin.MClassInfoOrigin; public interface MClassInfo extends MClassTypeInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassRef.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassRef.java new file mode 100644 index 000000000..b6d0eddc8 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassRef.java @@ -0,0 +1,7 @@ +package org.jvnet.jaxb.xml.bind.model; + +import org.jvnet.jaxb.xml.bind.model.origin.MClassRefOrigin; + +public interface MClassRef extends + MClassTypeInfo { +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassTypeInfo.java similarity index 68% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassTypeInfo.java index 2dd3365e5..7dcfb76d3 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassTypeInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb.xml.bind.model.origin.MOriginated; public interface MClassTypeInfo extends MPackagedTypeInfo, MTypeInfo, MOriginated, MContainer { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassTypeInfoVisitor.java similarity index 77% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassTypeInfoVisitor.java index 20e3ce9fa..26e9ca2da 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassTypeInfoVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MClassTypeInfoVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MClassTypeInfoVisitor { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MContained.java similarity index 72% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MContained.java index 02434f151..8986399a5 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContained.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MContained.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MContained { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MContainer.java similarity index 74% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MContainer.java index b5a4d00df..71120aedd 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MContainer.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MContainer.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MContainer extends MPackaged { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomizable.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomizable.java index 8bcd6d915..ba78c3757 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizable.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomizable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MCustomizable { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomization.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomization.java new file mode 100644 index 000000000..66268f638 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomization.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model; + +public interface MCustomization { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomizations.java similarity index 78% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomizations.java index c27fc8376..a3fba0901 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomizations.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MCustomizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; import java.util.List; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MDefaultValue.java similarity index 78% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MDefaultValue.java index 624a643af..367d05b4c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MDefaultValue.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MDefaultValue.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; import javax.xml.namespace.NamespaceContext; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElement.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElement.java new file mode 100644 index 000000000..96e5c3529 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElement.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb.xml.bind.model; + +import org.jvnet.jaxb.xml.bind.model.origin.MElementOrigin; + +public interface MElement extends + MElementTypeInfo { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementInfo.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementInfo.java index f73a31ff6..53611a0c7 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementInfo.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementInfoOrigin; public interface MElementInfo extends MElementTypeInfo, MPackaged, MContained, diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementPropertyInfo.java similarity index 54% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementPropertyInfo.java index d33e51770..6de70b1f0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementPropertyInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public interface MElementPropertyInfo extends MPropertyInfo, MWrappable, MElementTypeInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementRefPropertyInfo.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementRefPropertyInfo.java index 351c70f7b..916a48ec1 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementRefPropertyInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public interface MElementRefPropertyInfo extends MPropertyInfo, MMixable, MWrappable, MWildcard, MElementTypeInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementRefsPropertyInfo.java similarity index 61% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementRefsPropertyInfo.java index 08c751e40..e19f65b88 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementRefsPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementRefsPropertyInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementOrigin; public interface MElementRefsPropertyInfo extends MPropertyInfo, MMixable, MWrappable, MWildcard, diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeInfo.java similarity index 62% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeInfo.java index 68b8efc6d..44eea4eb6 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeInfo.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb.xml.bind.model.origin.MOriginated; public interface MElementTypeInfo extends MTyped, MNillable, MDefaultValue, MOriginated { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeInfos.java similarity index 76% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeInfos.java index be6a7deff..f89dfc1d8 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeInfos.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeInfos.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; import java.util.List; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeRef.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeRef.java new file mode 100644 index 000000000..2f3f96e6a --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementTypeRef.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb.xml.bind.model; + +import org.jvnet.jaxb.xml.bind.model.origin.MElementTypeRefOrigin; + +public interface MElementTypeRef extends + MElementTypeInfo { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementsPropertyInfo.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementsPropertyInfo.java index 63d3e0c10..daa33b9ce 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementsPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MElementsPropertyInfo.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementTypeRefOrigin; public interface MElementsPropertyInfo extends MPropertyInfo, MWrappable, diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MEnumConstantInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MEnumConstantInfo.java new file mode 100644 index 000000000..fe148b994 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MEnumConstantInfo.java @@ -0,0 +1,10 @@ +package org.jvnet.jaxb.xml.bind.model; + +import org.jvnet.jaxb.xml.bind.model.origin.MEnumConstantInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MOriginated; + +public interface MEnumConstantInfo extends + MOriginated { + + public String getLexicalValue(); +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MEnumLeafInfo.java similarity index 76% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MEnumLeafInfo.java index 4386bd44e..4f12a41f9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumLeafInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MEnumLeafInfo.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.origin.MEnumLeafInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MOriginated; public interface MEnumLeafInfo extends MPackagedTypeInfo, MTypeInfo, MOriginated { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MID.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MID.java index 8bee78280..2ce7529fa 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MID.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MID.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MID extends MTypeInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MIDREF.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MIDREF.java index 49d3578b8..7b8835c3c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREF.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MIDREF.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MIDREF extends MTypeInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MIDREFS.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MIDREFS.java index c3bce439d..66109ad57 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MIDREFS.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MIDREFS.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MIDREFS extends MList { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MList.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MList.java index fff029438..1e40453d6 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MList.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MList.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MList extends MTypeInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MMixable.java similarity index 55% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MMixable.java index c1f4c7fe4..241d99115 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MMixable.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MMixable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MMixable { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MModelInfo.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MModelInfo.java index e8f4436bb..10df981c1 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MModelInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MModelInfo.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.origin.MModelInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MOriginated; public interface MModelInfo extends MCustomizable, MOriginated { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MNillable.java similarity index 56% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MNillable.java index 7af37409d..d21e9154a 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MNillable.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MNillable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MNillable { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackageInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackageInfo.java new file mode 100644 index 000000000..e84588e49 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackageInfo.java @@ -0,0 +1,12 @@ +package org.jvnet.jaxb.xml.bind.model; + +import org.jvnet.jaxb.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb.xml.bind.model.origin.MPackageInfoOrigin; + +public interface MPackageInfo extends MOriginated, + MContainer { + + public String getPackageName(); + + public String getPackagedName(String localName); +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackaged.java similarity index 60% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackaged.java index afb4343f8..0b195e9a8 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackaged.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackaged.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MPackaged { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackagedTypeInfo.java similarity index 77% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackagedTypeInfo.java index c260a2d66..1e348aa32 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackagedTypeInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MPackagedTypeInfo extends MTypeInfo, MPackaged, MContained { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackagedTypeInfoVisitor.java similarity index 94% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackagedTypeInfoVisitor.java index ed6a093ee..b1f38a3b9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackagedTypeInfoVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPackagedTypeInfoVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public abstract class MPackagedTypeInfoVisitor implements MTypeInfoVisitor { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPropertyInfo.java similarity index 64% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPropertyInfo.java index f314cd4c5..251bab684 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPropertyInfo.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public interface MPropertyInfo extends MOriginated { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPropertyInfoVisitor.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPropertyInfoVisitor.java index 0e17d7a2b..a164e24ee 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPropertyInfoVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MPropertyInfoVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MPropertyInfoVisitor { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MSingleTypePropertyInfo.java similarity index 71% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MSingleTypePropertyInfo.java index 0030e0133..d2b6887de 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSingleTypePropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MSingleTypePropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MSingleTypePropertyInfo extends MPropertyInfo, MTyped, MDefaultValue { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MSourced.java similarity index 54% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MSourced.java index 02da1bed9..1d4af39f9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MSourced.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MSourced.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MSourced { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTargeted.java similarity index 55% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTargeted.java index a469ee119..4ef48e55d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTargeted.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTargeted.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MTargeted { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTransientPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTransientPropertyInfo.java new file mode 100644 index 000000000..5e3e46a46 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTransientPropertyInfo.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model; + +public interface MTransientPropertyInfo { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTypeInfo.java similarity index 84% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTypeInfo.java index 27b66a4ec..862b09b3e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTypeInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTypeInfoVisitor.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTypeInfoVisitor.java index d2238e54d..1b4e4c319 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTypeInfoVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTypeInfoVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MTypeInfoVisitor extends MClassTypeInfoVisitor { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTyped.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTyped.java index abe30bad9..6a02acbb9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTyped.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MTyped.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MTyped { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MValuePropertyInfo.java similarity index 66% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MValuePropertyInfo.java index a2e740868..eb6211e63 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MValuePropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MValuePropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MValuePropertyInfo extends MSingleTypePropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWildcard.java similarity index 69% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWildcard.java index ebb5d6ab9..10d51452f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcard.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWildcard.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; public interface MWildcard { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWildcardTypeInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWildcardTypeInfo.java new file mode 100644 index 000000000..74102594f --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWildcardTypeInfo.java @@ -0,0 +1,9 @@ +package org.jvnet.jaxb.xml.bind.model; + +import org.jvnet.jaxb.xml.bind.model.origin.MOriginated; +import org.jvnet.jaxb.xml.bind.model.origin.MWildcardTypeInfoOrigin; + +public interface MWildcardTypeInfo extends MTypeInfo, + MOriginated { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWrappable.java similarity index 69% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWrappable.java index 22e6e38a4..0512c41d0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWrappable.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/MWrappable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; +package org.jvnet.jaxb.xml.bind.model; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java similarity index 57% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java index 3cbb55d2b..d715df27a 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMAnyAttributePropertyInfo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public class CMAnyAttributePropertyInfo extends CMPropertyInfo implements MAnyAttributePropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMAnyElementPropertyInfo.java similarity index 74% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMAnyElementPropertyInfo.java index e1e3ceb7d..9338f8696 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAnyElementPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMAnyElementPropertyInfo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public class CMAnyElementPropertyInfo extends CMPropertyInfo implements MAnyElementPropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMAttributePropertyInfo.java similarity index 67% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMAttributePropertyInfo.java index d88ad606d..d634b1736 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMAttributePropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMAttributePropertyInfo.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public class CMAttributePropertyInfo extends CMSingleTypePropertyInfo implements MAttributePropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMBuiltinLeafInfo.java similarity index 74% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMBuiltinLeafInfo.java index 8ce0ec7d0..fdbc460ac 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMBuiltinLeafInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMBuiltinLeafInfo.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MBuiltinLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.origin.MBuiltinLeafInfoOrigin; public class CMBuiltinLeafInfo implements MBuiltinLeafInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMClassInfo.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMClassInfo.java index e17d43adc..9099fb559 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMClassInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.xml.bind.model.concrete; import java.util.ArrayList; import java.util.Collections; @@ -8,20 +8,19 @@ 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 org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MClassTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MClassTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MContainer; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.ClassInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.PropertyInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MClassInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.ClassInfo; import org.glassfish.jaxb.core.v2.model.core.PropertyInfo; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMClassRef.java similarity index 79% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMClassRef.java index ea6e76806..fb878f077 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMClassRef.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMClassRef.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MClassRef; +import org.jvnet.jaxb.xml.bind.model.MClassTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MContainer; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.origin.MClassRefOrigin; +import org.jvnet.jaxb.xml.bind.model.util.XmlTypeUtils; public class CMClassRef implements MClassRef { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMCustomization.java similarity index 67% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMCustomization.java index bdab79c47..246ca5510 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomization.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMCustomization.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.xml.bind.model.concrete; -import org.jvnet.jaxb2_commons.xml.bind.model.MCustomization; +import org.jvnet.jaxb.xml.bind.model.MCustomization; import org.w3c.dom.Element; public class CMCustomization implements MCustomization { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMCustomizations.java similarity index 72% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMCustomizations.java index fede50a1a..fd4af0977 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMCustomizations.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMCustomizations.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MCustomization; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; public class CMCustomizations implements MCustomizations { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElement.java similarity index 71% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElement.java index 9974ddf36..ff848a78e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElement.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElement.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MElement; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MElementOrigin; public class CMElement extends CMElementTypeInfo implements MElement { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementInfo.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementInfo.java index 4ca699c49..172888a45 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementInfo.java @@ -1,17 +1,17 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MContainer; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MElementInfoOrigin; public class CMElementInfo implements MElementInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementPropertyInfo.java similarity index 81% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementPropertyInfo.java index 0154d15ba..24de97d70 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementPropertyInfo.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public class CMElementPropertyInfo extends CMPropertyInfo implements MElementPropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementRefPropertyInfo.java similarity index 84% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementRefPropertyInfo.java index c70897a30..2b62faf73 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementRefPropertyInfo.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public class CMElementRefPropertyInfo extends CMPropertyInfo implements MElementRefPropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementRefsPropertyInfo.java similarity index 81% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementRefsPropertyInfo.java index 8f0116f3a..6e9f4ed25 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementRefsPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementRefsPropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElement; +import org.jvnet.jaxb.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public class CMElementRefsPropertyInfo extends CMPropertyInfo implements MElementRefsPropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementTypeInfo.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementTypeInfo.java index 437045ba5..8896e8605 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementTypeInfo.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MElementTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; public abstract class CMElementTypeInfo implements MElementTypeInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementTypeRef.java similarity index 71% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementTypeRef.java index ffc514510..3e55febfa 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementTypeRef.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementTypeRef.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MElementTypeRef; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MElementTypeRefOrigin; public class CMElementTypeRef extends CMElementTypeInfo implements diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementsPropertyInfo.java similarity index 76% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementsPropertyInfo.java index 42785796b..d1cfb053b 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMElementsPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMElementsPropertyInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElementTypeRef; +import org.jvnet.jaxb.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public class CMElementsPropertyInfo extends CMPropertyInfo implements MElementsPropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMEnumConstantInfo.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMEnumConstantInfo.java index cda19b650..2073704e1 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumConstantInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMEnumConstantInfo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MEnumConstantInfoOrigin; public class CMEnumConstantInfo implements MEnumConstantInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMEnumLeafInfo.java similarity index 82% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMEnumLeafInfo.java index a713caa4c..4bf2ae1e8 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMEnumLeafInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMEnumLeafInfo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.xml.bind.model.concrete; import java.text.MessageFormat; import java.util.ArrayList; @@ -8,21 +8,20 @@ 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 org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MContainer; +import org.jvnet.jaxb.xml.bind.model.MCustomizable; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.EnumConstantOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.EnumLeafInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MEnumLeafInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.EnumConstant; import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMID.java similarity index 72% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMID.java index 8006a24bf..8635d0924 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMID.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMID.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MID; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb.xmlschema.XmlSchemaConstants; public class CMID implements MID { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMIDREF.java similarity index 72% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMIDREF.java index 1dfbdfe42..332ff5ffe 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREF.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMIDREF.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MIDREF; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb.xmlschema.XmlSchemaConstants; public class CMIDREF implements MIDREF { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMIDREFS.java similarity index 61% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMIDREFS.java index 664f4f8b4..701d7f51c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMIDREFS.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMIDREFS.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MIDREFS; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb.xmlschema.XmlSchemaConstants; public class CMIDREFS extends CMList implements MIDREFS { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMInfoFactory.java similarity index 89% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMInfoFactory.java index 0194da9bd..d37448991 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMInfoFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.xml.bind.model.concrete; import java.util.ArrayList; import java.util.Collection; @@ -11,41 +11,40 @@ 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 org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MBuiltinLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MClassTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MContainer; +import org.jvnet.jaxb.xml.bind.model.MElement; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MElementTypeRef; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMAnyAttributePropertyInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMBuiltinLeafInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMClassInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMElementInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMElementOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMElementTypeRefOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMEnumConstantInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMEnumLeafInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMModelInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMPropertyInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMWildcardTypeInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MBuiltinLeafInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MClassInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementTypeRefOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MEnumConstantInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MEnumLeafInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MModelInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; +import org.jvnet.jaxb.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; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMList.java similarity index 76% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMList.java index 41a613f5a..2a2479713 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMList.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMList.java @@ -1,14 +1,14 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MList; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; public class CMList implements MList { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMModel.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMModel.java index 362814281..39ff60c96 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMModel.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMModel.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.xml.bind.model.concrete; import java.util.ArrayList; import java.util.Collection; @@ -9,20 +9,19 @@ 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 org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MBuiltinLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.ClassInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.ElementInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.EnumLeafInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.TypeInfoSetOrigin; +import org.jvnet.jaxb.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; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMPackageInfo.java similarity index 74% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMPackageInfo.java index e500dace1..43678bae0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPackageInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMPackageInfo.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.StringUtils; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MPackageInfoOrigin; public class CMPackageInfo implements MPackageInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMPropertyInfo.java similarity index 74% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMPropertyInfo.java index 1d4a29c0c..32ce492a5 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMPropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMPropertyInfo.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MCustomizable; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public abstract class CMPropertyInfo implements MPropertyInfo, MCustomizable { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMSingleTypePropertyInfo.java similarity index 74% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMSingleTypePropertyInfo.java index 7ed63bc72..4dbe00f9d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMSingleTypePropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMSingleTypePropertyInfo.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MSingleTypePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public abstract class CMSingleTypePropertyInfo extends CMPropertyInfo implements MSingleTypePropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMValuePropertyInfo.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMValuePropertyInfo.java index 838d7143a..154a79e2c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMValuePropertyInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMValuePropertyInfo.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MValuePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; public class CMValuePropertyInfo extends CMSingleTypePropertyInfo implements MValuePropertyInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMWildcardTypeInfo.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMWildcardTypeInfo.java index cf797e0b0..09b3c61d7 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMWildcardTypeInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/CMWildcardTypeInfo.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MCustomizations; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MWildcardTypeInfo; +import org.jvnet.jaxb.xml.bind.model.origin.MWildcardTypeInfoOrigin; public class CMWildcardTypeInfo implements MWildcardTypeInfo { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java index 1457b3a59..9d8a4601f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/BuiltinLeafInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; import org.glassfish.jaxb.core.v2.model.core.BuiltinLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MSourced; public interface BuiltinLeafInfoOrigin> extends MSourced{ diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java new file mode 100644 index 000000000..54f37727a --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java @@ -0,0 +1,7 @@ +package org.jvnet.jaxb.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; + +public class CMAnyAttributePropertyInfoOrigin implements MPropertyInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java similarity index 67% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java index 460813659..68e371595 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMBuiltinLeafInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MBuiltinLeafInfoOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MBuiltinLeafInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.BuiltinLeafInfo; public class CMBuiltinLeafInfoOrigin> diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java similarity index 66% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java index b897a5fcf..3cca271d1 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMClassElementInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MElementInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.ClassInfo; public class CMClassElementInfoOrigin> diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMClassInfoOrigin.java similarity index 65% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMClassInfoOrigin.java index 0138893c2..4e3ae22e0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMClassInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMClassInfoOrigin.java @@ -1,9 +1,8 @@ -package org.jvnet.jaxb2_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; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MClassInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.ClassInfo; public class CMClassInfoOrigin> implements diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMElementInfoOrigin.java similarity index 66% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMElementInfoOrigin.java index c62347b72..300e0878e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMElementInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MElementInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.ElementInfo; public class CMElementInfoOrigin> implements diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMElementOrigin.java similarity index 65% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMElementOrigin.java index 696760570..0b6d4df43 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMElementOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MElementOrigin; import org.glassfish.jaxb.core.v2.model.core.Element; public class CMElementOrigin> diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java similarity index 75% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java index 738c2e2cd..f25fc9102 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMElementTypeRefOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MElementTypeRefOrigin; import org.glassfish.jaxb.core.v2.model.core.ElementPropertyInfo; import org.glassfish.jaxb.core.v2.model.core.TypeRef; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java similarity index 67% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java index b57d01059..fcbe413e9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMEnumConstantInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MEnumConstantInfoOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MEnumConstantInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.EnumConstant; public class CMEnumConstantInfoOrigin> diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java similarity index 67% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java index e0b45621b..9de4be651 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMEnumElementInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementInfoOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MElementInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo; public class CMEnumElementInfoOrigin> diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java similarity index 66% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java index 035736cd8..718087f39 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMEnumLeafInfoOrigin.java @@ -1,9 +1,8 @@ -package org.jvnet.jaxb2_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; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MEnumLeafInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo; public class CMEnumLeafInfoOrigin> diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMModelInfoOrigin.java similarity index 67% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMModelInfoOrigin.java index 5b2613ba9..1027e8333 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMModelInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMModelInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MModelInfoOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MModelInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.TypeInfoSet; public class CMModelInfoOrigin> diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java new file mode 100644 index 000000000..c024c9919 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java @@ -0,0 +1,7 @@ +package org.jvnet.jaxb.xml.bind.model.concrete.origin; + +import org.jvnet.jaxb.xml.bind.model.origin.MPackageInfoOrigin; + +public class CMPackageInfoOrigin implements MPackageInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java similarity index 66% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java index d136c6d2e..f70a33943 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMPropertyInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MPropertyInfoOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.PropertyInfo; public class CMPropertyInfoOrigin> implements MPropertyInfoOrigin, diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java similarity index 67% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java index f97788c22..144895313 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/CMWildcardTypeInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MWildcardTypeInfoOrigin; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MWildcardTypeInfoOrigin; import org.glassfish.jaxb.core.v2.model.core.WildcardTypeInfo; public class CMWildcardTypeInfoOrigin> diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/ClassInfoOrigin.java similarity index 55% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/ClassInfoOrigin.java index a8c28153f..94a7e605e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ClassInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/ClassInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; import org.glassfish.jaxb.core.v2.model.core.ClassInfo; +import org.jvnet.jaxb.xml.bind.model.MSourced; public interface ClassInfoOrigin> extends MSourced { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/ElementInfoOrigin.java similarity index 56% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/ElementInfoOrigin.java index 268bfd15f..b6c3620c6 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/ElementInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; import org.glassfish.jaxb.core.v2.model.core.ElementInfo; +import org.jvnet.jaxb.xml.bind.model.MSourced; public interface ElementInfoOrigin> extends MSourced { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/ElementOrigin.java similarity index 53% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/ElementOrigin.java index 25161a656..4cab5fa22 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/ElementOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/ElementOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; import org.glassfish.jaxb.core.v2.model.core.Element; +import org.jvnet.jaxb.xml.bind.model.MSourced; public interface ElementOrigin> extends MSourced{ diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/EnumConstantOrigin.java similarity index 57% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/EnumConstantOrigin.java index d43f968a0..056c9ba3b 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumConstantOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/EnumConstantOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; import org.glassfish.jaxb.core.v2.model.core.EnumConstant; +import org.jvnet.jaxb.xml.bind.model.MSourced; public interface EnumConstantOrigin> extends MSourced { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java similarity index 57% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java index 2e6eb1344..00f4bb17d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/EnumLeafInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; import org.glassfish.jaxb.core.v2.model.core.EnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MSourced; public interface EnumLeafInfoOrigin> extends MSourced { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/PropertyInfoOrigin.java similarity index 57% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/PropertyInfoOrigin.java index 2f06b0f7d..452aa386e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/PropertyInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/PropertyInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; import org.glassfish.jaxb.core.v2.model.core.PropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MSourced; public interface PropertyInfoOrigin> extends MSourced { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java similarity index 57% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java index 398ce8110..dbdb2923e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/TypeInfoSetOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; import org.glassfish.jaxb.core.v2.model.core.TypeInfoSet; +import org.jvnet.jaxb.xml.bind.model.MSourced; public interface TypeInfoSetOrigin> extends MSourced { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java similarity index 59% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java index 3c87c218b..4fd38ef1b 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/concrete/origin/WildcardTypeInfoOrigin.java @@ -1,8 +1,7 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin; - -import org.jvnet.jaxb2_commons.xml.bind.model.MSourced; +package org.jvnet.jaxb.xml.bind.model.concrete.origin; import org.glassfish.jaxb.core.v2.model.core.WildcardTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MSourced; public interface WildcardTypeInfoOrigin> extends MSourced { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java new file mode 100644 index 000000000..75b2a9d89 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.origin; + +public interface MBuiltinLeafInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MClassInfoOrigin.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MClassInfoOrigin.java index 895b42246..809d09f3d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MClassInfoOrigin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb.xml.bind.model.origin; public interface MClassInfoOrigin { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MClassRefOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MClassRefOrigin.java new file mode 100644 index 000000000..3dfe9f48d --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MClassRefOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.origin; + +public interface MClassRefOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementInfoOrigin.java new file mode 100644 index 000000000..7a7e3717c --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.origin; + +public interface MElementInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementOrigin.java similarity index 54% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementOrigin.java index acc2076ca..6db38d7f9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementOrigin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb.xml.bind.model.origin; public interface MElementOrigin extends MElementInfoOrigin { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementTypeRefOrigin.java similarity index 56% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementTypeRefOrigin.java index 2b4f3301a..3cb75d1b0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementTypeRefOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MElementTypeRefOrigin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb.xml.bind.model.origin; public interface MElementTypeRefOrigin extends MElementInfoOrigin { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MEnumConstantInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MEnumConstantInfoOrigin.java new file mode 100644 index 000000000..3e513ece5 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MEnumConstantInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.origin; + +public interface MEnumConstantInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MEnumLeafInfoOrigin.java similarity index 64% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MEnumLeafInfoOrigin.java index 05c542f69..e7a920040 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumLeafInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MEnumLeafInfoOrigin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb.xml.bind.model.origin; public interface MEnumLeafInfoOrigin { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MModelInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MModelInfoOrigin.java new file mode 100644 index 000000000..764b7f26b --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MModelInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.origin; + +public interface MModelInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MOriginated.java similarity index 52% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MOriginated.java index 08bfab289..c3e6fb1bb 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MOriginated.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MOriginated.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.origin; +package org.jvnet.jaxb.xml.bind.model.origin; public interface MOriginated { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MPackageInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MPackageInfoOrigin.java new file mode 100644 index 000000000..9a891cf6f --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MPackageInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.origin; + +public interface MPackageInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MPropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MPropertyInfoOrigin.java new file mode 100644 index 000000000..19a4a3144 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MPropertyInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.origin; + +public interface MPropertyInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MWildcardTypeInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MWildcardTypeInfoOrigin.java new file mode 100644 index 000000000..958f74105 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/origin/MWildcardTypeInfoOrigin.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.origin; + +public interface MWildcardTypeInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/DefaultPropertyInfoVisitor.java similarity index 59% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/DefaultPropertyInfoVisitor.java index 88f34c2a4..e6c527a6c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultPropertyInfoVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/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.jaxb.xml.bind.model.util; + +import org.jvnet.jaxb.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MValuePropertyInfo; public class DefaultPropertyInfoVisitor implements MPropertyInfoVisitor { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/DefaultTypeInfoVisitor.java similarity index 57% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/DefaultTypeInfoVisitor.java index 11bd5153e..b45df76c3 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/DefaultTypeInfoVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/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.jaxb.xml.bind.model.util; + +import org.jvnet.jaxb.xml.bind.model.MBuiltinLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MClassRef; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MID; +import org.jvnet.jaxb.xml.bind.model.MIDREF; +import org.jvnet.jaxb.xml.bind.model.MIDREFS; +import org.jvnet.jaxb.xml.bind.model.MList; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MWildcardTypeInfo; public class DefaultTypeInfoVisitor implements MTypeInfoVisitor { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/PackageInfoQNameAnalyzer.java similarity index 86% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/PackageInfoQNameAnalyzer.java index fdf364868..6b156fe8d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/PackageInfoQNameAnalyzer.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/PackageInfoQNameAnalyzer.java @@ -1,17 +1,17 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; +package org.jvnet.jaxb.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.jaxb.lang.StringUtils; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; public class PackageInfoQNameAnalyzer { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java similarity index 72% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java index 6da1b9413..576e11d7f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/QNameCollectingPropertyInfoVisitor.java @@ -1,19 +1,19 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElement; +import org.jvnet.jaxb.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementTypeRef; +import org.jvnet.jaxb.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MValuePropertyInfo; public class QNameCollectingPropertyInfoVisitor implements MPropertyInfoVisitor { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/QNameCollector.java similarity index 73% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/QNameCollector.java index 902cd911a..8cec0fd32 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/QNameCollector.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/QNameCollector.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; +package org.jvnet.jaxb.xml.bind.model.util; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/XmlTypeUtils.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/XmlTypeUtils.java index f13517e33..e6026782d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/util/XmlTypeUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/bind/model/util/XmlTypeUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util; +package org.jvnet.jaxb.xml.bind.model.util; import java.util.HashMap; import java.util.Map; @@ -8,9 +8,8 @@ import jakarta.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.lang.Validate; - import org.glassfish.jaxb.core.api.impl.NameConverter; +import org.jvnet.jaxb.lang.Validate; public class XmlTypeUtils { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/namespace/util/QNameUtils.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/namespace/util/QNameUtils.java index 6597066bf..029516058 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/namespace/util/QNameUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xml/namespace/util/QNameUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.namespace.util; +package org.jvnet.jaxb.xml.namespace.util; import javax.xml.XMLConstants; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xmlschema/XmlSchemaConstants.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xmlschema/XmlSchemaConstants.java index 4bcbd4172..29aa9bc6e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xmlschema/XmlSchemaConstants.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb/xmlschema/XmlSchemaConstants.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xmlschema; +package org.jvnet.jaxb.xmlschema; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MBuiltinLeafInfo.java deleted file mode 100644 index ee52ac836..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MClassRef.java deleted file mode 100644 index 4a64e9c17..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MCustomization.java deleted file mode 100644 index 3b994ecd3..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElement.java deleted file mode 100644 index e9b3f17d3..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java deleted file mode 100644 index ea21a9dfa..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MElementTypeRef.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xml.bind.model; - -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MElementTypeRefOrigin; - -public interface MElementTypeRef extends - MElementTypeInfo { - -} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MEnumConstantInfo.java deleted file mode 100644 index 5249f0cb6..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java deleted file mode 100644 index 8b8613faa..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MPackageInfo.java +++ /dev/null @@ -1,12 +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.MPackageInfoOrigin; - -public interface MPackageInfo extends MOriginated, - MContainer { - - public String getPackageName(); - - public String getPackagedName(String localName); -} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MTransientPropertyInfo.java deleted file mode 100644 index 64602728d..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/MWildcardTypeInfo.java deleted file mode 100644 index c83e3a700..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMAnyAttributePropertyInfoOrigin.java deleted file mode 100644 index 69f4aaddf..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/origin/CMPackageInfoOrigin.java deleted file mode 100644 index 3d2ccc098..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MBuiltinLeafInfoOrigin.java deleted file mode 100644 index 4bbf4f3e6..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MClassRefOrigin.java deleted file mode 100644 index 4ded9fef2..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MElementInfoOrigin.java deleted file mode 100644 index 050042ba9..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MEnumConstantInfoOrigin.java deleted file mode 100644 index c13f9875e..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MModelInfoOrigin.java deleted file mode 100644 index 3df809c4c..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPackageInfoOrigin.java deleted file mode 100644 index 1d43b29b7..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MPropertyInfoOrigin.java deleted file mode 100644 index f701d6209..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/origin/MWildcardTypeInfoOrigin.java deleted file mode 100644 index 175cd9659..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/CopyStrategyTest.java similarity index 89% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/CopyStrategyTest.java index a8a72228e..405c9fdf8 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CopyStrategyTest.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/CopyStrategyTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang.tests; +package org.jvnet.jaxb.lang.tests; import java.io.InputStream; @@ -11,10 +11,10 @@ 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.jaxb.lang.CopyStrategy2; +import org.jvnet.jaxb.lang.CopyTo2; +import org.jvnet.jaxb.lang.JAXBCopyStrategy; +import org.jvnet.jaxb.locator.ObjectLocator; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.GeometryFactory; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/CyclicTests.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/CyclicTests.java index 68dc45558..32ade7dde 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/CyclicTests.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/CyclicTests.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.lang.tests; +package org.jvnet.jaxb.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.jaxb.lang.CopyStrategy2; +import org.jvnet.jaxb.lang.CopyTo2; +import org.jvnet.jaxb.lang.JAXBCopyStrategy; +import org.jvnet.jaxb.locator.DefaultRootObjectLocator; +import org.jvnet.jaxb.locator.ObjectLocator; +import org.jvnet.jaxb.locator.util.LocatorUtils; public class CyclicTests extends TestCase { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/DefaultCopyStrategyTest.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/DefaultCopyStrategyTest.java index 78d6ba0af..43925d96c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/DefaultCopyStrategyTest.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.lang.tests; +package org.jvnet.jaxb.lang.tests; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.Polygon; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.lang.DefaultCopyStrategy; -import org.jvnet.jaxb2_commons.lang.tests.pojo.CloneableNoClone; +import org.jvnet.jaxb.lang.DefaultCopyStrategy; +import org.jvnet.jaxb.lang.tests.pojo.CloneableNoClone; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/pojo/CloneableNoClone.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/pojo/CloneableNoClone.java index 3628b42de..c899fc5c7 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/lang/tests/pojo/CloneableNoClone.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.lang.tests.pojo; +package org.jvnet.jaxb.lang.tests.pojo; public class CloneableNoClone implements Cloneable { private final String attribute; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/XmlTypeUtilsTest.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/XmlTypeUtilsTest.java new file mode 100644 index 000000000..6caa7b0b0 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/XmlTypeUtilsTest.java @@ -0,0 +1,150 @@ +package org.jvnet.jaxb.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.jaxb.xml.bind.model.util.XmlTypeUtils; +import org.jvnet.jaxb.xml.namespace.util.QNameUtils; + +@RunWith(Parameterized.class) +public class XmlTypeUtilsTest { + + @Parameters + public static Collection data() { + return Arrays + .asList(new Object[][] { + // + { + "a1", + org.jvnet.jaxb.xml.bind.model.util.tests.alpha.A1.class }, + { + "a2", + org.jvnet.jaxb.xml.bind.model.util.tests.alpha.A2.class }, + { + "AThree", + org.jvnet.jaxb.xml.bind.model.util.tests.alpha.A3.class }, + { + "AFour", + org.jvnet.jaxb.xml.bind.model.util.tests.alpha.A4.class }, + { + "{urn:five}AFive", + org.jvnet.jaxb.xml.bind.model.util.tests.alpha.A5.class }, + { + "a6", + org.jvnet.jaxb.xml.bind.model.util.tests.alpha.A6.class }, + { + "{urn:seven}a7", + org.jvnet.jaxb.xml.bind.model.util.tests.alpha.A7.class }, + { + null, + org.jvnet.jaxb.xml.bind.model.util.tests.alpha.A8.class }, + { + "{urn:nine}ANine", + org.jvnet.jaxb.xml.bind.model.util.tests.alpha.A9.class }, + { + "a1", + org.jvnet.jaxb.xml.bind.model.util.tests.beta.A1.class }, + { + "a2", + org.jvnet.jaxb.xml.bind.model.util.tests.beta.A2.class }, + { + "AThree", + org.jvnet.jaxb.xml.bind.model.util.tests.beta.A3.class }, + { + "AFour", + org.jvnet.jaxb.xml.bind.model.util.tests.beta.A4.class }, + { + "{urn:five}AFive", + org.jvnet.jaxb.xml.bind.model.util.tests.beta.A5.class }, + { + "a6", + org.jvnet.jaxb.xml.bind.model.util.tests.beta.A6.class }, + { + "{urn:seven}a7", + org.jvnet.jaxb.xml.bind.model.util.tests.beta.A7.class }, + { + null, + org.jvnet.jaxb.xml.bind.model.util.tests.beta.A8.class }, + { + "{urn:nine}ANine", + org.jvnet.jaxb.xml.bind.model.util.tests.beta.A9.class }, + { + "{urn:gamma}a1", + org.jvnet.jaxb.xml.bind.model.util.tests.gamma.A1.class }, + { + "{urn:gamma}a2", + org.jvnet.jaxb.xml.bind.model.util.tests.gamma.A2.class }, + { + "{urn:gamma}AThree", + org.jvnet.jaxb.xml.bind.model.util.tests.gamma.A3.class }, + { + "AFour", + org.jvnet.jaxb.xml.bind.model.util.tests.gamma.A4.class }, + { + "{urn:five}AFive", + org.jvnet.jaxb.xml.bind.model.util.tests.gamma.A5.class }, + { + "a6", + org.jvnet.jaxb.xml.bind.model.util.tests.gamma.A6.class }, + { + "{urn:seven}a7", + org.jvnet.jaxb.xml.bind.model.util.tests.gamma.A7.class }, + { + null, + org.jvnet.jaxb.xml.bind.model.util.tests.gamma.A8.class }, + { + "{urn:nine}ANine", + org.jvnet.jaxb.xml.bind.model.util.tests.gamma.A9.class }, + { + "{urn:delta}a1", + org.jvnet.jaxb.xml.bind.model.util.tests.delta.A1.class }, + { + "{urn:delta}a2", + org.jvnet.jaxb.xml.bind.model.util.tests.delta.A2.class }, + { + "{urn:delta}AThree", + org.jvnet.jaxb.xml.bind.model.util.tests.delta.A3.class }, + { + "AFour", + org.jvnet.jaxb.xml.bind.model.util.tests.delta.A4.class }, + { + "{urn:five}five:AFive", + org.jvnet.jaxb.xml.bind.model.util.tests.delta.A5.class }, + { + "a6", + org.jvnet.jaxb.xml.bind.model.util.tests.delta.A6.class }, + { + "{urn:seven}a7", + org.jvnet.jaxb.xml.bind.model.util.tests.delta.A7.class }, + { + null, + org.jvnet.jaxb.xml.bind.model.util.tests.delta.A8.class }, + { + "{urn:nine}ANine", + org.jvnet.jaxb.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/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A1.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A1.java new file mode 100644 index 000000000..ecbbb55eb --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A1.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.util.tests.alpha; + +public class A1 { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A2.java similarity index 54% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A2.java index eb486ce80..8c6908c59 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A2.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; +package org.jvnet.jaxb.xml.bind.model.util.tests.alpha; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A3.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A3.java index 2def47e2a..9f8fa8565 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A3.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A3.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; +package org.jvnet.jaxb.xml.bind.model.util.tests.alpha; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A4.java similarity index 61% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A4.java index ecb20d5b4..bf81c3d84 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A4.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A4.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; +package org.jvnet.jaxb.xml.bind.model.util.tests.alpha; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A5.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A5.java index 70ccc06c4..558f2c9e7 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A5.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A5.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; +package org.jvnet.jaxb.xml.bind.model.util.tests.alpha; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A6.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A6.java index ac44cfd77..b67440ac9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A6.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A6.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; +package org.jvnet.jaxb.xml.bind.model.util.tests.alpha; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A7.java similarity index 60% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A7.java index 72a02d80e..c2ac23059 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A7.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A7.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; +package org.jvnet.jaxb.xml.bind.model.util.tests.alpha; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A8.java similarity index 62% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A8.java index eb1042917..7f5b3f695 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A8.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A8.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; +package org.jvnet.jaxb.xml.bind.model.util.tests.alpha; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A9.java similarity index 64% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A9.java index 7e5f721d9..64820d664 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A9.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/alpha/A9.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.beta; +package org.jvnet.jaxb.xml.bind.model.util.tests.alpha; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A1.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A1.java new file mode 100644 index 000000000..5b77723c8 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A1.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; + +public class A1 { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A2.java similarity index 53% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A2.java index 028046b45..4890791f0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A2.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A3.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A3.java index 4d69ba62d..e2e4acd34 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A3.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A3.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A4.java similarity index 61% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A4.java index 8a0e7de9f..4f6088c29 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A4.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A4.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A5.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A5.java index 095e468d6..e126f739a 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A5.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A5.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A6.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A6.java index 4716614ef..0a24daf6a 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A6.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A6.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A7.java similarity index 60% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A7.java index 25cad8656..ba509af91 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A7.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A7.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A8.java similarity index 62% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A8.java index 512dfcdc3..3ae9daf2f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A8.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A8.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A9.java similarity index 64% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A9.java index cc083a8b9..3c563f886 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A9.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/A9.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/package-info.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/package-info.java new file mode 100644 index 000000000..4aff3789f --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/beta/package-info.java @@ -0,0 +1,5 @@ +@XmlSchema +package org.jvnet.jaxb.xml.bind.model.util.tests.beta; + +import jakarta.xml.bind.annotation.XmlSchema; + diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A1.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A1.java new file mode 100644 index 000000000..75e55a75d --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A1.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.util.tests.delta; + +public class A1 { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A2.java similarity index 53% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A2.java index 6a8f55a93..116cbf216 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A2.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; +package org.jvnet.jaxb.xml.bind.model.util.tests.delta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A3.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A3.java index d7bdc1a50..b0cfa910f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A3.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A3.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; +package org.jvnet.jaxb.xml.bind.model.util.tests.delta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A4.java similarity index 61% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A4.java index 3bc1c1a9f..36c324eda 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A4.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A4.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; +package org.jvnet.jaxb.xml.bind.model.util.tests.delta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A5.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A5.java index 0e5c87120..85e7188f6 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A5.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A5.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; +package org.jvnet.jaxb.xml.bind.model.util.tests.delta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A6.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A6.java index 9a9f09183..fb2937229 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A6.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A6.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; +package org.jvnet.jaxb.xml.bind.model.util.tests.delta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A7.java similarity index 60% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A7.java index bc71f9495..523a32f89 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A7.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A7.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; +package org.jvnet.jaxb.xml.bind.model.util.tests.delta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A8.java similarity index 62% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A8.java index 1d48a116d..1aada2e50 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A8.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A8.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; +package org.jvnet.jaxb.xml.bind.model.util.tests.delta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A9.java similarity index 64% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A9.java index 8c292879b..47e1a4076 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A9.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/A9.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; +package org.jvnet.jaxb.xml.bind.model.util.tests.delta; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/package-info.java similarity index 79% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/package-info.java index 7ccde85f0..d971139cc 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/package-info.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/delta/package-info.java @@ -1,7 +1,7 @@ @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.jaxb.xml.bind.model.util.tests.delta; import jakarta.xml.bind.annotation.XmlNs; import jakarta.xml.bind.annotation.XmlSchema; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A1.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A1.java new file mode 100644 index 000000000..bd8a95964 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A1.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; + +public class A1 { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A2.java similarity index 53% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A2.java index 5b65c3d1c..6ab748512 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A2.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A2.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.delta; +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A3.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A3.java index 3f0180f91..087c58fe7 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A3.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A3.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A4.java similarity index 61% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A4.java index 0a9dd8eb8..927c55dab 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A4.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A4.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A5.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A5.java index 44880b940..0a831fc05 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A5.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A5.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A6.java similarity index 58% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A6.java index 48f379901..c18175740 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A6.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A6.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.alpha; +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A7.java similarity index 60% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A7.java index a47874fb6..537cfde33 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A7.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A7.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A8.java similarity index 62% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A8.java index 57ce8f663..87096c48f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A8.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A8.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A9.java similarity index 64% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A9.java index 5d0a1dcda..3994ed9db 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A9.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/A9.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; import jakarta.xml.bind.annotation.XmlType; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/package-info.java similarity index 56% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/package-info.java index b643d7405..83167bb36 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/package-info.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/bind/model/util/tests/gamma/package-info.java @@ -1,5 +1,5 @@ @XmlSchema(namespace = "urn:gamma") -package org.jvnet.jaxb2_commons.xml.bind.model.util.tests.gamma; +package org.jvnet.jaxb.xml.bind.model.util.tests.gamma; import jakarta.xml.bind.annotation.XmlSchema; diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/namespace/util/tests/QNameUtilsTest.java similarity index 80% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/namespace/util/tests/QNameUtilsTest.java index 4798157c0..fb0de269d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/namespace/util/tests/QNameUtilsTest.java +++ b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb/xml/namespace/util/tests/QNameUtilsTest.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xml.namespace.util.tests; +package org.jvnet.jaxb.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.jaxb.xml.namespace.util.QNameUtils; public class QNameUtilsTest { diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/XmlTypeUtilsTest.java deleted file mode 100644 index 45da5f367..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/alpha/A1.java deleted file mode 100644 index a5df08dbf..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/A1.java deleted file mode 100644 index f78db7277..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/beta/package-info.java deleted file mode 100644 index e745d6f10..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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 jakarta.xml.bind.annotation.XmlSchema; - diff --git a/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/delta/A1.java deleted file mode 100644 index b3bb6ba48..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/java/org/jvnet/jaxb2_commons/xml/bind/model/util/tests/gamma/A1.java deleted file mode 100644 index 83ec9706d..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/resources/org/jvnet/jaxb2_commons/lang/tests/Test[0].xml b/jaxb-plugins-parent/jaxb-plugins-runtime/src/test/resources/org/jvnet/jaxb/lang/tests/Test[0].xml similarity index 100% rename from jaxb-plugins-parent/jaxb-plugins-runtime/src/test/resources/org/jvnet/jaxb2_commons/lang/tests/Test[0].xml rename to jaxb-plugins-parent/jaxb-plugins-runtime/src/test/resources/org/jvnet/jaxb/lang/tests/Test[0].xml diff --git a/jaxb-plugins-parent/jaxb-plugins-shaded/src/main/java/org/jvnet/jaxb/plugin/Dummy.java b/jaxb-plugins-parent/jaxb-plugins-shaded/src/main/java/org/jvnet/jaxb/plugin/Dummy.java new file mode 100644 index 000000000..0363196b1 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-shaded/src/main/java/org/jvnet/jaxb/plugin/Dummy.java @@ -0,0 +1,3 @@ +package org.jvnet.jaxb.plugin; + +public class Dummy {} diff --git a/jaxb-plugins-parent/jaxb-plugins-shaded/src/main/java/org/jvnet/jaxb2_commons/plugin/Dummy.java b/jaxb-plugins-parent/jaxb-plugins-shaded/src/main/java/org/jvnet/jaxb2_commons/plugin/Dummy.java deleted file mode 100644 index 73722fa6f..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-shaded/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/jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java b/jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb/lang/ExtendedJAXBEqualsStrategy.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java rename to jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb/lang/ExtendedJAXBEqualsStrategy.java index e969b7450..15230c971 100644 --- a/jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb2_commons/lang/ExtendedJAXBEqualsStrategy.java +++ b/jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb/lang/ExtendedJAXBEqualsStrategy.java @@ -1,10 +1,12 @@ -package org.jvnet.jaxb2_commons.lang; +package org.jvnet.jaxb.lang; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.transform.dom.DOMSource; import org.custommonkey.xmlunit.Diff; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.lang.EqualsStrategy; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.locator.ObjectLocator; import org.w3c.dom.Node; import java.math.BigDecimal; diff --git a/jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb2_commons/test/AbstractSamplesTest.java b/jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb/test/AbstractSamplesTest.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb2_commons/test/AbstractSamplesTest.java rename to jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb/test/AbstractSamplesTest.java index bb55a5b83..9b23e9d40 100644 --- a/jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb2_commons/test/AbstractSamplesTest.java +++ b/jaxb-plugins-parent/jaxb-plugins-testing/src/main/java/org/jvnet/jaxb/test/AbstractSamplesTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.test; +package org.jvnet.jaxb.test; import java.io.File; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins-testing/src/test/java/org/jvnet/jaxb2_commons/test/tests/TrivialSamplesTest.java b/jaxb-plugins-parent/jaxb-plugins-testing/src/test/java/org/jvnet/jaxb/test/tests/TrivialSamplesTest.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-testing/src/test/java/org/jvnet/jaxb2_commons/test/tests/TrivialSamplesTest.java rename to jaxb-plugins-parent/jaxb-plugins-testing/src/test/java/org/jvnet/jaxb/test/tests/TrivialSamplesTest.java index 613f81edb..b7531f562 100644 --- a/jaxb-plugins-parent/jaxb-plugins-testing/src/test/java/org/jvnet/jaxb2_commons/test/tests/TrivialSamplesTest.java +++ b/jaxb-plugins-parent/jaxb-plugins-testing/src/test/java/org/jvnet/jaxb/test/tests/TrivialSamplesTest.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.test.tests; +package org.jvnet.jaxb.test.tests; import java.io.File; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class TrivialSamplesTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/DefaultJCMTypeVisitor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/DefaultJCMTypeVisitor.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/DefaultJCMTypeVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/DefaultJCMTypeVisitor.java index 586ac6498..e8e1aeec8 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/DefaultJCMTypeVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/DefaultJCMTypeVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; public class DefaultJCMTypeVisitor implements JCMTypeVisitor { diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMArrayClass.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMArrayClass.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMArrayClass.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMArrayClass.java index 8b1763586..80799d280 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMArrayClass.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMArrayClass.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; import com.sun.codemodel.JClass; import com.sun.codemodel.JType; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMClass.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMClass.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMClass.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMClass.java index 2e9c25319..489144f96 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMClass.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMClass.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; import com.sun.codemodel.JClass; import com.sun.codemodel.JType; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMNullType.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMNullType.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMNullType.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMNullType.java index 690550894..658a839d9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMNullType.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMNullType.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; import com.sun.codemodel.JNullType; import com.sun.codemodel.JType; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMPrimitiveType.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMPrimitiveType.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMPrimitiveType.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMPrimitiveType.java index 0991abae5..3c6786182 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMPrimitiveType.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMPrimitiveType.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; import com.sun.codemodel.JPrimitiveType; import com.sun.codemodel.JType; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMType.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMType.java similarity index 94% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMType.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMType.java index b2f61d783..1d90275e5 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMType.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMType.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; import org.apache.commons.lang3.Validate; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeFactory.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeFactory.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeFactory.java index 06563dbe0..c52c30f7e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeFactory.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; import java.text.MessageFormat; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVar.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeVar.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVar.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeVar.java index 15e48aa60..b6e8040ee 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVar.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeVar.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; import com.sun.codemodel.JType; import com.sun.codemodel.JTypeVar; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVisitor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeVisitor.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeVisitor.java index 885f90f3e..81f2c0d31 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; public interface JCMTypeVisitor { diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeWildcard.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeWildcard.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeWildcard.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeWildcard.java index 55906d801..3990adea2 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JCMTypeWildcard.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JCMTypeWildcard.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; import com.sun.codemodel.JClass; import com.sun.codemodel.JType; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JConditionable.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JConditionable.java similarity index 80% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JConditionable.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JConditionable.java index 34f70e5a3..d57444a5a 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/codemodel/JConditionable.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/codemodel/JConditionable.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.codemodel; +package org.jvnet.jaxb.codemodel; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpression; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractParameterizablePlugin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/plugin/AbstractParameterizablePlugin.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractParameterizablePlugin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/plugin/AbstractParameterizablePlugin.java index 77385fc75..b73c18881 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractParameterizablePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/plugin/AbstractParameterizablePlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb.plugin; import java.io.IOException; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractPlugin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/plugin/AbstractPlugin.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractPlugin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/plugin/AbstractPlugin.java index a5b126801..143f75a9d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/plugin/AbstractPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/plugin/AbstractPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb.plugin; import java.util.ArrayList; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/plugin/spring/AbstractSpringConfigurablePlugin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/plugin/spring/AbstractSpringConfigurablePlugin.java similarity index 95% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/plugin/spring/AbstractSpringConfigurablePlugin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/plugin/spring/AbstractSpringConfigurablePlugin.java index 8c40e0d95..6f8fdd984 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/plugin/spring/AbstractSpringConfigurablePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/plugin/spring/AbstractSpringConfigurablePlugin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.plugin.spring; +package org.jvnet.jaxb.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.jaxb.plugin.AbstractParameterizablePlugin; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/Accessor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/reflection/util/Accessor.java similarity index 68% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/Accessor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/reflection/util/Accessor.java index f226996db..79e9d9fae 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/Accessor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/reflection/util/Accessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.reflection.util; +package org.jvnet.jaxb.reflection.util; public interface Accessor { diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/FieldAccessor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/reflection/util/FieldAccessor.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/FieldAccessor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/reflection/util/FieldAccessor.java index e2898db20..b82fe9b81 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/reflection/util/FieldAccessor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/reflection/util/FieldAccessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.reflection.util; +package org.jvnet.jaxb.reflection.util; import java.lang.reflect.Field; import java.text.MessageFormat; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/ClassOutlineProcessor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/ClassOutlineProcessor.java similarity index 84% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/ClassOutlineProcessor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/ClassOutlineProcessor.java index 31936d5b7..225a74d8c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/ClassOutlineProcessor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/ClassOutlineProcessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.strategy; +package org.jvnet.jaxb.strategy; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.ClassOutline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/FieldOutlineProcessor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/FieldOutlineProcessor.java similarity index 84% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/FieldOutlineProcessor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/FieldOutlineProcessor.java index 53a4b05b3..1b0d3efb8 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/FieldOutlineProcessor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/FieldOutlineProcessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.strategy; +package org.jvnet.jaxb.strategy; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.FieldOutline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/OutlineProcessor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/OutlineProcessor.java similarity index 82% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/OutlineProcessor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/OutlineProcessor.java index 84d045b45..7e1ce28b5 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/OutlineProcessor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/OutlineProcessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.strategy; +package org.jvnet.jaxb.strategy; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.Outline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/PackageOutlineProcessor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/PackageOutlineProcessor.java similarity index 84% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/PackageOutlineProcessor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/PackageOutlineProcessor.java index 0d571557d..7cd0afd88 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/PackageOutlineProcessor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/PackageOutlineProcessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.strategy; +package org.jvnet.jaxb.strategy; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.PackageOutline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/impl/DefaultOutlineProcessor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/impl/DefaultOutlineProcessor.java similarity index 86% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/impl/DefaultOutlineProcessor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/impl/DefaultOutlineProcessor.java index 1a96abe4f..24fa79e05 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/strategy/impl/DefaultOutlineProcessor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/strategy/impl/DefaultOutlineProcessor.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.strategy.impl; +package org.jvnet.jaxb.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.jaxb.strategy.ClassOutlineProcessor; +import org.jvnet.jaxb.strategy.OutlineProcessor; import com.sun.tools.xjc.Options; import com.sun.tools.xjc.outline.ClassOutline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/ClassUtils.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/ClassUtils.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/ClassUtils.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/ClassUtils.java index 1d437ac78..ebec3de3f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/ClassUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/ClassUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/CodeModelUtils.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/CodeModelUtils.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/CodeModelUtils.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/CodeModelUtils.java index fd5cb6449..d3b99e835 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/CodeModelUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/CodeModelUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; import java.util.Iterator; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/CustomizationUtils.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/CustomizationUtils.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/CustomizationUtils.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/CustomizationUtils.java index d4e8bf456..252c2d0a4 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/CustomizationUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/CustomizationUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; import java.util.ArrayList; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/FieldAccessorFactory.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorFactory.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/FieldAccessorFactory.java index 369f881af..a356b19f7 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorFactory.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/FieldAccessorFactory.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; import com.sun.codemodel.JExpression; import com.sun.tools.xjc.outline.FieldOutline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorUtils.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/FieldAccessorUtils.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorUtils.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/FieldAccessorUtils.java index 28209b53e..6d737e489 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldAccessorUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/FieldAccessorUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; import com.sun.codemodel.JDefinedClass; import com.sun.codemodel.JFieldVar; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldUtils.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/FieldUtils.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldUtils.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/FieldUtils.java index 41f7ee32a..eabce7e1b 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/FieldUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/FieldUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; import java.util.Collection; import java.util.HashSet; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/GeneratorContextUtils.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/GeneratorContextUtils.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/GeneratorContextUtils.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/GeneratorContextUtils.java index 797ec481e..292146c15 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/GeneratorContextUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/GeneratorContextUtils.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; -import org.jvnet.jaxb2_commons.xml.bind.ContextPathAware; +import org.jvnet.jaxb.xml.bind.ContextPathAware; import com.sun.codemodel.JClass; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/JClassUtils.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/JClassUtils.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/JClassUtils.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/JClassUtils.java index 3aa723e66..dbe236dd3 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/JClassUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/JClassUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; import java.util.Iterator; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/OutlineUtils.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/OutlineUtils.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/OutlineUtils.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/OutlineUtils.java index 36ad5ea28..57ddbf8e5 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/OutlineUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/OutlineUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; import java.util.Iterator; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/PropertyFieldAccessorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/PropertyFieldAccessorFactory.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/PropertyFieldAccessorFactory.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/PropertyFieldAccessorFactory.java index 8c4d8b2a2..9380169bd 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/util/PropertyFieldAccessorFactory.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/util/PropertyFieldAccessorFactory.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.util; +package org.jvnet.jaxb.util; -import org.jvnet.jaxb2_commons.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; import com.sun.codemodel.JBlock; import com.sun.codemodel.JConditional; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MClassOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MClassOutlineGenerator.java new file mode 100644 index 000000000..9cc5c109a --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MClassOutlineGenerator.java @@ -0,0 +1,16 @@ +package org.jvnet.jaxb.xjc.generator; + +import org.jvnet.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MElementOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MElementOutlineGenerator.java new file mode 100644 index 000000000..775461023 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MElementOutlineGenerator.java @@ -0,0 +1,17 @@ +package org.jvnet.jaxb.xjc.generator; + +import org.jvnet.jaxb.xjc.outline.MElementOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumConstantOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MEnumConstantOutlineGenerator.java similarity index 50% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumConstantOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MEnumConstantOutlineGenerator.java index 727601c51..e11fd2ff0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumConstantOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MEnumConstantOutlineGenerator.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.generator; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb.xjc.outline.MEnumOutline; +import org.jvnet.jaxb.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.nav.NClass; import com.sun.tools.xjc.model.nav.NType; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MEnumOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MEnumOutlineGenerator.java new file mode 100644 index 000000000..3fa4f7798 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MEnumOutlineGenerator.java @@ -0,0 +1,16 @@ +package org.jvnet.jaxb.xjc.generator; + +import org.jvnet.jaxb.xjc.outline.MEnumOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MModelOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MModelOutlineGenerator.java similarity index 55% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MModelOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MModelOutlineGenerator.java index 657c29307..4a1be5c10 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MModelOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MModelOutlineGenerator.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.generator; +package org.jvnet.jaxb.xjc.generator; -import org.jvnet.jaxb2_commons.xjc.outline.MModelOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.nav.NClass; import com.sun.tools.xjc.model.nav.NType; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MObjectFactoryOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MObjectFactoryOutlineGenerator.java new file mode 100644 index 000000000..747848903 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MObjectFactoryOutlineGenerator.java @@ -0,0 +1,16 @@ +package org.jvnet.jaxb.xjc.generator; + +import org.jvnet.jaxb.xjc.outline.MObjectFactoryOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MPackageOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MPackageOutlineGenerator.java new file mode 100644 index 000000000..90e083f03 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MPackageOutlineGenerator.java @@ -0,0 +1,16 @@ +package org.jvnet.jaxb.xjc.generator; + +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPropertyOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MPropertyOutlineGenerator.java similarity index 50% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPropertyOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MPropertyOutlineGenerator.java index c07330ee8..9e7697bc8 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPropertyOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/MPropertyOutlineGenerator.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.generator; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; import com.sun.tools.xjc.model.nav.NClass; import com.sun.tools.xjc.model.nav.NType; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java similarity index 52% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java index f395c8e36..1db247142 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/artificial/WrapperPropertyOutlineGenerator.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.xjc.generator.artificial; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessorFactory; +import org.jvnet.jaxb.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb.xjc.outline.concrete.CMPropertyOutline; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JExpression; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMClassOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMClassOutlineGenerator.java similarity index 74% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMClassOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMClassOutlineGenerator.java index 50b2b8285..55a91e029 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMClassOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMClassOutlineGenerator.java @@ -1,17 +1,17 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MClassOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb.xjc.outline.concrete.CMClassOutline; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MClassRef; +import org.jvnet.jaxb.xml.bind.model.MClassTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMElementOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMElementOutlineGenerator.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMElementOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMElementOutlineGenerator.java index 63800bbfc..8ea60d182 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMElementOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMElementOutlineGenerator.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MElementOutlineGenerator; +import org.jvnet.jaxb.xjc.outline.MElementOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xjc.outline.concrete.CMElementOutline; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.CElementInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java similarity index 73% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java index 53285ae38..243592797 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMEnumConstantOutlineGenerator.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MEnumConstantOutlineGenerator; +import org.jvnet.jaxb.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb.xjc.outline.MEnumOutline; +import org.jvnet.jaxb.xjc.outline.concrete.CMEnumConstantOutline; +import org.jvnet.jaxb.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.CEnumConstant; import com.sun.tools.xjc.model.CEnumLeafInfo; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMEnumOutlineGenerator.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMEnumOutlineGenerator.java index faccaf041..4a9eaf3e9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMEnumOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMEnumOutlineGenerator.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MEnumConstantOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.MEnumOutlineGenerator; +import org.jvnet.jaxb.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb.xjc.outline.MEnumOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xjc.outline.concrete.CMEnumOutline; +import org.jvnet.jaxb.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; import com.sun.tools.xjc.model.CEnumLeafInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMModelOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMModelOutlineGenerator.java similarity index 79% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMModelOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMModelOutlineGenerator.java index da7395897..ae6e8a609 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMModelOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMModelOutlineGenerator.java @@ -1,24 +1,24 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MClassOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.MElementOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.MEnumOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.MModelOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.MPackageOutlineGenerator; +import org.jvnet.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MElementOutline; +import org.jvnet.jaxb.xjc.outline.MEnumOutline; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xjc.outline.concrete.CMModelOutline; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MClassRef; +import org.jvnet.jaxb.xml.bind.model.MClassTypeInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; import com.sun.tools.xjc.model.Model; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPackageOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMPackageOutlineGenerator.java similarity index 68% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPackageOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMPackageOutlineGenerator.java index 89aebe764..567ab4a76 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPackageOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMPackageOutlineGenerator.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MPackageOutlineGenerator; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xjc.outline.concrete.CMPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; import com.sun.codemodel.JPackage; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPropertyOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMPropertyOutlineGenerator.java similarity index 62% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPropertyOutlineGenerator.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMPropertyOutlineGenerator.java index c73934b0a..c8bcdea5c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/CMPropertyOutlineGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/CMPropertyOutlineGenerator.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb.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.jaxb.util.FieldAccessorFactory; +import org.jvnet.jaxb.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessorFactory; +import org.jvnet.jaxb.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb.xjc.outline.concrete.CMPropertyAccessorFactory; +import org.jvnet.jaxb.xjc.outline.concrete.CMPropertyOutline; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; import com.sun.tools.xjc.model.CPropertyInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ClassOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ClassOutlineGeneratorFactory.java new file mode 100644 index 000000000..f970c09a1 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ClassOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb.xjc.generator.concrete; + +import org.jvnet.jaxb.xjc.generator.MClassOutlineGenerator; + +public interface ClassOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ElementOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ElementOutlineGeneratorFactory.java new file mode 100644 index 000000000..947e16e1a --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ElementOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb.xjc.generator.concrete; + +import org.jvnet.jaxb.xjc.generator.MElementOutlineGenerator; + +public interface ElementOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java new file mode 100644 index 000000000..b9fa2bfc9 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb.xjc.generator.concrete; + +import org.jvnet.jaxb.xjc.generator.MEnumConstantOutlineGenerator; + +public interface EnumConstantOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/EnumOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/EnumOutlineGeneratorFactory.java new file mode 100644 index 000000000..e219f0573 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/EnumOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb.xjc.generator.concrete; + +import org.jvnet.jaxb.xjc.generator.MEnumOutlineGenerator; + +public interface EnumOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ModelOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ModelOutlineGeneratorFactory.java new file mode 100644 index 000000000..268b0687d --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/ModelOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb.xjc.generator.concrete; + +import org.jvnet.jaxb.xjc.generator.MModelOutlineGenerator; + +public interface ModelOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/OutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/OutlineGeneratorFactory.java similarity index 71% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/OutlineGeneratorFactory.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/OutlineGeneratorFactory.java index e67d87275..588a77356 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/OutlineGeneratorFactory.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/OutlineGeneratorFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; +package org.jvnet.jaxb.xjc.generator.concrete; import com.sun.tools.xjc.outline.Outline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/PackageOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/PackageOutlineGeneratorFactory.java new file mode 100644 index 000000000..52817dffe --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/PackageOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb.xjc.generator.concrete; + +import org.jvnet.jaxb.xjc.generator.MPackageOutlineGenerator; + +public interface PackageOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java new file mode 100644 index 000000000..64a32da32 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java @@ -0,0 +1,8 @@ +package org.jvnet.jaxb.xjc.generator.concrete; + +import org.jvnet.jaxb.xjc.generator.MPropertyOutlineGenerator; + +public interface PropertyOutlineGeneratorFactory extends + OutlineGeneratorFactory { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/XJCCMInfoFactory.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/XJCCMInfoFactory.java index 9f59f845a..556ca2299 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/XJCCMInfoFactory.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/XJCCMInfoFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete; +package org.jvnet.jaxb.xjc.model.concrete; import java.util.HashMap; import java.util.IdentityHashMap; @@ -7,36 +7,36 @@ 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.jvnet.jaxb.xjc.model.concrete.origin.XJCCMClassInfoOrigin; +import org.jvnet.jaxb.xjc.model.concrete.origin.XJCCMClassRefOrigin; +import org.jvnet.jaxb.xjc.model.concrete.origin.XJCCMElementInfoOrigin; +import org.jvnet.jaxb.xjc.model.concrete.origin.XJCCMElementOrigin; +import org.jvnet.jaxb.xjc.model.concrete.origin.XJCCMElementTypeRefOrigin; +import org.jvnet.jaxb.xjc.model.concrete.origin.XJCCMEnumConstantInfoOrigin; +import org.jvnet.jaxb.xjc.model.concrete.origin.XJCCMEnumLeafInfoOrigin; +import org.jvnet.jaxb.xjc.model.concrete.origin.XJCCMModelInfoOrigin; +import org.jvnet.jaxb.xjc.model.concrete.origin.XJCCMPackageInfoOrigin; +import org.jvnet.jaxb.xjc.model.concrete.origin.XJCCMPropertyInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MClassRef; +import org.jvnet.jaxb.xml.bind.model.MClassTypeInfo; +import org.jvnet.jaxb.xml.bind.model.MContainer; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.bind.model.concrete.CMClassRef; +import org.jvnet.jaxb.xml.bind.model.concrete.CMInfoFactory; +import org.jvnet.jaxb.xml.bind.model.concrete.CMPackageInfo; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMPackageInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MClassInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MClassRefOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MElementTypeRefOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MEnumConstantInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MEnumLeafInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MModelInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MPackageInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; import com.sun.codemodel.JClass; import com.sun.codemodel.JPackage; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java similarity index 56% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java index 885f2a9fd..7eaa6d047 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/DefaultPropertyInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.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.jaxb.lang.Validate; +import org.jvnet.jaxb.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.PropertyOutlineGeneratorFactory; +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; import com.sun.tools.xjc.outline.Outline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java new file mode 100644 index 000000000..defe108aa --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java @@ -0,0 +1,7 @@ +package org.jvnet.jaxb.xjc.model.concrete.origin; + +import org.jvnet.jaxb.xml.bind.model.origin.MPropertyInfoOrigin; + +public class DummyPropertyInfoOrigin implements MPropertyInfoOrigin { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/PackageInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/PackageInfoOrigin.java new file mode 100644 index 000000000..6e181c873 --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/PackageInfoOrigin.java @@ -0,0 +1,9 @@ +package org.jvnet.jaxb.xjc.model.concrete.origin; + +import org.jvnet.jaxb.xml.bind.model.MSourced; + +import com.sun.codemodel.JPackage; + +public interface PackageInfoOrigin extends MSourced { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java similarity index 65% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java index 40d53cd83..882c4acfb 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMClassInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MClassOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.CMClassOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.ClassOutlineGeneratorFactory; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMClassInfoOrigin; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMClassRefOrigin.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMClassRefOrigin.java index c6bee8bc1..5a9738e83 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMClassRefOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMClassRefOrigin.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.xjc.model.concrete.origin; -import org.jvnet.jaxb2_commons.lang.Validate; -import org.jvnet.jaxb2_commons.xml.bind.model.origin.MClassRefOrigin; +import org.jvnet.jaxb.lang.Validate; +import org.jvnet.jaxb.xml.bind.model.origin.MClassRefOrigin; import com.sun.tools.xjc.model.CClassRef; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java index dc329ea40..5dbd2700f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMElementInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MElementOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.CMElementOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.ElementOutlineGeneratorFactory; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMElementInfoOrigin; import com.sun.tools.xjc.model.CElementInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMElementOrigin.java similarity index 78% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMElementOrigin.java index bfcdc8e8b..da768544c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMElementOrigin.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.xjc.model.concrete.origin; import org.hisrc.xml.xsom.SchemaComponentAware; -import org.jvnet.jaxb2_commons.xml.bind.model.concrete.origin.CMElementOrigin; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMElementOrigin; import com.sun.tools.xjc.model.CElement; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java index 86a068fee..66dead745 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMElementTypeRefOrigin.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.concrete.origin.CMElementTypeRefOrigin; import com.sun.tools.xjc.model.CElementPropertyInfo; import com.sun.tools.xjc.model.CTypeRef; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java similarity index 65% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java index 0167cd480..ad230a40c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMEnumConstantInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MEnumConstantOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.CMEnumConstantOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.EnumConstantOutlineGeneratorFactory; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMEnumConstantInfoOrigin; import com.sun.tools.xjc.model.CEnumConstant; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java similarity index 66% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java index 1b63e4436..8282cb3a9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMEnumLeafInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MEnumOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.CMEnumOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.EnumOutlineGeneratorFactory; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMEnumLeafInfoOrigin; import com.sun.tools.xjc.model.CEnumLeafInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java similarity index 62% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java index a2d17297e..e7318740c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMModelInfoOrigin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MModelOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.CMModelOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.ModelOutlineGeneratorFactory; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMModelInfoOrigin; import com.sun.tools.xjc.model.Model; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java similarity index 60% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java index 389402d7a..e91418514 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMPackageInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MPackageOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.CMPackageOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.PackageOutlineGeneratorFactory; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMPackageInfoOrigin; import com.sun.codemodel.JPackage; import com.sun.tools.xjc.outline.Outline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java similarity index 65% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java index d4201556d..a988ba82d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/model/concrete/origin/XJCCMPropertyInfoOrigin.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.origin; +package org.jvnet.jaxb.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.jaxb.xjc.generator.MPropertyOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.CMPropertyOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.PropertyOutlineGeneratorFactory; +import org.jvnet.jaxb.xml.bind.model.concrete.origin.CMPropertyInfoOrigin; import com.sun.tools.xjc.model.CPropertyInfo; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/FieldAccessorEx.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/FieldAccessorEx.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/FieldAccessorEx.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/FieldAccessorEx.java index 918b2f2dd..ba7dda19e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/FieldAccessorEx.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/FieldAccessorEx.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.xjc.outline; import com.sun.codemodel.JType; import com.sun.tools.xjc.outline.FieldAccessor; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MChildOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MChildOutline.java similarity index 61% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MChildOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MChildOutline.java index ca86fffe3..c1520621f 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MChildOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MChildOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.xjc.outline; public interface MChildOutline { diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MClassOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MClassOutline.java similarity index 79% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MClassOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MClassOutline.java index 8eec678fe..5a565fbbb 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MClassOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MClassOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MTargeted; import com.sun.codemodel.JClass; import com.sun.codemodel.JDefinedClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MElementOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MElementOutline.java similarity index 63% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MElementOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MElementOutline.java index 05761eae9..fcf0fc894 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MElementOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MElementOutline.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.xjc.outline; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MTargeted; import com.sun.codemodel.JDefinedClass; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumConstantOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MEnumConstantOutline.java similarity index 64% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumConstantOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MEnumConstantOutline.java index b9ec0c164..540caa13e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumConstantOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MEnumConstantOutline.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.xjc.outline; -import org.jvnet.jaxb2_commons.xml.bind.model.MEnumConstantInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb.xml.bind.model.MEnumConstantInfo; +import org.jvnet.jaxb.xml.bind.model.MTargeted; import com.sun.codemodel.JEnumConstant; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MEnumOutline.java similarity index 69% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MEnumOutline.java index 3e0dff63d..96ff1a39e 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MEnumOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MEnumOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MTargeted; import com.sun.codemodel.JDefinedClass; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MModelOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MModelOutline.java similarity index 66% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MModelOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MModelOutline.java index 19cc24de7..0699b0d74 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MModelOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MModelOutline.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.MTargeted; import com.sun.codemodel.JCodeModel; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MObjectFactoryOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MObjectFactoryOutline.java similarity index 77% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MObjectFactoryOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MObjectFactoryOutline.java index 3fe33a1b9..7fb17592c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MObjectFactoryOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MObjectFactoryOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.xjc.outline; import com.sun.codemodel.JDefinedClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackageOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPackageOutline.java similarity index 73% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackageOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPackageOutline.java index dac3cb5fa..c43d4b6d9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackageOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPackageOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.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.jaxb.xml.bind.model.MPackageInfo; +import org.jvnet.jaxb.xml.bind.model.MTargeted; import com.sun.codemodel.JPackage; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackagedOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPackagedOutline.java similarity index 65% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackagedOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPackagedOutline.java index 83c2ab960..508e7646c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPackagedOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPackagedOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.xjc.outline; public interface MPackagedOutline { diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPropertyAccessor.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPropertyAccessor.java index f090d4338..b0a915c8b 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPropertyAccessor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.xjc.outline; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpression; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPropertyAccessorFactory.java similarity index 77% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessorFactory.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPropertyAccessorFactory.java index 00586f7ce..f58fab01b 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyAccessorFactory.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPropertyAccessorFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.xjc.outline; import com.sun.codemodel.JExpression; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPropertyOutline.java similarity index 60% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPropertyOutline.java index 144ca02d4..735173198 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/MPropertyOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/MPropertyOutline.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.outline; +package org.jvnet.jaxb.xjc.outline; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MTargeted; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MTargeted; import com.sun.tools.xjc.model.nav.NClass; import com.sun.tools.xjc.model.nav.NType; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractPropertyAccessorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractPropertyAccessorFactory.java new file mode 100644 index 000000000..8fc73a06a --- /dev/null +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractPropertyAccessorFactory.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.xjc.outline.artificial; + +public class AbstractPropertyAccessorFactory { + +} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractPropertyOutline.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractPropertyOutline.java index c7d6e540a..4c42d3f42 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractPropertyOutline.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JAnnotatable; import com.sun.codemodel.JClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractSinglePropertyOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractSinglePropertyOutline.java similarity index 91% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractSinglePropertyOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractSinglePropertyOutline.java index 3fbdbd0d1..3c699c4f1 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractSinglePropertyOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AbstractSinglePropertyOutline.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb.xjc.outline.artificial; -import org.jvnet.jaxb2_commons.xjc.outline.MClassOutline; -import org.jvnet.jaxb2_commons.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpression; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnnotatePropertyVisitor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AnnotatePropertyVisitor.java similarity index 76% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnnotatePropertyVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AnnotatePropertyVisitor.java index e9910c56c..7d4432da9 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnnotatePropertyVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AnnotatePropertyVisitor.java @@ -1,19 +1,19 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb.xjc.outline.artificial; 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.jaxb.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MValuePropertyInfo; import com.sun.codemodel.JAnnotatable; import com.sun.codemodel.JAnnotationUse; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnyAttributePropertyOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AnyAttributePropertyOutline.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnyAttributePropertyOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AnyAttributePropertyOutline.java index 4c28fbe46..c0945e4ab 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AnyAttributePropertyOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/AnyAttributePropertyOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb.xjc.outline.artificial; import java.util.HashMap; import java.util.Map; @@ -6,9 +6,9 @@ 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.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb.xml.bind.model.MAnyAttributePropertyInfo; import com.sun.codemodel.JAnnotatable; import com.sun.codemodel.JBlock; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/ConstantPropertyOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/ConstantPropertyOutline.java similarity index 88% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/ConstantPropertyOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/ConstantPropertyOutline.java index 1ccce2658..720d61e22 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/ConstantPropertyOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/ConstantPropertyOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpr; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/PropertyTypeVisitor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/PropertyTypeVisitor.java similarity index 69% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/PropertyTypeVisitor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/PropertyTypeVisitor.java index 8dc193e83..5f23bc144 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/PropertyTypeVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/PropertyTypeVisitor.java @@ -1,20 +1,20 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xml.bind.model.MAnyAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MAnyElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.MValuePropertyInfo; import com.sun.codemodel.JType; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/SinglePropertyOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/SinglePropertyOutline.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/SinglePropertyOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/SinglePropertyOutline.java index d7502adde..3084eb1e4 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/SinglePropertyOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/artificial/SinglePropertyOutline.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xjc.outline.artificial; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpr; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMClassOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMClassOutline.java similarity index 89% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMClassOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMClassOutline.java index 931a1e8da..2b3712baa 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMClassOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMClassOutline.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; import com.sun.codemodel.JClass; import com.sun.codemodel.JDefinedClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMElementOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMElementOutline.java similarity index 77% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMElementOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMElementOutline.java index d11b4a149..2f5c1c5f4 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMElementOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMElementOutline.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MElementOutline; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; import com.sun.codemodel.JDefinedClass; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumConstantOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMEnumConstantOutline.java similarity index 78% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumConstantOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMEnumConstantOutline.java index 037ede4ca..7e8a682e0 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumConstantOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMEnumConstantOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb.xjc.outline.MEnumOutline; +import org.jvnet.jaxb.xml.bind.model.MEnumConstantInfo; import com.sun.codemodel.JEnumConstant; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMEnumOutline.java similarity index 82% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMEnumOutline.java index d7506c195..de1a6be7c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMEnumOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMEnumOutline.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MEnumConstantOutline; +import org.jvnet.jaxb.xjc.outline.MEnumOutline; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; import com.sun.codemodel.JDefinedClass; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMModelOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMModelOutline.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMModelOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMModelOutline.java index 45b57606b..ac5ecf5da 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMModelOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMModelOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MElementOutline; +import org.jvnet.jaxb.xjc.outline.MEnumOutline; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MEnumLeafInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; import com.sun.codemodel.JCodeModel; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMObjectFactoryOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMObjectFactoryOutline.java similarity index 76% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMObjectFactoryOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMObjectFactoryOutline.java index fec82a708..771e647cd 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMObjectFactoryOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMObjectFactoryOutline.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MObjectFactoryOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; import com.sun.codemodel.JDefinedClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPackageOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPackageOutline.java similarity index 84% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPackageOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPackageOutline.java index ce8edc558..ffb51da6d 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPackageOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPackageOutline.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MElementOutline; +import org.jvnet.jaxb.xjc.outline.MEnumOutline; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xjc.outline.MObjectFactoryOutline; +import org.jvnet.jaxb.xjc.outline.MPackageOutline; +import org.jvnet.jaxb.xml.bind.model.MPackageInfo; import com.sun.codemodel.JPackage; import com.sun.tools.xjc.outline.PackageOutline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessor.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPropertyAccessor.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessor.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPropertyAccessor.java index 66ea82ba7..5002c3637 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessor.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPropertyAccessor.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessor; import com.sun.codemodel.JBlock; import com.sun.codemodel.JExpression; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPropertyAccessorFactory.java similarity index 72% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessorFactory.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPropertyAccessorFactory.java index 65208cf67..e6c74b9be 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyAccessorFactory.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPropertyAccessorFactory.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.util.FieldAccessorFactory; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessorFactory; import com.sun.codemodel.JExpression; import com.sun.tools.xjc.outline.FieldOutline; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyOutline.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPropertyOutline.java similarity index 74% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyOutline.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPropertyOutline.java index 4831106b4..b0c97b413 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/concrete/CMPropertyOutline.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb/xjc/outline/concrete/CMPropertyOutline.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.xjc.outline.concrete; +package org.jvnet.jaxb.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.jaxb.xjc.outline.MClassOutline; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessor; +import org.jvnet.jaxb.xjc.outline.MPropertyAccessorFactory; +import org.jvnet.jaxb.xjc.outline.MPropertyOutline; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; import com.sun.codemodel.JExpression; import com.sun.tools.xjc.model.nav.NClass; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MClassOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MClassOutlineGenerator.java deleted file mode 100644 index 2fc1906b4..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MElementOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MElementOutlineGenerator.java deleted file mode 100644 index 452276c3d..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MEnumOutlineGenerator.java deleted file mode 100644 index a54c226b1..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MObjectFactoryOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MObjectFactoryOutlineGenerator.java deleted file mode 100644 index c9a9bb3e2..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPackageOutlineGenerator.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/MPackageOutlineGenerator.java deleted file mode 100644 index 0525091ef..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ClassOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ClassOutlineGeneratorFactory.java deleted file mode 100644 index 2c51452a1..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java deleted file mode 100644 index c8f3d7348..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ElementOutlineGeneratorFactory.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; - -import org.jvnet.jaxb2_commons.xjc.generator.MElementOutlineGenerator; - -public interface ElementOutlineGeneratorFactory extends - OutlineGeneratorFactory { - -} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java deleted file mode 100644 index 79419eed0..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumConstantOutlineGeneratorFactory.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; - -import org.jvnet.jaxb2_commons.xjc.generator.MEnumConstantOutlineGenerator; - -public interface EnumConstantOutlineGeneratorFactory extends - OutlineGeneratorFactory { - -} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/EnumOutlineGeneratorFactory.java deleted file mode 100644 index 7d2710fdb..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ModelOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/ModelOutlineGeneratorFactory.java deleted file mode 100644 index 3ef9285a4..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java deleted file mode 100644 index 30cdb06d0..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PackageOutlineGeneratorFactory.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; - -import org.jvnet.jaxb2_commons.xjc.generator.MPackageOutlineGenerator; - -public interface PackageOutlineGeneratorFactory extends - OutlineGeneratorFactory { - -} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java deleted file mode 100644 index 561df08fd..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/generator/concrete/PropertyOutlineGeneratorFactory.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.jvnet.jaxb2_commons.xjc.generator.concrete; - -import org.jvnet.jaxb2_commons.xjc.generator.MPropertyOutlineGenerator; - -public interface PropertyOutlineGeneratorFactory extends - OutlineGeneratorFactory { - -} diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/DummyPropertyInfoOrigin.java deleted file mode 100644 index 178829fda..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/PackageInfoOrigin.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/model/concrete/origin/PackageInfoOrigin.java deleted file mode 100644 index 1cee3ff99..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyAccessorFactory.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/main/java/org/jvnet/jaxb2_commons/xjc/outline/artificial/AbstractPropertyAccessorFactory.java deleted file mode 100644 index 08e1f79e4..000000000 --- a/jaxb-plugins-parent/jaxb-plugins-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/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/reflection/util/test/FieldAccessorTest.java similarity index 76% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/reflection/util/test/FieldAccessorTest.java index 3f524e857..3705fe0bd 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/FieldAccessorTest.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/reflection/util/test/FieldAccessorTest.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.reflection.util.test; +package org.jvnet.jaxb.reflection.util.test; 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.jaxb.reflection.util.Accessor; +import org.jvnet.jaxb.reflection.util.FieldAccessor; public class FieldAccessorTest { diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/URIInternalTest.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/reflection/util/test/URIInternalTest.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/URIInternalTest.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/reflection/util/test/URIInternalTest.java index 26f9d55d0..94ce0bbd7 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/reflection/util/test/URIInternalTest.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/reflection/util/test/URIInternalTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.reflection.util.test; +package org.jvnet.jaxb.reflection.util.test; import java.net.URI; import java.net.URISyntaxException; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/util/tests/JClassUtilsTest.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/util/tests/JClassUtilsTest.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/util/tests/JClassUtilsTest.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/util/tests/JClassUtilsTest.java index c7120bc59..3275ab406 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/util/tests/JClassUtilsTest.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/util/tests/JClassUtilsTest.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.util.tests; +package org.jvnet.jaxb.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.jaxb.util.JClassUtils; import com.sun.codemodel.JClass; import com.sun.codemodel.JClassAlreadyExistsException; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/KnownReferencedType.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/xjc/model/concrete/tests/ahpla/KnownReferencedType.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/KnownReferencedType.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/xjc/model/concrete/tests/ahpla/KnownReferencedType.java index 402c3faf6..ba38cd771 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/KnownReferencedType.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/xjc/model/concrete/tests/ahpla/KnownReferencedType.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.tests.ahpla; +package org.jvnet.jaxb.xjc.model.concrete.tests.ahpla; import java.io.Serializable; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/package-info.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/xjc/model/concrete/tests/ahpla/package-info.java similarity index 79% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/package-info.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/xjc/model/concrete/tests/ahpla/package-info.java index 37a94438b..de78efd6c 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/ahpla/package-info.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/xjc/model/concrete/tests/ahpla/package-info.java @@ -1,5 +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.jaxb2_commons.xjc.model.concrete.tests.ahpla; +package org.jvnet.jaxb.xjc.model.concrete.tests.ahpla; import jakarta.xml.bind.annotation.XmlNs; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java similarity index 89% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java rename to jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java index f827c06ab..f40a7721b 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/java/org/jvnet/jaxb/xjc/model/concrete/tests/alpha/AlphaMInfoFactoryTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.xjc.model.concrete.tests.alpha; +package org.jvnet.jaxb.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.jaxb.xjc.model.concrete.XJCCMInfoFactory; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElementInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MTypeInfo; +import org.jvnet.jaxb.xml.namespace.util.QNameUtils; +import org.jvnet.jaxb.xmlschema.XmlSchemaConstants; import com.sun.codemodel.JCodeModel; import com.sun.tools.xjc.BadCommandLineException; diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/binding.xjb b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb/xjc/model/concrete/tests/alpha/binding.xjb similarity index 100% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/binding.xjb rename to jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb/xjc/model/concrete/tests/alpha/binding.xjb diff --git a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/schema.xsd b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb/xjc/model/concrete/tests/alpha/schema.xsd similarity index 95% rename from jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/schema.xsd rename to jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb/xjc/model/concrete/tests/alpha/schema.xsd index bfdc6c362..4738387a1 100644 --- a/jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb2_commons/xjc/model/concrete/tests/alpha/schema.xsd +++ b/jaxb-plugins-parent/jaxb-plugins-tools/src/test/resources/org/jvnet/jaxb/xjc/model/concrete/tests/alpha/schema.xsd @@ -9,7 +9,7 @@ + name="org.jvnet.jaxb.xjc.model.concrete.tests.alpha" /> @@ -44,7 +44,7 @@ + ref="org.jvnet.jaxb.xjc.model.concrete.tests.ahpla.KnownReferencedType" /> @@ -58,7 +58,7 @@ + ref="org.jvnet.jaxb.xjc.model.concrete.tests.ahpla.UnknownReferencedType" /> diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/Customizations.java similarity index 91% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/Customizations.java index 4c5cf4259..d2a09456d 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb.plugin; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/CustomizedIgnoring.java similarity index 95% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/CustomizedIgnoring.java index 3a0ee95ac..6de0de324 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/CustomizedIgnoring.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/CustomizedIgnoring.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb.plugin; import javax.xml.namespace.QName; -import org.jvnet.jaxb2_commons.util.CustomizationUtils; +import org.jvnet.jaxb.util.CustomizationUtils; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.CEnumLeafInfo; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/Ignoring.java similarity index 94% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/Ignoring.java index d5ae14f68..0f38e028a 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/Ignoring.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/Ignoring.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin; +package org.jvnet.jaxb.plugin; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.CEnumLeafInfo; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/autoinheritance/AutoInheritancePlugin.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/autoinheritance/AutoInheritancePlugin.java index 2754259ec..69d00388e 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/autoinheritance/AutoInheritancePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/autoinheritance/AutoInheritancePlugin.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.plugin.autoinheritance; +package org.jvnet.jaxb.plugin.autoinheritance; import java.util.LinkedList; import java.util.List; -import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JClass; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/AbstractCodeGenerationImplementor.java similarity index 88% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/AbstractCodeGenerationImplementor.java index 70db7d1a4..1549e50ec 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerationImplementor.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/AbstractCodeGenerationImplementor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import org.apache.commons.lang3.Validate; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/AbstractCodeGenerator.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/AbstractCodeGenerator.java index 812fbe0e3..f978478c8 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/AbstractCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import org.apache.commons.lang3.Validate; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/AbstractCodeGeneratorPlugin.java similarity index 84% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/AbstractCodeGeneratorPlugin.java index 7ea229533..4f0b2307a 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/AbstractCodeGeneratorPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/AbstractCodeGeneratorPlugin.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.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.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.Customizations; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.util.FieldAccessorFactory; +import org.jvnet.jaxb.util.PropertyFieldAccessorFactory; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/Arguments.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/Arguments.java index 850615a00..67a6d5ad3 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/Arguments.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/Arguments.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ArrayCodeGenerator.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ArrayCodeGenerator.java index 3ace4dfee..047ba4af7 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ArrayCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ArrayCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/BooleanCodeGenerator.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/BooleanCodeGenerator.java index 58aff1bf3..b80063681 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/BooleanCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/BooleanCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ByteCodeGenerator.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ByteCodeGenerator.java index 83d8a66a2..edcbeafe0 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ByteCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ByteCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CharCodeGenerator.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CharCodeGenerator.java index a2b557d53..94b2d3800 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CharCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CharCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CodeGenerationAbstraction.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CodeGenerationAbstraction.java index f8c7483a4..86967bc2c 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationAbstraction.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CodeGenerationAbstraction.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; import java.util.LinkedHashMap; @@ -9,8 +9,8 @@ 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.jaxb.codemodel.JCMType; +import org.jvnet.jaxb.codemodel.JCMTypeFactory; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CodeGenerationImplementor.java similarity index 94% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CodeGenerationImplementor.java index 55dfa19fb..652d63e15 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerationImplementor.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CodeGenerationImplementor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CodeGenerator.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CodeGenerator.java index c37fd9390..bd5de9bd7 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/CodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/CodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/DoubleCodeGenerator.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/DoubleCodeGenerator.java index f6bd11997..fec47aed8 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/DoubleCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/DoubleCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/FloatCodeGenerator.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/FloatCodeGenerator.java index a4c927c11..2975770e1 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/FloatCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/FloatCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/IntCodeGenerator.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/IntCodeGenerator.java index bc9c4f4e7..b8afb851d 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/IntCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/IntCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/JAXBElementCodeGenerator.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/JAXBElementCodeGenerator.java index 5613c600c..603908575 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/JAXBElementCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/JAXBElementCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.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.jaxb.codemodel.JCMTypeFactory; import com.sun.codemodel.JBlock; import com.sun.codemodel.JClass; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ListCodeGenerator.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ListCodeGenerator.java index 0100d33ed..b117d6ed9 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ListCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ListCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; import java.util.HashSet; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/LongCodeGenerator.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/LongCodeGenerator.java index ebe801936..f3caf3597 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/LongCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/LongCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ObjectCodeGenerator.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ObjectCodeGenerator.java index 2d8149d58..6371fa262 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ObjectCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ObjectCodeGenerator.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import jakarta.xml.bind.JAXBElement; +import org.jvnet.jaxb.codemodel.JConditionable; -import org.jvnet.jaxb2_commons.codemodel.JConditionable; +import jakarta.xml.bind.JAXBElement; import com.sun.codemodel.JBlock; import com.sun.codemodel.JClass; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ShortCodeGenerator.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ShortCodeGenerator.java index c999a2ea2..ae389f1b5 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/codegenerator/ShortCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/codegenerator/ShortCodeGenerator.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.codegenerator; +package org.jvnet.jaxb.plugin.codegenerator; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/commons_lang/XjcCommonsLangPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/commons_lang/XjcCommonsLangPlugin.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/commons_lang/XjcCommonsLangPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/commons_lang/XjcCommonsLangPlugin.java index ec867c7bb..6304948d0 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/commons_lang/XjcCommonsLangPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/commons_lang/XjcCommonsLangPlugin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jvnet.jaxb2_commons.plugin.commons_lang; +package org.jvnet.jaxb.plugin.commons_lang; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/copyable/CopyablePlugin.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/copyable/CopyablePlugin.java index 94d28066e..38c1d1460 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/CopyablePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/copyable/CopyablePlugin.java @@ -1,25 +1,25 @@ -package org.jvnet.jaxb2_commons.plugin.copyable; +package org.jvnet.jaxb.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.jaxb.lang.CopyStrategy2; +import org.jvnet.jaxb.lang.CopyTo2; +import org.jvnet.jaxb.lang.JAXBCopyStrategy; +import org.jvnet.jaxb.locator.ObjectLocator; +import org.jvnet.jaxb.locator.util.LocatorUtils; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.Customizations; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb.plugin.util.StrategyClassUtils; +import org.jvnet.jaxb.util.ClassUtils; +import org.jvnet.jaxb.util.FieldAccessorFactory; +import org.jvnet.jaxb.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; 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.jaxb.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.jaxb.plugin.copyable.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/copyable/Customizations.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/copyable/Customizations.java index 9ee7f7818..829d46e48 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/copyable/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/copyable/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.copyable; +package org.jvnet.jaxb.plugin.copyable; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/customizations/Customizations.java similarity index 86% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/customizations/Customizations.java index b35488dfc..bac5cae93 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/customizations/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.customizations; +package org.jvnet.jaxb.plugin.customizations; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/customizations/CustomizationsPlugin.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/customizations/CustomizationsPlugin.java index fd04c0f70..cc9c83c39 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/customizations/CustomizationsPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/customizations/CustomizationsPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.customizations; +package org.jvnet.jaxb.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.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.util.ClassUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/defaultvalueplugin/DefaultValuePlugin.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/defaultvalueplugin/DefaultValuePlugin.java index ecde1a33f..b6736294a 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/defaultvalueplugin/DefaultValuePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/defaultvalueplugin/DefaultValuePlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.defaultvalueplugin; +package org.jvnet.jaxb.plugin.defaultvalueplugin; import java.util.Map; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/elementwrapper/Customizations.java similarity index 82% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/elementwrapper/Customizations.java index 9a9ed3b8c..5772087b9 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/elementwrapper/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.elementwrapper; +package org.jvnet.jaxb.plugin.elementwrapper; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/elementwrapper/ElementWrapperPlugin.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/elementwrapper/ElementWrapperPlugin.java index 0cd139d32..78147e4d0 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/elementwrapper/ElementWrapperPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/elementwrapper/ElementWrapperPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.elementwrapper; +package org.jvnet.jaxb.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.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.plugin.model.AbstractModelPlugin; +import org.jvnet.jaxb.xjc.model.concrete.origin.DummyPropertyInfoOrigin; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xml.bind.model.MPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.concrete.CMElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.concrete.CMElementRefPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.concrete.CMElementRefsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.concrete.CMElementsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.util.DefaultPropertyInfoVisitor; +import org.jvnet.jaxb.xml.bind.model.util.DefaultTypeInfoVisitor; 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.jaxb.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.jaxb.plugin.elementwrapper.Customizations.IGNORED_ELEMENT_NAME); } protected void processWrapperElementPropertyInfo( diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/enumvalue/Customizations.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/enumvalue/Customizations.java index 8710a1ec6..708bb94e2 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/enumvalue/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.enumvalue; +package org.jvnet.jaxb.plugin.enumvalue; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/enumvalue/EnumValuePlugin.java similarity index 78% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/enumvalue/EnumValuePlugin.java index 3514def44..ab9765135 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/enumvalue/EnumValuePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/enumvalue/EnumValuePlugin.java @@ -1,16 +1,16 @@ -package org.jvnet.jaxb2_commons.plugin.enumvalue; +package org.jvnet.jaxb.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.jaxb.lang.EnumValue; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.Customizations; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.util.ClassUtils; 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.jaxb.lang.EnumValue interface."; } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb.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.jaxb.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/equals/Customizations.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/equals/Customizations.java index d4a2d62f6..a89f151f8 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/equals/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.equals; +package org.jvnet.jaxb.plugin.equals; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/equals/EqualsPlugin.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/equals/EqualsPlugin.java index 3086b03f5..764d4fa87 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/equals/EqualsPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/equals/EqualsPlugin.java @@ -1,25 +1,25 @@ -package org.jvnet.jaxb2_commons.plugin.equals; +package org.jvnet.jaxb.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.jaxb.lang.Equals2; +import org.jvnet.jaxb.lang.EqualsStrategy2; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.locator.ObjectLocator; +import org.jvnet.jaxb.locator.util.LocatorUtils; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.Customizations; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb.plugin.util.StrategyClassUtils; +import org.jvnet.jaxb.util.ClassUtils; +import org.jvnet.jaxb.util.FieldAccessorFactory; +import org.jvnet.jaxb.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; 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.jaxb.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.jaxb.plugin.equals.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fixjaxb1058/FixJAXB1058Plugin.java similarity index 95% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fixjaxb1058/FixJAXB1058Plugin.java index eb3fab7f7..5a0d8e68d 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fixjaxb1058/FixJAXB1058Plugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fixjaxb1058/FixJAXB1058Plugin.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.plugin.fixjaxb1058; +package org.jvnet.jaxb.plugin.fixjaxb1058; -import org.jvnet.jaxb2_commons.reflection.util.Accessor; -import org.jvnet.jaxb2_commons.reflection.util.FieldAccessor; +import org.jvnet.jaxb.reflection.util.Accessor; +import org.jvnet.jaxb.reflection.util.FieldAccessor; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/Customizations.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/Customizations.java index a749b9d25..6bd508182 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.fluent_api; +package org.jvnet.jaxb.plugin.fluent_api; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentApiPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/FluentApiPlugin.java similarity index 91% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentApiPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/FluentApiPlugin.java index 2e7f499a8..d5f1d592e 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentApiPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/FluentApiPlugin.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jvnet.jaxb2_commons.plugin.fluent_api; - -import static org.jvnet.jaxb2_commons.plugin.fluent_api.FluentMethodType.FLUENT_COLLECTION_SETTER; -import static org.jvnet.jaxb2_commons.plugin.fluent_api.FluentMethodType.FLUENT_LIST_SETTER; -import static org.jvnet.jaxb2_commons.plugin.fluent_api.FluentMethodType.FLUENT_SETTER; -import static org.jvnet.jaxb2_commons.plugin.fluent_api.FluentMethodType.GETTER_METHOD_PREFIX; -import static org.jvnet.jaxb2_commons.plugin.fluent_api.FluentMethodType.GETTER_METHOD_PREFIX_LEN; -import static org.jvnet.jaxb2_commons.plugin.fluent_api.FluentMethodType.PARAMETERIZED_LIST_PREFIX; -import static org.jvnet.jaxb2_commons.plugin.fluent_api.FluentMethodType.SETTER_METHOD_PREFIX; -import static org.jvnet.jaxb2_commons.plugin.fluent_api.FluentMethodType.SETTER_METHOD_PREFIX_LEN; +package org.jvnet.jaxb.plugin.fluent_api; + +import static org.jvnet.jaxb.plugin.fluent_api.FluentMethodType.FLUENT_COLLECTION_SETTER; +import static org.jvnet.jaxb.plugin.fluent_api.FluentMethodType.FLUENT_LIST_SETTER; +import static org.jvnet.jaxb.plugin.fluent_api.FluentMethodType.FLUENT_SETTER; +import static org.jvnet.jaxb.plugin.fluent_api.FluentMethodType.GETTER_METHOD_PREFIX; +import static org.jvnet.jaxb.plugin.fluent_api.FluentMethodType.GETTER_METHOD_PREFIX_LEN; +import static org.jvnet.jaxb.plugin.fluent_api.FluentMethodType.PARAMETERIZED_LIST_PREFIX; +import static org.jvnet.jaxb.plugin.fluent_api.FluentMethodType.SETTER_METHOD_PREFIX; +import static org.jvnet.jaxb.plugin.fluent_api.FluentMethodType.SETTER_METHOD_PREFIX_LEN; import java.util.ArrayList; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodInfo.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/FluentMethodInfo.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodInfo.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/FluentMethodInfo.java index 57869daea..f6f8cb511 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodInfo.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/FluentMethodInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jvnet.jaxb2_commons.plugin.fluent_api; +package org.jvnet.jaxb.plugin.fluent_api; import com.sun.codemodel.JDefinedClass; import com.sun.codemodel.JMethod; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodType.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/FluentMethodType.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodType.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/FluentMethodType.java index a7f625b57..fef779084 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/fluent_api/FluentMethodType.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/fluent_api/FluentMethodType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jvnet.jaxb2_commons.plugin.fluent_api; +package org.jvnet.jaxb.plugin.fluent_api; import java.util.Collection; import java.util.List; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/hashcode/Customizations.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/hashcode/Customizations.java index 8ac13732c..48e66389e 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/hashcode/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.hashcode; +package org.jvnet.jaxb.plugin.hashcode; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/hashcode/HashCodePlugin.java similarity index 84% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/hashcode/HashCodePlugin.java index 9454991c3..0ab698052 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/hashcode/HashCodePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/hashcode/HashCodePlugin.java @@ -1,25 +1,25 @@ -package org.jvnet.jaxb2_commons.plugin.hashcode; +package org.jvnet.jaxb.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.jaxb.lang.HashCode2; +import org.jvnet.jaxb.lang.HashCodeStrategy2; +import org.jvnet.jaxb.lang.JAXBHashCodeStrategy; +import org.jvnet.jaxb.locator.ObjectLocator; +import org.jvnet.jaxb.locator.util.LocatorUtils; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.Customizations; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb.plugin.util.StrategyClassUtils; +import org.jvnet.jaxb.util.ClassUtils; +import org.jvnet.jaxb.util.FieldAccessorFactory; +import org.jvnet.jaxb.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; 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.jaxb.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.jaxb.plugin.hashcode.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/Customizations.java similarity index 94% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/Customizations.java index a297d52c0..226641810 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/Customizations.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb.plugin.inheritance; 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.jaxb.util.CustomizationUtils; import com.sun.tools.xjc.model.CClassInfo; import com.sun.tools.xjc.model.CPluginCustomization; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ExtendsClass.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ExtendsClass.java index f7acf25ac..0d7793a71 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ExtendsClass.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ExtendsClass.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb.plugin.inheritance; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ImplementsInterface.java similarity index 93% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ImplementsInterface.java index 76b709bf1..f5d5c7a4c 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ImplementsInterface.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ImplementsInterface.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb.plugin.inheritance; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/InheritancePlugin.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/InheritancePlugin.java index 2ddb9213b..21f803acf 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/InheritancePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/InheritancePlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb.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.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.inheritance.util.JavaTypeParser; +import org.jvnet.jaxb.util.CustomizationUtils; 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.jaxb.util.CustomizationUtils .unmarshall(Customizations.getContext(), implementsInterfaceCustomization); diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ObjectFactory.java similarity index 88% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ObjectFactory.java index 0010fba4b..c15a92d3b 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactory.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ObjectFactory.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb.plugin.inheritance; import jakarta.xml.bind.annotation.XmlRegistry; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ObjectFactoryCustomization.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ObjectFactoryCustomization.java index 6fa167110..e3733061c 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/ObjectFactoryCustomization.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/ObjectFactoryCustomization.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance; +package org.jvnet.jaxb.plugin.inheritance; import java.util.ArrayList; import java.util.List; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/util/JavaTypeParser.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/util/JavaTypeParser.java index 2d5d07a6c..b760d22eb 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/JavaTypeParser.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/util/JavaTypeParser.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance.util; +package org.jvnet.jaxb.plugin.inheritance.util; import japa.parser.JavaParser; import japa.parser.ParseException; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java index 5b8a4b7db..c1a3b5edb 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/inheritance/util/TypeToJTypeConvertingVisitor.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance.util; +package org.jvnet.jaxb.plugin.inheritance.util; import japa.parser.ast.type.ClassOrInterfaceType; import japa.parser.ast.type.PrimitiveType; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/jaxbindex/JaxbIndexPlugin.java similarity index 91% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/jaxbindex/JaxbIndexPlugin.java index 7963b7228..69e24d911 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/jaxbindex/JaxbIndexPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/jaxbindex/JaxbIndexPlugin.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.plugin.jaxbindex; +package org.jvnet.jaxb.plugin.jaxbindex; -import org.jvnet.jaxb2_commons.util.CodeModelUtils; +import org.jvnet.jaxb.util.CodeModelUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.fmt.JTextFile; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/mergeable/Customizations.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/mergeable/Customizations.java index 72fad319e..960de7d84 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/mergeable/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.mergeable; +package org.jvnet.jaxb.plugin.mergeable; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/mergeable/MergeablePlugin.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/mergeable/MergeablePlugin.java index 7edec3d17..818ce3891 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/mergeable/MergeablePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/mergeable/MergeablePlugin.java @@ -1,25 +1,25 @@ -package org.jvnet.jaxb2_commons.plugin.mergeable; +package org.jvnet.jaxb.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.jaxb.lang.JAXBMergeStrategy; +import org.jvnet.jaxb.lang.MergeFrom2; +import org.jvnet.jaxb.lang.MergeStrategy2; +import org.jvnet.jaxb.locator.ObjectLocator; +import org.jvnet.jaxb.locator.util.LocatorUtils; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.Customizations; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb.plugin.util.StrategyClassUtils; +import org.jvnet.jaxb.util.ClassUtils; +import org.jvnet.jaxb.util.FieldAccessorFactory; +import org.jvnet.jaxb.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; 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.jaxb.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.jaxb.plugin.mergeable.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/model/AbstractModelPlugin.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/model/AbstractModelPlugin.java index 986a34b77..a44814006 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/model/AbstractModelPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/model/AbstractModelPlugin.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.plugin.model; +package org.jvnet.jaxb.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.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.xjc.generator.MModelOutlineGenerator; +import org.jvnet.jaxb.xjc.generator.concrete.ModelOutlineGeneratorFactory; +import org.jvnet.jaxb.xjc.model.concrete.XJCCMInfoFactory; +import org.jvnet.jaxb.xjc.outline.MModelOutline; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; import org.xml.sax.ErrorHandler; import com.sun.tools.xjc.Options; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/namespace_prefix/NamespacePrefixPlugin.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/namespace_prefix/NamespacePrefixPlugin.java index 503b89847..03c0971a9 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/namespace_prefix/NamespacePrefixPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/namespace_prefix/NamespacePrefixPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.namespace_prefix; +package org.jvnet.jaxb.plugin.namespace_prefix; import jakarta.xml.bind.annotation.XmlNs; import jakarta.xml.bind.annotation.XmlSchema; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/setters/Customizations.java similarity index 84% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/setters/Customizations.java index 104e1c22b..9469b9717 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/setters/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.setters; +package org.jvnet.jaxb.plugin.setters; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/setters/SettersPlugin.java similarity index 90% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/setters/SettersPlugin.java index fa69121fa..16baa51be 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/setters/SettersPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/setters/SettersPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.setters; +package org.jvnet.jaxb.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.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.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.jaxb.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.jaxb.plugin.setters.Customizations.IGNORED_ELEMENT_NAME); } } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/EqualsArguments.java similarity index 98% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/EqualsArguments.java index 1193d3491..ee1bc4052 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsArguments.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/EqualsArguments.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.simpleequals; +package org.jvnet.jaxb.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.jaxb.plugin.codegenerator.Arguments; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/EqualsCodeGenerationImplementor.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/EqualsCodeGenerationImplementor.java index ec98bcfb9..bbb2ae40c 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerationImplementor.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/EqualsCodeGenerationImplementor.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.plugin.simpleequals; +package org.jvnet.jaxb.plugin.simpleequals; import java.util.Arrays; -import org.jvnet.jaxb2_commons.plugin.codegenerator.AbstractCodeGenerationImplementor; +import org.jvnet.jaxb.plugin.codegenerator.AbstractCodeGenerationImplementor; import com.sun.codemodel.JBlock; import com.sun.codemodel.JClass; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/EqualsCodeGenerator.java similarity index 69% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/EqualsCodeGenerator.java index 7be7bd0cd..3c4108216 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/EqualsCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/EqualsCodeGenerator.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.plugin.simpleequals; +package org.jvnet.jaxb.plugin.simpleequals; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.plugin.codegenerator.CodeGenerationAbstraction; +import org.jvnet.jaxb.plugin.codegenerator.CodeGenerationAbstraction; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/SimpleEqualsPlugin.java similarity index 89% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/SimpleEqualsPlugin.java index c4fc91236..feb62af5b 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpleequals/SimpleEqualsPlugin.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.plugin.simpleequals; +package org.jvnet.jaxb.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.jaxb.plugin.codegenerator.AbstractCodeGeneratorPlugin; +import org.jvnet.jaxb.plugin.codegenerator.CodeGenerator; +import org.jvnet.jaxb.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb.plugin.util.StrategyClassUtils; +import org.jvnet.jaxb.util.FieldUtils; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; 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.jaxb.plugin.equals.Customizations.IGNORED_ELEMENT_NAME; } @Override diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/HashCodeArguments.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/HashCodeArguments.java index c1e78ccb1..9cba9d6ac 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/HashCodeArguments.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.plugin.simplehashcode; +package org.jvnet.jaxb.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.jaxb.plugin.codegenerator.Arguments; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java index 572be117d..dc428eacf 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.plugin.simplehashcode; +package org.jvnet.jaxb.plugin.simplehashcode; import java.util.Arrays; -import org.jvnet.jaxb2_commons.plugin.codegenerator.AbstractCodeGenerationImplementor; +import org.jvnet.jaxb.plugin.codegenerator.AbstractCodeGenerationImplementor; import com.sun.codemodel.JBlock; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/HashCodeCodeGenerator.java similarity index 70% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/HashCodeCodeGenerator.java index e62a6c2a5..571834a05 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/HashCodeCodeGenerator.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.plugin.simplehashcode; +package org.jvnet.jaxb.plugin.simplehashcode; import org.apache.commons.lang3.Validate; -import org.jvnet.jaxb2_commons.plugin.codegenerator.CodeGenerationAbstraction; +import org.jvnet.jaxb.plugin.codegenerator.CodeGenerationAbstraction; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/SimpleHashCodePlugin.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/SimpleHashCodePlugin.java index e457e5583..b9ccf6857 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplehashcode/SimpleHashCodePlugin.java @@ -1,15 +1,15 @@ -package org.jvnet.jaxb2_commons.plugin.simplehashcode; +package org.jvnet.jaxb.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.jaxb.plugin.codegenerator.AbstractCodeGeneratorPlugin; +import org.jvnet.jaxb.plugin.codegenerator.CodeGenerator; +import org.jvnet.jaxb.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb.plugin.util.StrategyClassUtils; +import org.jvnet.jaxb.util.FieldUtils; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; 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.jaxb.plugin.hashcode.Customizations.IGNORED_ELEMENT_NAME; } private int multiplier = 31; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpletostring/SimpleToStringPlugin.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpletostring/SimpleToStringPlugin.java index a282b7434..9b6bc008f 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simpletostring/SimpleToStringPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simpletostring/SimpleToStringPlugin.java @@ -1,24 +1,24 @@ -package org.jvnet.jaxb2_commons.plugin.simpletostring; +package org.jvnet.jaxb.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.jaxb.lang.JAXBToStringStrategy; +import org.jvnet.jaxb.lang.ToString2; +import org.jvnet.jaxb.lang.ToStringStrategy2; +import org.jvnet.jaxb.locator.ObjectLocator; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.Customizations; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb.plugin.util.StrategyClassUtils; +import org.jvnet.jaxb.util.ClassUtils; +import org.jvnet.jaxb.util.FieldAccessorFactory; +import org.jvnet.jaxb.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; 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.jaxb.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.jaxb.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplify/Customizations.java similarity index 91% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplify/Customizations.java index cae9e91c1..7b254a123 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplify/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify; +package org.jvnet.jaxb.plugin.simplify; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplify/SimplifyPlugin.java similarity index 91% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplify/SimplifyPlugin.java index cec71fdcf..63455926e 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/SimplifyPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/simplify/SimplifyPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify; +package org.jvnet.jaxb.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.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.Customizations; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.util.CustomizationUtils; import org.xml.sax.ErrorHandler; import com.sun.codemodel.JJavaName; @@ -59,7 +59,7 @@ public String getUsage() { } private Ignoring ignoring = new CustomizedIgnoring( - org.jvnet.jaxb2_commons.plugin.simplify.Customizations.IGNORED_ELEMENT_NAME, + org.jvnet.jaxb.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.jaxb.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb.plugin.simplify.Customizations.AS_ELEMENT_PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb.plugin.simplify.Customizations.AS_REFERENCE_PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb.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.jaxb.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb.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.jaxb.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb.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.jaxb.plugin.simplify.Customizations.PROPERTY_ELEMENT_NAME, + org.jvnet.jaxb.plugin.simplify.Customizations.AS_REFERENCE_PROPERTY_ELEMENT_NAME)) { simplifyReferencePropertyInfoAsReferencePropertyInfo(model, classInfo, property); } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/tostring/Customizations.java similarity index 83% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/tostring/Customizations.java index 007c7d4e9..440610743 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/tostring/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.tostring; +package org.jvnet.jaxb.plugin.tostring; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/tostring/ToStringPlugin.java similarity index 87% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/tostring/ToStringPlugin.java index 613520b4f..9eaaf3d47 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/tostring/ToStringPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/tostring/ToStringPlugin.java @@ -1,24 +1,24 @@ -package org.jvnet.jaxb2_commons.plugin.tostring; +package org.jvnet.jaxb.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.jaxb.lang.JAXBToStringStrategy; +import org.jvnet.jaxb.lang.ToString2; +import org.jvnet.jaxb.lang.ToStringStrategy2; +import org.jvnet.jaxb.locator.ObjectLocator; +import org.jvnet.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.plugin.Customizations; +import org.jvnet.jaxb.plugin.CustomizedIgnoring; +import org.jvnet.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.plugin.util.FieldOutlineUtils; +import org.jvnet.jaxb.plugin.util.StrategyClassUtils; +import org.jvnet.jaxb.util.ClassUtils; +import org.jvnet.jaxb.util.FieldAccessorFactory; +import org.jvnet.jaxb.util.PropertyFieldAccessorFactory; +import org.jvnet.jaxb.xjc.outline.FieldAccessorEx; 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.jaxb.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.jaxb.plugin.tostring.Customizations.IGNORED_ELEMENT_NAME, Customizations.IGNORED_ELEMENT_NAME, Customizations.GENERATED_ELEMENT_NAME); } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/ArrayUtils.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/ArrayUtils.java index d1f00231d..088cbf6bf 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/ArrayUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/ArrayUtils.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.util; +package org.jvnet.jaxb.plugin.util; import java.lang.reflect.Array; import java.util.LinkedList; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/FieldOutlineUtils.java similarity index 82% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/FieldOutlineUtils.java index b7b67ada0..f84e98170 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/FieldOutlineUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/FieldOutlineUtils.java @@ -1,6 +1,6 @@ -package org.jvnet.jaxb2_commons.plugin.util; +package org.jvnet.jaxb.plugin.util; -import org.jvnet.jaxb2_commons.plugin.Ignoring; +import org.jvnet.jaxb.plugin.Ignoring; import com.sun.tools.xjc.outline.FieldOutline; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/Predicate.java similarity index 61% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/Predicate.java index 4b640949f..777d085eb 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/Predicate.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/Predicate.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.util; +package org.jvnet.jaxb.plugin.util; public interface Predicate { diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/StrategyClassUtils.java similarity index 96% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/StrategyClassUtils.java index 33040600d..f391ea1c5 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/util/StrategyClassUtils.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/util/StrategyClassUtils.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.plugin.util; +package org.jvnet.jaxb.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.jaxb.plugin.Ignoring; +import org.jvnet.jaxb.util.JClassUtils; import com.sun.codemodel.JClass; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/value_constructor/Customizations.java similarity index 81% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/value_constructor/Customizations.java index c7c466a25..1e0bc3c49 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/value_constructor/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.value_constructor; +package org.jvnet.jaxb.plugin.value_constructor; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/ValueConstructorPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/value_constructor/ValueConstructorPlugin.java similarity index 99% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/ValueConstructorPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/value_constructor/ValueConstructorPlugin.java index cc38d49b1..ceee1dc96 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/value_constructor/ValueConstructorPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/value_constructor/ValueConstructorPlugin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jvnet.jaxb2_commons.plugin.value_constructor; +package org.jvnet.jaxb.plugin.value_constructor; import java.util.ArrayList; import java.util.Collection; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/wildcard/Customizations.java similarity index 88% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/wildcard/Customizations.java index ea32d362b..5fca8690c 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/Customizations.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/wildcard/Customizations.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.wildcard; +package org.jvnet.jaxb.plugin.wildcard; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/wildcard/WildcardPlugin.java similarity index 88% rename from jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/wildcard/WildcardPlugin.java index ca219bb97..1d520b72c 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb2_commons/plugin/wildcard/WildcardPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/java/org/jvnet/jaxb/plugin/wildcard/WildcardPlugin.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.plugin.wildcard; +package org.jvnet.jaxb.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.jaxb.plugin.AbstractParameterizablePlugin; +import org.jvnet.jaxb.util.CustomizationUtils; import org.xml.sax.ErrorHandler; import com.sun.tools.xjc.model.CClassInfo; @@ -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.jaxb.plugin.wildcard.Customizations.LAX_ELEMENT_NAME, + org.jvnet.jaxb.plugin.wildcard.Customizations.SKIP_ELEMENT_NAME, + org.jvnet.jaxb.plugin.wildcard.Customizations.STRICT_ELEMENT_NAME); } } diff --git a/jaxb-plugins-parent/jaxb-plugins/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin b/jaxb-plugins-parent/jaxb-plugins/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin index 0f8471f0e..150129a09 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin +++ b/jaxb-plugins-parent/jaxb-plugins/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin @@ -1,22 +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 -org.jvnet.jaxb2_commons.plugin.value_constructor.ValueConstructorPlugin -org.jvnet.jaxb2_commons.plugin.fluent_api.FluentApiPlugin -org.jvnet.jaxb2_commons.plugin.namespace_prefix.NamespacePrefixPlugin -org.jvnet.jaxb2_commons.plugin.defaultvalueplugin.DefaultValuePlugin -org.jvnet.jaxb2_commons.plugin.commons_lang.XjcCommonsLangPlugin +org.jvnet.jaxb.plugin.jaxbindex.JaxbIndexPlugin +org.jvnet.jaxb.plugin.tostring.ToStringPlugin +org.jvnet.jaxb.plugin.equals.EqualsPlugin +org.jvnet.jaxb.plugin.hashcode.HashCodePlugin +org.jvnet.jaxb.plugin.copyable.CopyablePlugin +org.jvnet.jaxb.plugin.mergeable.MergeablePlugin +org.jvnet.jaxb.plugin.inheritance.InheritancePlugin +org.jvnet.jaxb.plugin.setters.SettersPlugin +org.jvnet.jaxb.plugin.wildcard.WildcardPlugin +org.jvnet.jaxb.plugin.autoinheritance.AutoInheritancePlugin +org.jvnet.jaxb.plugin.elementwrapper.ElementWrapperPlugin +org.jvnet.jaxb.plugin.simplify.SimplifyPlugin +org.jvnet.jaxb.plugin.simplehashcode.SimpleHashCodePlugin +org.jvnet.jaxb.plugin.simpleequals.SimpleEqualsPlugin +org.jvnet.jaxb.plugin.enumvalue.EnumValuePlugin +org.jvnet.jaxb.plugin.fixjaxb1058.FixJAXB1058Plugin +org.jvnet.jaxb.plugin.customizations.CustomizationsPlugin +org.jvnet.jaxb.plugin.value_constructor.ValueConstructorPlugin +org.jvnet.jaxb.plugin.fluent_api.FluentApiPlugin +org.jvnet.jaxb.plugin.namespace_prefix.NamespacePrefixPlugin +org.jvnet.jaxb.plugin.defaultvalueplugin.DefaultValuePlugin +org.jvnet.jaxb.plugin.commons_lang.XjcCommonsLangPlugin diff --git a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/copyable/tests/RunCopyablePlugin.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/copyable/tests/RunCopyablePlugin.java index b7cc7f3c9..1585d60d1 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/copyable/tests/RunCopyablePlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.copyable.tests; +package org.jvnet.jaxb.plugin.copyable.tests; import java.io.File; import java.util.ArrayList; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/equals/tests/RunEqualsPlugin.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/equals/tests/RunEqualsPlugin.java index f014aa22a..82923def8 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/equals/tests/RunEqualsPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.equals.tests; +package org.jvnet.jaxb.plugin.equals.tests; import java.io.File; import java.util.ArrayList; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/inheritance/tests/JavaParserTest.java similarity index 85% rename from jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java rename to jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/inheritance/tests/JavaParserTest.java index 3a9419fef..0521df124 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaParserTest.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/inheritance/tests/JavaParserTest.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance.tests; +package org.jvnet.jaxb.plugin.inheritance.tests; import junit.framework.TestCase; -import org.jvnet.jaxb2_commons.plugin.inheritance.util.JavaTypeParser; +import org.jvnet.jaxb.plugin.inheritance.util.JavaTypeParser; import com.sun.codemodel.JClass; import com.sun.codemodel.JCodeModel; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/inheritance/tests/JavaTypeParserTest.java similarity index 97% rename from jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java rename to jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/inheritance/tests/JavaTypeParserTest.java index 8566557ba..882ac6d44 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/inheritance/tests/JavaTypeParserTest.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/inheritance/tests/JavaTypeParserTest.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.inheritance.tests; +package org.jvnet.jaxb.plugin.inheritance.tests; import japa.parser.JavaParser; import japa.parser.ast.CompilationUnit; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/mergeable/tests/RunMergeablePlugin.java similarity index 92% rename from jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/mergeable/tests/RunMergeablePlugin.java index d82d455ba..54e4073f0 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/mergeable/tests/RunMergeablePlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.mergeable.tests; +package org.jvnet.jaxb.plugin.mergeable.tests; import java.io.File; import java.util.ArrayList; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/tostring/tests/RunToStringPlugin.java similarity index 86% rename from jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java rename to jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/tostring/tests/RunToStringPlugin.java index 5f697992c..89857c7ef 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java +++ b/jaxb-plugins-parent/jaxb-plugins/src/test/java/org/jvnet/jaxb/plugin/tostring/tests/RunToStringPlugin.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.plugin.tostring.tests; +package org.jvnet.jaxb.plugin.tostring.tests; import java.io.File; import java.util.ArrayList; import java.util.List; +import org.jvnet.jaxb.lang.JAXBToStringStrategy; import org.jvnet.jaxb.maven.AbstractXJCMojo; import org.jvnet.jaxb.maven.test.RunXJCMojo; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; import com.sun.tools.xjc.Options; diff --git a/jaxb-plugins-parent/jaxb-plugins/src/test/resources/schema.xsd b/jaxb-plugins-parent/jaxb-plugins/src/test/resources/schema.xsd index 6953623b6..5765bd7ec 100644 --- a/jaxb-plugins-parent/jaxb-plugins/src/test/resources/schema.xsd +++ b/jaxb-plugins-parent/jaxb-plugins/src/test/resources/schema.xsd @@ -10,7 +10,7 @@ - + diff --git a/jaxb-plugins-parent/samples/basic/project-build.xml b/jaxb-plugins-parent/samples/basic/project-build.xml index 5d4b2036a..71d839b5e 100644 --- a/jaxb-plugins-parent/samples/basic/project-build.xml +++ b/jaxb-plugins-parent/samples/basic/project-build.xml @@ -69,8 +69,8 @@ - - + + diff --git a/jaxb-plugins-parent/samples/basic/src/main/resources/schema.xsd b/jaxb-plugins-parent/samples/basic/src/main/resources/schema.xsd index c0f745775..294c0b852 100644 --- a/jaxb-plugins-parent/samples/basic/src/main/resources/schema.xsd +++ b/jaxb-plugins-parent/samples/basic/src/main/resources/schema.xsd @@ -10,7 +10,7 @@ - + diff --git a/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/CopyableTest.java b/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb/tests/one/CopyableTest.java similarity index 68% rename from jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/CopyableTest.java rename to jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb/tests/one/CopyableTest.java index c0ad4145d..cab81303d 100644 --- a/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/CopyableTest.java +++ b/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb/tests/one/CopyableTest.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.tests.po; +package org.jvnet.jaxb.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.jaxb.lang.JAXBCopyStrategy; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class CopyableTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/EqualsTest.java b/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb/tests/one/EqualsTest.java similarity index 72% rename from jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/EqualsTest.java rename to jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb/tests/one/EqualsTest.java index c7194a6ff..90168dece 100644 --- a/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/EqualsTest.java +++ b/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb/tests/one/EqualsTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.po; +package org.jvnet.jaxb.tests.one; import java.io.File; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/ToStringTest.java b/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb/tests/one/ToStringTest.java similarity index 68% rename from jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/ToStringTest.java rename to jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb/tests/one/ToStringTest.java index e3a568f5e..b77b2de31 100644 --- a/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb2_commons/tests/po/ToStringTest.java +++ b/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb/tests/one/ToStringTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.po; +package org.jvnet.jaxb.tests.one; import java.io.File; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; +import org.jvnet.jaxb.lang.JAXBToStringStrategy; public class ToStringTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/samples/cxf/src/main/resources/bindings.xjb b/jaxb-plugins-parent/samples/cxf/src/main/resources/bindings.xjb index 8084313e4..7bf4f419b 100644 --- a/jaxb-plugins-parent/samples/cxf/src/main/resources/bindings.xjb +++ b/jaxb-plugins-parent/samples/cxf/src/main/resources/bindings.xjb @@ -35,7 +35,7 @@ - + diff --git a/jaxb-plugins-parent/samples/cxf/src/main/resources/wsdl-bindings.xjb b/jaxb-plugins-parent/samples/cxf/src/main/resources/wsdl-bindings.xjb index 9b59bdbc4..cf8cc12db 100644 --- a/jaxb-plugins-parent/samples/cxf/src/main/resources/wsdl-bindings.xjb +++ b/jaxb-plugins-parent/samples/cxf/src/main/resources/wsdl-bindings.xjb @@ -35,12 +35,12 @@ xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"> - + - + diff --git a/jaxb-plugins-parent/samples/po-simple/project-build.xml b/jaxb-plugins-parent/samples/po-simple/project-build.xml index f3d6eb4fb..8b69b72c4 100644 --- a/jaxb-plugins-parent/samples/po-simple/project-build.xml +++ b/jaxb-plugins-parent/samples/po-simple/project-build.xml @@ -68,7 +68,7 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/jaxb-plugins-parent/samples/po-simple/src/main/resources/bindings.xjb b/jaxb-plugins-parent/samples/po-simple/src/main/resources/bindings.xjb index 5a4833703..1935a712c 100644 --- a/jaxb-plugins-parent/samples/po-simple/src/main/resources/bindings.xjb +++ b/jaxb-plugins-parent/samples/po-simple/src/main/resources/bindings.xjb @@ -6,7 +6,7 @@ - + diff --git a/jaxb-plugins-parent/samples/po-simple/src/test/java/org/jvnet/jaxb2_commons/tests/posimple/EqualsTest.java b/jaxb-plugins-parent/samples/po-simple/src/test/java/org/jvnet/jaxb/tests/posimple/EqualsTest.java similarity index 82% rename from jaxb-plugins-parent/samples/po-simple/src/test/java/org/jvnet/jaxb2_commons/tests/posimple/EqualsTest.java rename to jaxb-plugins-parent/samples/po-simple/src/test/java/org/jvnet/jaxb/tests/posimple/EqualsTest.java index 2b1a3eaec..15c398904 100644 --- a/jaxb-plugins-parent/samples/po-simple/src/test/java/org/jvnet/jaxb2_commons/tests/posimple/EqualsTest.java +++ b/jaxb-plugins-parent/samples/po-simple/src/test/java/org/jvnet/jaxb/tests/posimple/EqualsTest.java @@ -1,10 +1,10 @@ -package org.jvnet.jaxb2_commons.tests.posimple; +package org.jvnet.jaxb.tests.posimple; import java.io.File; import jakarta.xml.bind.JAXBElement; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/samples/po/project-build.xml b/jaxb-plugins-parent/samples/po/project-build.xml index 7049990fa..b8e5a8fbb 100644 --- a/jaxb-plugins-parent/samples/po/project-build.xml +++ b/jaxb-plugins-parent/samples/po/project-build.xml @@ -68,7 +68,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/jaxb-plugins-parent/samples/po/src/main/resources/bindings.xjb b/jaxb-plugins-parent/samples/po/src/main/resources/bindings.xjb index b432ac17d..41c5922c6 100644 --- a/jaxb-plugins-parent/samples/po/src/main/resources/bindings.xjb +++ b/jaxb-plugins-parent/samples/po/src/main/resources/bindings.xjb @@ -6,7 +6,7 @@ - + diff --git a/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java b/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb/tests/po/CopyableTest.java similarity index 68% rename from jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java rename to jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb/tests/po/CopyableTest.java index 4ed92a96d..4f813fad0 100644 --- a/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java +++ b/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb/tests/po/CopyableTest.java @@ -1,12 +1,12 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxbs.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.jaxb.lang.JAXBCopyStrategy; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class CopyableTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java b/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb/tests/po/EqualsTest.java similarity index 72% rename from jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java rename to jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb/tests/po/EqualsTest.java index ac2dbc9b2..89354841a 100644 --- a/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java +++ b/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb/tests/po/EqualsTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb.tests.po; import java.io.File; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java b/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb/tests/po/ToStringTest.java similarity index 68% rename from jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java rename to jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb/tests/po/ToStringTest.java index 8c7cfe21c..401afec61 100644 --- a/jaxb-plugins-parent/samples/basic/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java +++ b/jaxb-plugins-parent/samples/po/src/test/java/org/jvnet/jaxb/tests/po/ToStringTest.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.one; +package org.jvnet.jaxb.tests.po; import java.io.File; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; +import org.jvnet.jaxb.lang.JAXBToStringStrategy; public class ToStringTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/tests/episodes/a/src/main/resources/binding.xjb b/jaxb-plugins-parent/tests/episodes/a/src/main/resources/binding.xjb index 6639cdebd..72e2fc826 100644 --- a/jaxb-plugins-parent/tests/episodes/a/src/main/resources/binding.xjb +++ b/jaxb-plugins-parent/tests/episodes/a/src/main/resources/binding.xjb @@ -9,7 +9,7 @@ - + diff --git a/jaxb-plugins-parent/tests/episodes/b/src/main/resources/binding.xjb b/jaxb-plugins-parent/tests/episodes/b/src/main/resources/binding.xjb index 7a3481dc8..61a897002 100644 --- a/jaxb-plugins-parent/tests/episodes/b/src/main/resources/binding.xjb +++ b/jaxb-plugins-parent/tests/episodes/b/src/main/resources/binding.xjb @@ -10,7 +10,7 @@ - + diff --git a/jaxb-plugins-parent/tests/issues/pom.xml b/jaxb-plugins-parent/tests/issues/pom.xml index 8e03690a8..c859c26c3 100644 --- a/jaxb-plugins-parent/tests/issues/pom.xml +++ b/jaxb-plugins-parent/tests/issues/pom.xml @@ -32,21 +32,21 @@ -XtoString -Xequals - -Xequals-equalsStrategyClass=org.jvnet.jaxb2_commons.tests.issues.IssueJIIB42EqualsStrategy + -Xequals-equalsStrategyClass=org.jvnet.jaxb.tests.issues.IssueJIIB42EqualsStrategy -XhashCode -Xcopyable -Xmergeable - -Xmergeable-mergeStrategyClass=org.jvnet.jaxb2_commons.lang.JAXBMergeStrategy + -Xmergeable-mergeStrategyClass=org.jvnet.jaxb.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.jaxb.tests.issues.IssueJIIB14BaseClass + -XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceOne + -XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceTwo + -XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceThree + -XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceFour -XenumValue -Xcustomizations -Xcustomizations-directory=${basedir}/src/main/resources diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueGH70Interface.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueGH70Interface.java new file mode 100644 index 000000000..3635b46ac --- /dev/null +++ b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueGH70Interface.java @@ -0,0 +1,4 @@ +package org.jvnet.jaxb.tests.issues; + +public interface IssueGH70Interface { +} diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseClass.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseClass.java new file mode 100644 index 000000000..ae9720fdc --- /dev/null +++ b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseClass.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.tests.issues; + +public class IssueJIIB14BaseClass { + +} diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceFour.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceFour.java similarity index 53% rename from jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceFour.java rename to jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceFour.java index 6259564b1..529e8c28e 100644 --- a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceFour.java +++ b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceFour.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; public interface IssueJIIB14BaseInterfaceFour { diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceOne.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceOne.java similarity index 52% rename from jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceOne.java rename to jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceOne.java index bf70dc859..d28864d6f 100644 --- a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceOne.java +++ b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceOne.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; public interface IssueJIIB14BaseInterfaceOne { diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceThree.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceThree.java similarity index 53% rename from jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceThree.java rename to jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceThree.java index 404b50702..32b1c2c18 100644 --- a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceThree.java +++ b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceThree.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; public interface IssueJIIB14BaseInterfaceThree { diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceTwo.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceTwo.java similarity index 52% rename from jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceTwo.java rename to jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceTwo.java index a273137b9..7c7755fcc 100644 --- a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseInterfaceTwo.java +++ b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB14BaseInterfaceTwo.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; public interface IssueJIIB14BaseInterfaceTwo { diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB42EqualsStrategy.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB42EqualsStrategy.java similarity index 73% rename from jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB42EqualsStrategy.java rename to jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB42EqualsStrategy.java index a9b8d3a7a..6593ed0e9 100644 --- a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB42EqualsStrategy.java +++ b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB42EqualsStrategy.java @@ -1,7 +1,7 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.locator.ObjectLocator; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.locator.ObjectLocator; public class IssueJIIB42EqualsStrategy extends JAXBEqualsStrategy { diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB48Interface.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB48Interface.java similarity index 60% rename from jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB48Interface.java rename to jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB48Interface.java index 898c735d1..9bcf3023a 100644 --- a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB48Interface.java +++ b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB48Interface.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; public interface IssueJIIB48Interface { diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB53ABaseClass.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB53ABaseClass.java new file mode 100644 index 000000000..cab6779bc --- /dev/null +++ b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb/tests/issues/IssueJIIB53ABaseClass.java @@ -0,0 +1,5 @@ +package org.jvnet.jaxb.tests.issues; + +public class IssueJIIB53ABaseClass { + +} diff --git a/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueGH70Interface.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueGH70Interface.java deleted file mode 100644 index 06d3ba208..000000000 --- a/jaxb-plugins-parent/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/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseClass.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB14BaseClass.java deleted file mode 100644 index 35f451482..000000000 --- a/jaxb-plugins-parent/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/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB53ABaseClass.java b/jaxb-plugins-parent/tests/issues/src/main/java/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB53ABaseClass.java deleted file mode 100644 index 9dc324d4a..000000000 --- a/jaxb-plugins-parent/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/jaxb-plugins-parent/tests/issues/src/main/resources/binding.xjb b/jaxb-plugins-parent/tests/issues/src/main/resources/binding.xjb index 7c7c636df..3114e6645 100644 --- a/jaxb-plugins-parent/tests/issues/src/main/resources/binding.xjb +++ b/jaxb-plugins-parent/tests/issues/src/main/resources/binding.xjb @@ -12,7 +12,7 @@ java.lang.Cloneable - org.jvnet.jaxb2_commons.tests.issues.IssueGH70Interface + org.jvnet.jaxb.tests.issues.IssueGH70Interface diff --git a/jaxb-plugins-parent/tests/issues/src/main/resources/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB38Type.xml b/jaxb-plugins-parent/tests/issues/src/main/resources/org/jvnet/jaxb/tests/issues/IssueJIIB38Type.xml similarity index 100% rename from jaxb-plugins-parent/tests/issues/src/main/resources/org/jvnet/jaxb2_commons/tests/issues/IssueJIIB38Type.xml rename to jaxb-plugins-parent/tests/issues/src/main/resources/org/jvnet/jaxb/tests/issues/IssueJIIB38Type.xml diff --git a/jaxb-plugins-parent/tests/issues/src/main/resources/schema.xsd b/jaxb-plugins-parent/tests/issues/src/main/resources/schema.xsd index 1c517273e..af5f6086f 100644 --- a/jaxb-plugins-parent/tests/issues/src/main/resources/schema.xsd +++ b/jaxb-plugins-parent/tests/issues/src/main/resources/schema.xsd @@ -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.jaxb.tests.issues.IssueJIIB48Interface<java.lang.String> @@ -244,7 +244,7 @@ - org.jvnet.jaxb2_commons.tests.issues.IssueJIIB53ABaseClass + org.jvnet.jaxb.tests.issues.IssueJIIB53ABaseClass @@ -255,7 +255,7 @@ - org.jvnet.jaxb2_commons.tests.issues.IssueJIIB53AType + org.jvnet.jaxb.tests.issues.IssueJIIB53AType diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/CopyableTest.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/CopyableTest.java similarity index 65% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/CopyableTest.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/CopyableTest.java index 7528a31fa..05648d75c 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/CopyableTest.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/CopyableTest.java @@ -1,13 +1,13 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.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.jaxb.lang.CopyStrategy2; +import org.jvnet.jaxb.lang.EqualsStrategy; +import org.jvnet.jaxb.lang.ExtendedJAXBEqualsStrategy; +import org.jvnet.jaxb.lang.JAXBCopyStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; @SuppressWarnings("deprecation") public class CopyableTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH22Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH22Test.java similarity index 85% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH22Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH22Test.java index e63b43887..54a248f90 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH22Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH22Test.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; public class GH22Test { @Test diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH26Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH26Test.java similarity index 84% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH26Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH26Test.java index 11d75fcf9..345ea5b96 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH26Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH26Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import java.io.File; import java.net.URL; @@ -6,13 +6,13 @@ 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.MElementRefsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MElementsPropertyInfo; -import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo; +import org.jvnet.jaxb.xjc.model.concrete.XJCCMInfoFactory; +import org.jvnet.jaxb.xml.bind.model.MAttributePropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MClassInfo; +import org.jvnet.jaxb.xml.bind.model.MElementPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementRefsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MElementsPropertyInfo; +import org.jvnet.jaxb.xml.bind.model.MModelInfo; import com.sun.codemodel.JCodeModel; import com.sun.tools.xjc.ConsoleErrorReporter; @@ -54,7 +54,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.jaxb.tests.issues.IssueGH26Type"); Assert.assertNotNull(classInfo); final MElementPropertyInfo a = (MElementPropertyInfo) classInfo diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH31Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH31Test.java similarity index 66% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH31Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH31Test.java index 794772cb9..56992adbd 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH31Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH31Test.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.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.jaxb.lang.EnumValue; +import org.jvnet.jaxb.lang.JAXBToStringStrategy; +import org.jvnet.jaxb.lang.ToStringStrategy2; +import org.jvnet.jaxb.locator.ObjectLocator; public class GH31Test { @@ -30,7 +30,7 @@ public StringBuilder append(ObjectLocator locator, }; }; Assert.assertEquals( - "org.jvnet.jaxb2_commons.tests.issues.IssueGH31ComplexType[testEnum=Male(default)]", + "org.jvnet.jaxb.tests.issues.IssueGH31ComplexType[testEnum=Male(default)]", t.append(null, new StringBuilder(), s).toString()); } } diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH37Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH37Test.java similarity index 78% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH37Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH37Test.java index 4248ed340..2fa3b091f 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH37Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/GH37Test.java @@ -1,9 +1,9 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.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.jaxb.lang.JAXBToStringStrategy; +import org.jvnet.jaxb.lang.ToStringStrategy2; public class GH37Test { @@ -35,12 +35,12 @@ public boolean isUseIdentityHashCode() { }; IssueGH37Type a = new IssueGH37Type(); Assert.assertEquals( - "org.jvnet.jaxb2_commons.tests.issues.IssueGH37Type[testBoolean=true(default)]", + "org.jvnet.jaxb.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.jaxb.tests.issues.IssueGH37Type[testBoolean=true]", b.append(null, new StringBuilder(), strategy).toString()); } diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB10Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB10Test.java similarity index 91% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB10Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB10Test.java index 3d23052cb..8b1f5cb45 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB10Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB10Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import java.lang.reflect.Field; diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB14Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB14Test.java similarity index 65% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB14Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB14Test.java index 6e82c4b0e..1ba18a8c4 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB14Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB14Test.java @@ -1,8 +1,13 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import junit.framework.TestCase; import org.junit.Assert; +import org.jvnet.jaxb.tests.issues.IssueJIIB14BaseClass; +import org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceFour; +import org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceOne; +import org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceThree; +import org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceTwo; public class JIIB14Test extends TestCase { diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB20Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB20Test.java similarity index 90% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB20Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB20Test.java index 959241b79..b8fabf8b7 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB20Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB20Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import java.util.Arrays; import java.util.List; diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB35Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB35Test.java similarity index 91% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB35Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB35Test.java index 0cb3778fc..019acf983 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB35Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB35Test.java @@ -1,11 +1,11 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import jakarta.xml.bind.JAXBContext; import org.junit.Assert; -import junit.framework.TestCase; +import org.jvnet.jaxb.lang.ContextUtils; -import org.jvnet.jaxb2_commons.lang.ContextUtils; +import junit.framework.TestCase; public class JIIB35Test extends TestCase { diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB36Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB36Test.java similarity index 88% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB36Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB36Test.java index 445855a44..a4938e080 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB36Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB36Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import org.junit.Assert; import org.junit.Test; diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB38Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB38Test.java similarity index 88% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB38Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB38Test.java index bbec79347..1c660d382 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB38Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB38Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import org.junit.Assert; import junit.framework.TestCase; diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB8Test.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB8Test.java similarity index 88% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB8Test.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB8Test.java index c53703b5b..e28a0cad7 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/JIIB8Test.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/JIIB8Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import java.util.Arrays; diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/RunIssuesPlugin.java similarity index 78% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/RunIssuesPlugin.java index 7dd74e68d..e9a18b447 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/RunIssuesPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import java.util.ArrayList; import java.util.List; @@ -32,11 +32,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.jaxb.tests.issues.IssueJIIB14BaseClass"); + args.add("-XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceOne"); + args.add("-XautoInheritance-xmlRootElementsImplement=org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceTwo"); + args.add("-XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceThree"); + args.add("-XautoInheritance-jaxbElementsImplement=org.jvnet.jaxb.tests.issues.IssueJIIB14BaseInterfaceFour"); args.add("-Xannotate"); return args; } diff --git a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunPlugins.java b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/RunPlugins.java similarity index 96% rename from jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunPlugins.java rename to jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/RunPlugins.java index e9aadc081..41bf581e8 100644 --- a/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunPlugins.java +++ b/jaxb-plugins-parent/tests/issues/src/test/java/org/jvnet/jaxb/tests/issues/RunPlugins.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.tests.issues; +package org.jvnet.jaxb.tests.issues; import java.io.File; import java.net.URL; diff --git a/jaxb-plugins-parent/tests/namespace/src/main/resources/binding.xjb b/jaxb-plugins-parent/tests/namespace/src/main/resources/binding.xjb index 051b1d7e4..55fcee857 100644 --- a/jaxb-plugins-parent/tests/namespace/src/main/resources/binding.xjb +++ b/jaxb-plugins-parent/tests/namespace/src/main/resources/binding.xjb @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + diff --git a/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java b/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java index 6bebb721d..8eaf776e0 100644 --- a/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java +++ b/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/CopyableTest.java @@ -3,10 +3,9 @@ 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.jaxb.lang.JAXBCopyStrategy; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class CopyableTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java b/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java index 31a9d0666..639c1591a 100644 --- a/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java +++ b/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/EqualsTest.java @@ -2,8 +2,8 @@ import java.io.File; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/HashCodeTest.java b/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/HashCodeTest.java index d80f0f17f..9e1cff3b5 100644 --- a/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/HashCodeTest.java +++ b/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/HashCodeTest.java @@ -2,9 +2,9 @@ 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.jaxb.lang.JAXBCopyStrategy; +import org.jvnet.jaxb.lang.JAXBHashCodeStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class HashCodeTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java b/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java index f622f9166..af50e1f34 100644 --- a/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java +++ b/jaxb-plugins-parent/tests/one/src/test/java/org/jvnet/jaxb2_commons/tests/one/ToStringTest.java @@ -2,8 +2,8 @@ import java.io.File; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; -import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy; +import org.jvnet.jaxb.lang.JAXBToStringStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class ToStringTest extends AbstractSamplesTest { diff --git a/jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/BaseElementRef.java b/jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb/plugin/simplify/tests01/BaseElementRef.java similarity index 90% rename from jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/BaseElementRef.java rename to jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb/plugin/simplify/tests01/BaseElementRef.java index 3809c3b79..ff13f4220 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/BaseElementRef.java +++ b/jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb/plugin/simplify/tests01/BaseElementRef.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify.tests01; +package org.jvnet.jaxb.plugin.simplify.tests01; import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; diff --git a/jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/DateAdapter.java b/jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb/plugin/simplify/tests01/DateAdapter.java similarity index 92% rename from jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/DateAdapter.java rename to jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb/plugin/simplify/tests01/DateAdapter.java index bbde4dfaa..268c94155 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/DateAdapter.java +++ b/jaxb-plugins-parent/tests/simplify-01/src/main/java/org/jvnet/jaxb/plugin/simplify/tests01/DateAdapter.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify.tests01; +package org.jvnet.jaxb.plugin.simplify.tests01; import java.util.Date; diff --git a/jaxb-plugins-parent/tests/simplify-01/src/main/resources/binding.xjb b/jaxb-plugins-parent/tests/simplify-01/src/main/resources/binding.xjb index 000e2603f..93d62f818 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/main/resources/binding.xjb +++ b/jaxb-plugins-parent/tests/simplify-01/src/main/resources/binding.xjb @@ -5,12 +5,12 @@ + adapter="org.jvnet.jaxb.plugin.simplify.tests01.DateAdapter" /> - + diff --git a/jaxb-plugins-parent/tests/simplify-01/src/main/resources/schema.xsd b/jaxb-plugins-parent/tests/simplify-01/src/main/resources/schema.xsd index 37da7460d..cc4716319 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/main/resources/schema.xsd +++ b/jaxb-plugins-parent/tests/simplify-01/src/main/resources/schema.xsd @@ -96,7 +96,7 @@ + ref="org.jvnet.jaxb.plugin.simplify.tests01.BaseElementRef" /> diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh18Test.java b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh18Test.java similarity index 77% rename from jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh18Test.java rename to jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh18Test.java index 877c812e0..a72e6285e 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh18Test.java +++ b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh18Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify.tests01; +package org.jvnet.jaxb.plugin.simplify.tests01; import org.junit.Test; diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh1Test.java b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh1Test.java similarity index 94% rename from jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh1Test.java rename to jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh1Test.java index bd8c7aa9e..3782b4c76 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh1Test.java +++ b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh1Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify.tests01; +package org.jvnet.jaxb.plugin.simplify.tests01; import java.io.StringWriter; diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh2Test.java b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh2Test.java similarity index 86% rename from jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh2Test.java rename to jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh2Test.java index 1714631a0..d9b63d073 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh2Test.java +++ b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh2Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify.tests01; +package org.jvnet.jaxb.plugin.simplify.tests01; import java.util.Date; diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh4Test.java b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh4Test.java similarity index 94% rename from jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh4Test.java rename to jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh4Test.java index 83ed27551..5d51bab5f 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh4Test.java +++ b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh4Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify.tests01; +package org.jvnet.jaxb.plugin.simplify.tests01; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh5Test.java b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh5Test.java similarity index 94% rename from jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh5Test.java rename to jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh5Test.java index 2ec76488f..60630f28c 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh5Test.java +++ b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh5Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify.tests01; +package org.jvnet.jaxb.plugin.simplify.tests01; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh6Test.java b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh6Test.java similarity index 94% rename from jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh6Test.java rename to jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh6Test.java index aaeb75543..ac4f516ab 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/Gh6Test.java +++ b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/Gh6Test.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify.tests01; +package org.jvnet.jaxb.plugin.simplify.tests01; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/RunSimplifyPlugin.java b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/RunSimplifyPlugin.java similarity index 95% rename from jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/RunSimplifyPlugin.java rename to jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/RunSimplifyPlugin.java index 7dec7d280..8eb495262 100644 --- a/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb2_commons/plugin/simplify/tests01/RunSimplifyPlugin.java +++ b/jaxb-plugins-parent/tests/simplify-01/src/test/java/org/jvnet/jaxb/plugin/simplify/tests01/RunSimplifyPlugin.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.plugin.simplify.tests01; +package org.jvnet.jaxb.plugin.simplify.tests01; import java.io.File; import java.net.URL; diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb2_commons/plugin/simplify/tests01/simplifyElementsPropertyAsElementProperty.xml b/jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb/plugin/simplify/tests01/simplifyElementsPropertyAsElementProperty.xml similarity index 100% rename from jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb2_commons/plugin/simplify/tests01/simplifyElementsPropertyAsElementProperty.xml rename to jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb/plugin/simplify/tests01/simplifyElementsPropertyAsElementProperty.xml diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb2_commons/plugin/simplify/tests01/simplifyReferencesPropertyAsElementProperty.xml b/jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb/plugin/simplify/tests01/simplifyReferencesPropertyAsElementProperty.xml similarity index 100% rename from jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb2_commons/plugin/simplify/tests01/simplifyReferencesPropertyAsElementProperty.xml rename to jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb/plugin/simplify/tests01/simplifyReferencesPropertyAsElementProperty.xml diff --git a/jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb2_commons/plugin/simplify/tests01/simplifyReferencesPropertyAsReferenceProperty.xml b/jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb/plugin/simplify/tests01/simplifyReferencesPropertyAsReferenceProperty.xml similarity index 100% rename from jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb2_commons/plugin/simplify/tests01/simplifyReferencesPropertyAsReferenceProperty.xml rename to jaxb-plugins-parent/tests/simplify-01/src/test/resources/org/jvnet/jaxb/plugin/simplify/tests01/simplifyReferencesPropertyAsReferenceProperty.xml diff --git a/jaxb-plugins-parent/tests/superclass/a/src/main/resources/binding.xjb b/jaxb-plugins-parent/tests/superclass/a/src/main/resources/binding.xjb index 70f0856b5..46955922f 100644 --- a/jaxb-plugins-parent/tests/superclass/a/src/main/resources/binding.xjb +++ b/jaxb-plugins-parent/tests/superclass/a/src/main/resources/binding.xjb @@ -9,7 +9,7 @@ - + diff --git a/jaxb-plugins-parent/tests/superclass/b/src/main/resources/binding.xjb b/jaxb-plugins-parent/tests/superclass/b/src/main/resources/binding.xjb index 5a2f9c5c3..ec7b26155 100644 --- a/jaxb-plugins-parent/tests/superclass/b/src/main/resources/binding.xjb +++ b/jaxb-plugins-parent/tests/superclass/b/src/main/resources/binding.xjb @@ -8,12 +8,12 @@ xmlns:b="b"> - + - + diff --git a/jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/CopyToTest.java b/jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb/test/superclass/b/tests/CopyToTest.java similarity index 79% rename from jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/CopyToTest.java rename to jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb/test/superclass/b/tests/CopyToTest.java index 13c11485b..12753bccf 100644 --- a/jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/CopyToTest.java +++ b/jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb/test/superclass/b/tests/CopyToTest.java @@ -1,8 +1,8 @@ -package org.jvnet.jaxb2_commons.test.superclass.b.tests; +package org.jvnet.jaxb.test.superclass.b.tests; import org.junit.Assert; import org.junit.Test; -import org.jvnet.jaxb2_commons.test.superclass.b.AnotherObjectType; +import org.jvnet.jaxb.test.superclass.b.AnotherObjectType; public class CopyToTest { diff --git a/jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/RunPlugins.java b/jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb/test/superclass/b/tests/RunPlugins.java similarity index 95% rename from jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/RunPlugins.java rename to jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb/test/superclass/b/tests/RunPlugins.java index 5411e7f0d..a4ccb5edd 100644 --- a/jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb2_commons/test/superclass/b/tests/RunPlugins.java +++ b/jaxb-plugins-parent/tests/superclass/b/src/test/java/org/jvnet/jaxb/test/superclass/b/tests/RunPlugins.java @@ -1,4 +1,4 @@ -package org.jvnet.jaxb2_commons.test.superclass.b.tests; +package org.jvnet.jaxb.test.superclass.b.tests; import java.io.File; import java.net.URL; diff --git a/jaxb-plugins-parent/tests/zj/src/test/java/org/jvnet/jaxb2_commons/tests/zj/EqualsTest.java b/jaxb-plugins-parent/tests/zj/src/test/java/org/jvnet/jaxb2_commons/tests/zj/EqualsTest.java index dbdcd4cae..b597484fb 100644 --- a/jaxb-plugins-parent/tests/zj/src/test/java/org/jvnet/jaxb2_commons/tests/zj/EqualsTest.java +++ b/jaxb-plugins-parent/tests/zj/src/test/java/org/jvnet/jaxb2_commons/tests/zj/EqualsTest.java @@ -2,8 +2,8 @@ import java.io.File; -import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy; -import org.jvnet.jaxb2_commons.test.AbstractSamplesTest; +import org.jvnet.jaxb.lang.JAXBEqualsStrategy; +import org.jvnet.jaxb.test.AbstractSamplesTest; public class EqualsTest extends AbstractSamplesTest {