From 22aeb18a1e66ae8d3e2d2fe4187e0770364603f1 Mon Sep 17 00:00:00 2001 From: Lukas Jungmann Date: Wed, 22 Apr 2020 19:47:46 +0200 Subject: [PATCH] move jaxb-core out from jaxb-runtime and rename packages in jaxb-runtime (#1428) Signed-off-by: Lukas Jungmann --- .gitignore | 2 +- jaxb-ri/boms/bom/pom.xml | 22 ++ jaxb-ri/bundles/core/pom.xml | 305 ++++++++++++++++++ .../core/src/main/java/module-info.java | 53 +++ .../jaxb/core/test/OSGiBundleVersionTest.java | 53 +++ jaxb-ri/bundles/jxc/pom.xml | 2 +- jaxb-ri/bundles/osgi/osgi/pom.xml | 5 + .../osgi/osgi/src/main/java/module-info.java | 22 +- jaxb-ri/bundles/pom.xml | 1 + jaxb-ri/bundles/ri/pom.xml | 4 + .../bundles/ri/src/main/assembly/assembly.xml | 3 +- .../ri/src/main/resources/bin/schemagen.bat | 4 +- .../ri/src/main/resources/bin/schemagen.sh | 3 +- .../bundles/ri/src/main/resources/bin/xjc.bat | 4 +- .../bundles/ri/src/main/resources/bin/xjc.sh | 3 +- jaxb-ri/bundles/runtime/pom.xml | 16 +- .../runtime/src/main/java/module-info.java | 55 ++-- jaxb-ri/bundles/xjc/pom.xml | 2 +- jaxb-ri/core/exclude-core.xml | 22 ++ jaxb-ri/core/pom.xml | 56 ++++ .../main/java/com/sun/xml/bind/Locatable.java | 2 +- .../src/main/java/com/sun/xml/bind/Utils.java | 2 +- .../com/sun/xml/bind/WhiteSpaceProcessor.java | 2 +- .../bind/annotation/OverrideAnnotationOf.java | 2 +- .../com/sun/xml/bind/annotation/XmlIsSet.java | 0 .../sun/xml/bind/annotation/XmlLocation.java | 2 +- .../com/sun/xml/bind/api/ErrorListener.java | 2 +- .../sun/xml/bind/api/impl/NameConverter.java | 2 +- .../com/sun/xml/bind/api/impl/NameUtil.java | 2 +- .../marshaller/CharacterEscapeHandler.java | 2 +- .../sun/xml/bind/marshaller/DataWriter.java | 2 +- .../bind/marshaller/DumbEscapeHandler.java | 2 +- .../com/sun/xml/bind/marshaller/Messages.java | 2 +- .../bind/marshaller/MinimumEscapeHandler.java | 2 +- .../xml/bind/marshaller/NoEscapeHandler.java | 2 +- .../sun/xml/bind/marshaller/SAX2DOMEx.java | 2 +- .../sun/xml/bind/marshaller/XMLWriter.java | 9 + .../sun/xml/bind/unmarshaller/DOMScanner.java | 0 .../xml/bind/unmarshaller/InfosetScanner.java | 0 .../com/sun/xml/bind/util/SecureLoader.java | 2 +- .../java/com/sun/xml/bind/util/Which.java | 2 +- .../com/sun/xml/bind/v2/ClassFactory.java | 2 +- .../java/com/sun/xml/bind/v2/Messages.java | 2 +- .../main/java/com/sun/xml/bind/v2/TODO.java | 2 +- .../sun/xml/bind/v2/WellKnownNamespace.java | 2 +- .../v2/model/annotation/AnnotationReader.java | 2 +- .../v2/model/annotation/AnnotationSource.java | 2 +- .../bind/v2/model/annotation/Locatable.java | 2 +- .../sun/xml/bind/v2/model/core/Adapter.java | 0 .../sun/xml/bind/v2/model/core/ArrayInfo.java | 2 +- .../v2/model/core/AttributePropertyInfo.java | 2 +- .../bind/v2/model/core/BuiltinLeafInfo.java | 2 +- .../sun/xml/bind/v2/model/core/ClassInfo.java | 0 .../sun/xml/bind/v2/model/core/Element.java | 2 +- .../xml/bind/v2/model/core/ElementInfo.java | 0 .../v2/model/core/ElementPropertyInfo.java | 2 +- .../xml/bind/v2/model/core/EnumConstant.java | 0 .../xml/bind/v2/model/core/EnumLeafInfo.java | 2 +- .../xml/bind/v2/model/core/ErrorHandler.java | 2 +- .../com/sun/xml/bind/v2/model/core/ID.java | 2 +- .../sun/xml/bind/v2/model/core/LeafInfo.java | 2 +- .../bind/v2/model/core/MapPropertyInfo.java | 2 +- .../xml/bind/v2/model/core/MaybeElement.java | 2 +- .../xml/bind/v2/model/core/NonElement.java | 2 +- .../xml/bind/v2/model/core/NonElementRef.java | 2 +- .../xml/bind/v2/model/core/PropertyInfo.java | 0 .../xml/bind/v2/model/core/PropertyKind.java | 0 .../com/sun/xml/bind/v2/model/core/Ref.java | 0 .../v2/model/core/ReferencePropertyInfo.java | 2 +- .../xml/bind/v2/model/core/RegistryInfo.java | 0 .../sun/xml/bind/v2/model/core/TypeInfo.java | 0 .../xml/bind/v2/model/core/TypeInfoSet.java | 0 .../sun/xml/bind/v2/model/core/TypeRef.java | 2 +- .../bind/v2/model/core/ValuePropertyInfo.java | 2 +- .../xml/bind/v2/model/core/WildcardMode.java | 2 +- .../bind/v2/model/core/WildcardTypeInfo.java | 2 +- .../xml/bind/v2/model/core/package-info.java | 0 .../xml/bind/v2/model/impl/ModelBuilderI.java | 2 +- .../v2/model/nav/GenericArrayTypeImpl.java | 2 +- .../sun/xml/bind/v2/model/nav/Navigator.java | 2 +- .../v2/model/nav/ParameterizedTypeImpl.java | 2 +- .../v2/model/nav/ReflectionNavigator.java | 2 +- .../xml/bind/v2/model/nav/SecureLoader.java | 2 +- .../xml/bind/v2/model/nav/TypeVisitor.java | 2 +- .../bind/v2/model/nav/WildcardTypeImpl.java | 2 +- .../xml/bind/v2/model/nav/package-info.java | 2 +- .../xml/bind/v2/model/util/ArrayInfoUtil.java | 2 +- .../runtime/IllegalAnnotationException.java | 0 .../com/sun/xml/bind/v2/runtime/Location.java | 2 +- .../sun/xml/bind/v2/runtime/RuntimeUtil.java | 0 .../bind/v2/runtime/SwaRefAdapterMarker.java | 0 .../v2/runtime/unmarshaller/LocatorEx.java | 0 .../bind/v2/schemagen/episode/Bindings.java | 2 +- .../xml/bind/v2/schemagen/episode/Klass.java | 2 +- .../bind/v2/schemagen/episode/Package.java | 2 +- .../v2/schemagen/episode/SchemaBindings.java | 2 +- .../v2/schemagen/episode/package-info.java | 2 +- .../sun/xml/bind/v2/util/EditDistance.java | 2 +- .../sun/xml/bind/v2/util/FlattenIterator.java | 2 +- .../com/sun/xml/bind/v2/util/XmlFactory.java | 2 +- jaxb-ri/core/src/main/java/module-info.java | 53 +++ .../xml/bind/marshaller/Messages.properties | 3 +- .../bind/marshaller/Messages_de.properties | 3 +- .../bind/marshaller/Messages_es.properties | 3 +- .../bind/marshaller/Messages_fr.properties | 3 +- .../bind/marshaller/Messages_it.properties | 3 +- .../bind/marshaller/Messages_ja.properties | 3 +- .../bind/marshaller/Messages_ko.properties | 3 +- .../bind/marshaller/Messages_pt_BR.properties | 3 +- .../bind/marshaller/Messages_zh_CN.properties | 3 +- .../bind/marshaller/Messages_zh_TW.properties | 3 +- .../com/sun/xml/bind/v2/Messages.properties | 3 +- .../sun/xml/bind/v2/Messages_de.properties | 3 +- .../sun/xml/bind/v2/Messages_es.properties | 3 +- .../sun/xml/bind/v2/Messages_fr.properties | 3 +- .../sun/xml/bind/v2/Messages_it.properties | 3 +- .../sun/xml/bind/v2/Messages_ja.properties | 3 +- .../sun/xml/bind/v2/Messages_ko.properties | 3 +- .../sun/xml/bind/v2/Messages_pt_BR.properties | 3 +- .../sun/xml/bind/v2/Messages_zh_CN.properties | 3 +- .../sun/xml/bind/v2/Messages_zh_TW.properties | 3 +- .../jaxb-ri-extensions-runtime-properties.xml | 4 +- ...tating-your-classes-mapping-interfaces.xml | 4 +- jaxb-ri/jxc/pom.xml | 12 +- .../jxc/ap/InlineAnnotationReaderImpl.java | 6 +- .../tools/jxc/api/impl/j2s/JAXBModelImpl.java | 2 +- .../jxc/api/impl/j2s/JavaCompilerImpl.java | 2 +- jaxb-ri/pom.xml | 1 + jaxb-ri/runtime/impl/exclude-runtime.xml | 18 +- jaxb-ri/runtime/impl/pom.xml | 23 +- .../org/glassfish/jaxb/runtime/v2/MUtils.java | 64 ++++ .../runtime/reflect/opt/AccessorInjector.java | 11 +- .../v2/runtime/reflect/opt/Injector.java | 4 +- .../reflect/opt/OptimizedAccessorFactory.java | 12 +- .../OptimizedTransducedAccessorFactory.java | 12 +- .../xml/bind/v2/runtime/reflect/Utils.java | 79 ----- .../v2/runtime/reflect/opt/SecureLoader.java | 60 ---- .../v2/runtime/unmarshaller/SecureLoader.java | 60 ---- .../impl/src/main/java/module-info.java | 49 ++- .../jaxb/runtime}/AccessorFactory.java | 9 +- .../jaxb/runtime}/AccessorFactoryImpl.java | 8 +- .../jaxb/runtime}/AnyTypeAdapter.java | 2 +- .../jaxb/runtime}/CycleRecoverable.java | 2 +- .../jaxb/runtime}/DatatypeConverterImpl.java | 20 +- .../glassfish/jaxb/runtime}/IDResolver.java | 7 +- .../runtime}/InternalAccessorFactory.java | 7 +- .../glassfish/jaxb/runtime}/Messages.java | 4 +- .../runtime}/ValidationEventLocatorEx.java | 2 +- .../jaxb/runtime}/XmlAccessorFactory.java | 10 +- .../jaxb/runtime}/api/AccessorException.java | 4 +- .../glassfish/jaxb/runtime}/api/Bridge.java | 22 +- .../jaxb/runtime}/api/BridgeContext.java | 2 +- .../jaxb/runtime}/api/ClassResolver.java | 7 +- .../jaxb/runtime}/api/CompositeStructure.java | 4 +- .../jaxb/runtime}/api/JAXBRIContext.java | 29 +- .../glassfish/jaxb/runtime}/api/Messages.java | 4 +- .../jaxb/runtime}/api/RawAccessor.java | 4 +- .../jaxb/runtime}/api/TypeReference.java | 7 +- .../glassfish/jaxb/runtime/api}/Utils.java | 4 +- .../jaxb/runtime}/api/package-info.java | 4 +- .../marshaller/NamespacePrefixMapper.java | 9 +- .../runtime}/marshaller/NioEscapeHandler.java | 6 +- .../jaxb/runtime}/unmarshaller/Messages.java | 4 +- .../jaxb/runtime}/unmarshaller/Patcher.java | 4 +- .../jaxb/runtime}/util/AttributesImpl.java | 11 +- .../util/ValidationEventLocatorExImpl.java | 5 +- .../jaxb/runtime}/v2/ContextFactory.java | 35 +- .../jaxb/runtime}/v2/JAXBContextFactory.java | 3 +- .../org/glassfish/jaxb/runtime/v2/MUtils.java | 30 ++ .../runtime}/v2/bytecode/ClassTailor.java | 14 +- .../runtime/v2/bytecode}/SecureLoader.java | 4 +- .../runtime}/v2/bytecode/package-info.java | 4 +- .../AbstractInlineAnnotationReaderImpl.java | 10 +- .../v2/model/annotation/ClassLocatable.java | 5 +- .../v2/model/annotation/FieldLocatable.java | 5 +- .../runtime}/v2/model/annotation/Init.java | 4 +- .../model/annotation/LocatableAnnotation.java | 15 +- .../v2/model/annotation/Messages.java | 4 +- .../v2/model/annotation/MethodLocatable.java | 5 +- .../runtime}/v2/model/annotation/Quick.java | 9 +- .../annotation/RuntimeAnnotationReader.java | 6 +- .../RuntimeInlineAnnotationReader.java | 8 +- .../v2/model/annotation}/SecureLoader.java | 4 +- .../model/annotation/XmlAttributeQuick.java | 6 +- .../model/annotation/XmlElementDeclQuick.java | 6 +- .../v2/model/annotation/XmlElementQuick.java | 6 +- .../model/annotation/XmlElementRefQuick.java | 6 +- .../model/annotation/XmlElementRefsQuick.java | 6 +- .../v2/model/annotation/XmlEnumQuick.java | 6 +- .../model/annotation/XmlRootElementQuick.java | 6 +- .../v2/model/annotation/XmlSchemaQuick.java | 6 +- .../model/annotation/XmlSchemaTypeQuick.java | 6 +- .../model/annotation/XmlTransientQuick.java | 6 +- .../v2/model/annotation/XmlTypeQuick.java | 6 +- .../v2/model/annotation/XmlValueQuick.java | 6 +- .../v2/model/annotation/package-info.java | 4 +- .../runtime}/v2/model/impl/AnyTypeImpl.java | 12 +- .../runtime}/v2/model/impl/ArrayInfoImpl.java | 10 +- .../model/impl/AttributePropertyInfoImpl.java | 10 +- .../v2/model/impl/BuiltinLeafInfoImpl.java | 15 +- .../runtime}/v2/model/impl/ClassInfoImpl.java | 61 +--- .../v2/model/impl/DummyPropertyInfo.java | 4 +- .../v2/model/impl/ERPropertyInfoImpl.java | 6 +- .../v2/model/impl/ElementInfoImpl.java | 41 +-- .../model/impl/ElementPropertyInfoImpl.java | 21 +- .../v2/model/impl/EnumConstantImpl.java | 4 +- .../v2/model/impl/EnumLeafInfoImpl.java | 19 +- .../v2/model/impl/FieldPropertySeed.java | 8 +- .../model/impl/GetterSetterPropertySeed.java | 10 +- .../runtime}/v2/model/impl/LeafInfoImpl.java | 8 +- .../v2/model/impl/MapPropertyInfoImpl.java | 15 +- .../jaxb/runtime}/v2/model/impl/Messages.java | 4 +- .../runtime}/v2/model/impl/ModelBuilder.java | 43 +-- .../v2/model/impl/PropertyInfoImpl.java | 36 +-- .../runtime}/v2/model/impl/PropertySeed.java | 8 +- .../model/impl/ReferencePropertyInfoImpl.java | 31 +- .../v2/model/impl/RegistryInfoImpl.java | 15 +- .../v2/model/impl/RuntimeAnyTypeImpl.java | 11 +- .../v2/model/impl/RuntimeArrayInfoImpl.java | 14 +- .../RuntimeAttributePropertyInfoImpl.java | 11 +- .../impl/RuntimeBuiltinLeafInfoImpl.java | 92 +++--- .../v2/model/impl/RuntimeClassInfoImpl.java | 62 ++-- .../v2/model/impl/RuntimeElementInfoImpl.java | 24 +- .../impl/RuntimeElementPropertyInfoImpl.java | 15 +- .../model/impl/RuntimeEnumConstantImpl.java | 4 +- .../model/impl/RuntimeEnumLeafInfoImpl.java | 32 +- .../impl/RuntimeMapPropertyInfoImpl.java | 14 +- .../v2/model/impl/RuntimeModelBuilder.java | 47 ++- .../RuntimeReferencePropertyInfoImpl.java | 12 +- .../v2/model/impl/RuntimeTypeInfoSetImpl.java | 18 +- .../v2/model/impl/RuntimeTypeRefImpl.java | 15 +- .../impl/RuntimeValuePropertyInfoImpl.java | 11 +- .../runtime/v2/model/impl}/SecureLoader.java | 4 +- .../impl/SingleTypePropertyInfoImpl.java | 19 +- .../runtime}/v2/model/impl/TypeInfoImpl.java | 12 +- .../v2/model/impl/TypeInfoSetImpl.java | 35 +- .../runtime}/v2/model/impl/TypeRefImpl.java | 8 +- .../jaxb/runtime}/v2/model/impl/Util.java | 12 +- .../jaxb/runtime/v2/model/impl}/Utils.java | 4 +- .../v2/model/impl/ValuePropertyInfoImpl.java | 4 +- .../runtime}/v2/model/impl/package-info.java | 4 +- .../v2/model/runtime/RuntimeArrayInfo.java | 8 +- .../runtime/RuntimeAttributePropertyInfo.java | 8 +- .../model/runtime/RuntimeBuiltinLeafInfo.java | 8 +- .../v2/model/runtime/RuntimeClassInfo.java | 22 +- .../v2/model/runtime/RuntimeElement.java | 8 +- .../v2/model/runtime/RuntimeElementInfo.java | 7 +- .../runtime/RuntimeElementPropertyInfo.java | 8 +- .../v2/model/runtime/RuntimeEnumLeafInfo.java | 8 +- .../v2/model/runtime/RuntimeLeafInfo.java | 11 +- .../model/runtime/RuntimeMapPropertyInfo.java | 8 +- .../v2/model/runtime/RuntimeNonElement.java | 10 +- .../model/runtime/RuntimeNonElementRef.java | 10 +- .../v2/model/runtime/RuntimePropertyInfo.java | 12 +- .../runtime/RuntimeReferencePropertyInfo.java | 8 +- .../v2/model/runtime/RuntimeTypeInfo.java | 8 +- .../v2/model/runtime/RuntimeTypeInfoSet.java | 11 +- .../v2/model/runtime/RuntimeTypeRef.java | 8 +- .../runtime/RuntimeValuePropertyInfo.java | 8 +- .../v2/model/runtime/package-info.java | 2 +- .../jaxb/runtime}/v2/package-info.java | 4 +- .../runtime}/v2/runtime/AnyTypeBeanInfo.java | 32 +- .../v2/runtime/ArrayBeanInfoImpl.java | 26 +- .../runtime}/v2/runtime/AssociationMap.java | 4 +- .../v2/runtime/AttributeAccessor.java | 4 +- .../jaxb/runtime}/v2/runtime/BinderImpl.java | 23 +- .../runtime}/v2/runtime/BridgeAdapter.java | 32 +- .../v2/runtime/BridgeContextImpl.java | 7 +- .../jaxb/runtime}/v2/runtime/BridgeImpl.java | 34 +- .../v2/runtime/ClassBeanInfoImpl.java | 52 ++- .../runtime/CompositeStructureBeanInfo.java | 18 +- .../v2/runtime/ContentHandlerAdaptor.java | 4 +- .../jaxb/runtime}/v2/runtime/Coordinator.java | 12 +- .../v2/runtime/DomPostInitAction.java | 13 +- .../v2/runtime/ElementBeanInfoImpl.java | 39 +-- .../runtime}/v2/runtime/FilterTransducer.java | 14 +- .../runtime/IllegalAnnotationsException.java | 12 +- .../v2/runtime/InlineBinaryTransducer.java | 14 +- .../runtime}/v2/runtime/InternalBridge.java | 12 +- .../runtime}/v2/runtime/JAXBContextImpl.java | 125 +++---- .../jaxb/runtime}/v2/runtime/JaxBeanInfo.java | 34 +- .../runtime}/v2/runtime/LeafBeanInfoImpl.java | 24 +- .../runtime}/v2/runtime/LifecycleMethods.java | 10 +- .../runtime}/v2/runtime/MarshallerImpl.java | 66 ++-- .../jaxb/runtime}/v2/runtime/Messages.java | 4 +- .../v2/runtime/MimeTypedTransducer.java | 14 +- .../jaxb/runtime}/v2/runtime/Name.java | 4 +- .../jaxb/runtime}/v2/runtime/NameBuilder.java | 11 +- .../jaxb/runtime}/v2/runtime/NameList.java | 4 +- .../v2/runtime/NamespaceContext2.java | 8 +- .../v2/runtime/SchemaTypeTransducer.java | 12 +- .../v2/runtime/StAXPostInitAction.java | 4 +- .../runtime}/v2/runtime/SwaRefAdapter.java | 5 +- .../jaxb/runtime}/v2/runtime/Transducer.java | 18 +- .../jaxb/runtime/v2/runtime}/Utils.java | 4 +- .../v2/runtime/ValueListBeanInfoImpl.java | 24 +- .../runtime}/v2/runtime/XMLSerializer.java | 75 ++--- .../v2/runtime/output/C14nXmlOutput.java | 14 +- .../runtime}/v2/runtime/output/DOMOutput.java | 7 +- .../runtime}/v2/runtime/output/Encoded.java | 4 +- .../output/FastInfosetStreamWriterOutput.java | 12 +- .../v2/runtime/output/ForkXmlOutput.java | 14 +- .../output/IndentingUTF8XmlOutput.java | 14 +- .../v2/runtime/output/MTOMXmlOutput.java | 18 +- .../runtime/output/NamespaceContextImpl.java | 26 +- .../runtime}/v2/runtime/output/Pcdata.java | 4 +- .../runtime}/v2/runtime/output/SAXOutput.java | 16 +- .../v2/runtime/output}/SecureLoader.java | 4 +- .../output/StAXExStreamWriterOutput.java | 11 +- .../v2/runtime/output/UTF8XmlOutput.java | 22 +- .../runtime/output/XMLEventWriterOutput.java | 12 +- .../runtime/output/XMLStreamWriterOutput.java | 22 +- .../runtime}/v2/runtime/output/XmlOutput.java | 16 +- .../runtime/output/XmlOutputAbstractImpl.java | 15 +- .../v2/runtime/output/package-info.java | 4 +- .../runtime}/v2/runtime/package-info.java | 4 +- .../v2/runtime/property/ArrayERProperty.java | 38 +-- .../property/ArrayElementLeafProperty.java | 22 +- .../property/ArrayElementNodeProperty.java | 18 +- .../property/ArrayElementProperty.java | 49 ++- .../v2/runtime/property/ArrayProperty.java | 14 +- .../property/ArrayReferenceNodeProperty.java | 36 +-- .../runtime/property/AttributeProperty.java | 32 +- .../runtime/property/ListElementProperty.java | 42 ++- .../v2/runtime/property/Messages.java | 4 +- .../v2/runtime/property/Property.java | 24 +- .../v2/runtime/property/PropertyFactory.java | 21 +- .../v2/runtime/property/PropertyImpl.java | 20 +- .../property/SingleElementLeafProperty.java | 40 +-- .../property/SingleElementNodeProperty.java | 46 ++- .../property/SingleMapNodeProperty.java | 48 +-- .../property/SingleReferenceNodeProperty.java | 40 ++- .../property/StructureLoaderBuilder.java | 16 +- .../v2/runtime/property/TagAndType.java | 10 +- .../runtime/property/UnmarshallerChain.java | 8 +- .../runtime/v2/runtime/property/Utils.java | 79 +++++ .../v2/runtime/property/ValueProperty.java | 32 +- .../runtime}/v2/runtime/reflect/Accessor.java | 38 +-- .../v2/runtime/reflect/AdaptedAccessor.java | 9 +- .../v2/runtime/reflect/AdaptedLister.java | 12 +- .../reflect/DefaultTransducedAccessor.java | 16 +- .../v2/runtime/reflect/ListIterator.java | 7 +- .../reflect/ListTransducedAccessorImpl.java | 12 +- .../runtime}/v2/runtime/reflect/Lister.java | 63 ++-- .../runtime}/v2/runtime/reflect/Messages.java | 4 +- .../v2/runtime/reflect/NullSafeAccessor.java | 6 +- .../reflect/PrimitiveArrayListerBoolean.java | 8 +- .../reflect/PrimitiveArrayListerByte.java | 10 +- .../PrimitiveArrayListerCharacter.java | 10 +- .../reflect/PrimitiveArrayListerDouble.java | 8 +- .../reflect/PrimitiveArrayListerFloat.java | 8 +- .../reflect/PrimitiveArrayListerInteger.java | 10 +- .../reflect/PrimitiveArrayListerLong.java | 8 +- .../reflect/PrimitiveArrayListerShort.java | 8 +- .../runtime/reflect/TransducedAccessor.java | 38 ++- .../runtime/v2/runtime/reflect}/Utils.java | 4 +- .../runtime/reflect/opt/AccessorInjector.java | 10 +- .../runtime}/v2/runtime/reflect/opt/Bean.java | 6 +- .../v2/runtime/reflect/opt/Const.java | 4 +- .../reflect/opt/FieldAccessor_Boolean.java | 6 +- .../reflect/opt/FieldAccessor_Byte.java | 6 +- .../reflect/opt/FieldAccessor_Character.java | 6 +- .../reflect/opt/FieldAccessor_Double.java | 6 +- .../reflect/opt/FieldAccessor_Float.java | 6 +- .../reflect/opt/FieldAccessor_Integer.java | 6 +- .../reflect/opt/FieldAccessor_Long.java | 6 +- .../reflect/opt/FieldAccessor_Ref.java | 6 +- .../reflect/opt/FieldAccessor_Short.java | 6 +- .../v2/runtime/reflect/opt/Injector.java | 23 +- .../reflect/opt/MethodAccessor_Boolean.java | 6 +- .../reflect/opt/MethodAccessor_Byte.java | 6 +- .../reflect/opt/MethodAccessor_Character.java | 6 +- .../reflect/opt/MethodAccessor_Double.java | 6 +- .../reflect/opt/MethodAccessor_Float.java | 6 +- .../reflect/opt/MethodAccessor_Integer.java | 6 +- .../reflect/opt/MethodAccessor_Long.java | 6 +- .../reflect/opt/MethodAccessor_Ref.java | 6 +- .../reflect/opt/MethodAccessor_Short.java | 6 +- .../reflect/opt/OptimizedAccessorFactory.java | 14 +- .../OptimizedTransducedAccessorFactory.java | 19 +- .../runtime}/v2/runtime/reflect/opt/Ref.java | 6 +- .../v2/runtime/reflect/opt/SecureLoader.java | 60 ++++ .../opt/TransducedAccessor_field_Boolean.java | 10 +- .../opt/TransducedAccessor_field_Byte.java | 10 +- .../opt/TransducedAccessor_field_Double.java | 10 +- .../opt/TransducedAccessor_field_Float.java | 10 +- .../opt/TransducedAccessor_field_Integer.java | 22 +- .../opt/TransducedAccessor_field_Long.java | 10 +- .../opt/TransducedAccessor_field_Short.java | 10 +- .../TransducedAccessor_method_Boolean.java | 10 +- .../opt/TransducedAccessor_method_Byte.java | 10 +- .../opt/TransducedAccessor_method_Double.java | 10 +- .../opt/TransducedAccessor_method_Float.java | 10 +- .../TransducedAccessor_method_Integer.java | 22 +- .../opt/TransducedAccessor_method_Long.java | 10 +- .../opt/TransducedAccessor_method_Short.java | 10 +- .../v2/runtime/reflect/opt/package-info.java | 8 +- .../v2/runtime/reflect/package-info.java | 4 +- .../v2/runtime/unmarshaller/AttributesEx.java | 4 +- .../unmarshaller/AttributesExImpl.java | 6 +- .../v2/runtime/unmarshaller/Base64Data.java | 26 +- .../v2/runtime/unmarshaller/ChildLoader.java | 4 +- .../unmarshaller/DefaultIDResolver.java | 12 +- .../DefaultValueLoaderDecorator.java | 4 +- .../v2/runtime/unmarshaller/Discarder.java | 4 +- .../v2/runtime/unmarshaller/DomLoader.java | 7 +- .../unmarshaller/FastInfosetConnector.java | 12 +- .../v2/runtime/unmarshaller/IntArrayData.java | 10 +- .../v2/runtime/unmarshaller/IntData.java | 10 +- .../v2/runtime/unmarshaller/Intercepter.java | 7 +- .../unmarshaller/InterningXmlVisitor.java | 9 +- .../unmarshaller/LeafPropertyLoader.java | 9 +- .../unmarshaller/LeafPropertyXsiLoader.java | 22 +- .../v2/runtime/unmarshaller/Loader.java | 14 +- .../unmarshaller/LocatorExWrapper.java | 4 +- .../runtime/unmarshaller/MTOMDecorator.java | 10 +- .../v2/runtime/unmarshaller/Messages.java | 4 +- .../v2/runtime/unmarshaller/Patcher.java | 4 +- .../v2/runtime/unmarshaller/ProxyLoader.java | 4 +- .../v2/runtime/unmarshaller/Receiver.java | 4 +- .../v2/runtime/unmarshaller/SAXConnector.java | 12 +- .../v2/runtime/unmarshaller/Scope.java | 11 +- .../v2/runtime/unmarshaller/SecureLoader.java | 60 ++++ .../runtime/unmarshaller/StAXConnector.java | 7 +- .../unmarshaller/StAXEventConnector.java | 20 +- .../runtime/unmarshaller/StAXExConnector.java | 10 +- .../unmarshaller/StAXStreamConnector.java | 14 +- .../runtime/unmarshaller/StructureLoader.java | 42 ++- .../v2/runtime/unmarshaller/TagName.java | 11 +- .../v2/runtime/unmarshaller/TextLoader.java | 9 +- .../unmarshaller/UnmarshallerImpl.java | 60 ++-- .../unmarshaller/UnmarshallingContext.java | 55 ++-- .../unmarshaller/ValidatingUnmarshaller.java | 12 +- .../unmarshaller/ValuePropertyLoader.java | 8 +- .../runtime/unmarshaller/WildcardLoader.java | 6 +- .../v2/runtime/unmarshaller/XmlVisitor.java | 9 +- .../v2/runtime/unmarshaller/XsiNilLoader.java | 18 +- .../runtime/unmarshaller/XsiTypeLoader.java | 17 +- .../v2/schemagen/FoolProofResolver.java | 11 +- .../jaxb/runtime}/v2/schemagen/Form.java | 14 +- .../jaxb/runtime}/v2/schemagen/GroupKind.java | 8 +- .../jaxb/runtime}/v2/schemagen/Messages.java | 6 +- .../jaxb/runtime}/v2/schemagen/MultiMap.java | 6 +- .../jaxb/runtime}/v2/schemagen/Tree.java | 14 +- .../jaxb/runtime}/v2/schemagen/Util.java | 4 +- .../v2/schemagen/XmlSchemaGenerator.java | 104 ++---- .../runtime}/v2/schemagen/package-info.java | 7 +- .../v2/schemagen/xmlschema/Annotated.java | 4 +- .../v2/schemagen/xmlschema/Annotation.java | 4 +- .../runtime}/v2/schemagen/xmlschema/Any.java | 4 +- .../v2/schemagen/xmlschema/Appinfo.java | 4 +- .../v2/schemagen/xmlschema/AttrDecls.java | 4 +- .../v2/schemagen/xmlschema/AttributeType.java | 7 +- .../schemagen/xmlschema/ComplexContent.java | 4 +- .../schemagen/xmlschema/ComplexExtension.java | 4 +- .../xmlschema/ComplexRestriction.java | 7 +- .../v2/schemagen/xmlschema/ComplexType.java | 4 +- .../schemagen/xmlschema/ComplexTypeHost.java | 4 +- .../schemagen/xmlschema/ComplexTypeModel.java | 4 +- .../xmlschema/ContentModelContainer.java | 4 +- .../v2/schemagen/xmlschema/Documentation.java | 4 +- .../v2/schemagen/xmlschema/Element.java | 7 +- .../v2/schemagen/xmlschema/ExplicitGroup.java | 4 +- .../v2/schemagen/xmlschema/ExtensionType.java | 7 +- .../schemagen/xmlschema/FixedOrDefault.java | 4 +- .../v2/schemagen/xmlschema/Import.java | 4 +- .../runtime}/v2/schemagen/xmlschema/List.java | 7 +- .../schemagen/xmlschema/LocalAttribute.java | 7 +- .../v2/schemagen/xmlschema/LocalElement.java | 7 +- .../schemagen/xmlschema/NestedParticle.java | 4 +- .../v2/schemagen/xmlschema/NoFixedFacet.java | 4 +- .../v2/schemagen/xmlschema/Occurs.java | 4 +- .../v2/schemagen/xmlschema/Particle.java | 4 +- .../v2/schemagen/xmlschema/Redefinable.java | 4 +- .../v2/schemagen/xmlschema/Schema.java | 4 +- .../v2/schemagen/xmlschema/SchemaTop.java | 4 +- .../v2/schemagen/xmlschema/SimpleContent.java | 4 +- .../schemagen/xmlschema/SimpleDerivation.java | 4 +- .../schemagen/xmlschema/SimpleExtension.java | 4 +- .../xmlschema/SimpleRestriction.java | 4 +- .../xmlschema/SimpleRestrictionModel.java | 7 +- .../v2/schemagen/xmlschema/SimpleType.java | 4 +- .../schemagen/xmlschema/SimpleTypeHost.java | 4 +- .../xmlschema/TopLevelAttribute.java | 4 +- .../schemagen/xmlschema/TopLevelElement.java | 7 +- .../schemagen/xmlschema/TypeDefParticle.java | 4 +- .../v2/schemagen/xmlschema/TypeHost.java | 4 +- .../v2/schemagen/xmlschema/Union.java | 7 +- .../v2/schemagen/xmlschema/Wildcard.java | 4 +- .../v2/schemagen/xmlschema/package-info.java | 4 +- .../v2/util/ByteArrayOutputStreamEx.java | 12 +- .../runtime}/v2/util/CollisionCheckStack.java | 4 +- .../runtime}/v2/util/DataSourceSource.java | 12 +- .../jaxb/runtime}/v2/util/FatalAdapter.java | 6 +- .../jaxb/runtime}/v2/util/QNameMap.java | 16 +- .../jaxb/runtime}/v2/util/StackRecorder.java | 4 +- .../jaxb/runtime}/v2/util/TypeCast.java | 4 +- .../v2/doc-files/j2s_architecture.gif | Bin .../v2/doc-files/j2s_architecture.sxd | Bin .../jaxb/runtime}/v2/doc-files/packages.png | Bin .../jaxb/runtime}/v2/doc-files/packages.vsd | Bin .../jaxb/runtime}/v2/doc-files/readme.txt | 0 .../services/jakarta.xml.bind.JAXBContext | 2 +- .../jakarta.xml.bind.JAXBContextFactory | 2 +- .../jaxb/runtime}/Messages.properties | 3 +- .../jaxb/runtime}/Messages_de.properties | 3 +- .../jaxb/runtime}/Messages_es.properties | 3 +- .../jaxb/runtime}/Messages_fr.properties | 3 +- .../jaxb/runtime}/Messages_it.properties | 3 +- .../jaxb/runtime}/Messages_ja.properties | 3 +- .../jaxb/runtime}/Messages_ko.properties | 3 +- .../jaxb/runtime}/Messages_pt_BR.properties | 3 +- .../jaxb/runtime}/Messages_zh_CN.properties | 3 +- .../jaxb/runtime}/Messages_zh_TW.properties | 3 +- .../jaxb/runtime}/api/Messages.properties | 3 +- .../jaxb/runtime}/api/Messages_de.properties | 3 +- .../jaxb/runtime}/api/Messages_es.properties | 3 +- .../jaxb/runtime}/api/Messages_fr.properties | 3 +- .../jaxb/runtime}/api/Messages_it.properties | 3 +- .../jaxb/runtime}/api/Messages_ja.properties | 3 +- .../jaxb/runtime}/api/Messages_ko.properties | 3 +- .../runtime}/api/Messages_pt_BR.properties | 3 +- .../runtime}/api/Messages_zh_CN.properties | 3 +- .../runtime}/api/Messages_zh_TW.properties | 3 +- .../runtime}/unmarshaller/Messages.properties | 3 +- .../unmarshaller/Messages_de.properties | 3 +- .../unmarshaller/Messages_es.properties | 3 +- .../unmarshaller/Messages_fr.properties | 3 +- .../unmarshaller/Messages_it.properties | 3 +- .../unmarshaller/Messages_ja.properties | 3 +- .../unmarshaller/Messages_ko.properties | 3 +- .../unmarshaller/Messages_pt_BR.properties | 3 +- .../unmarshaller/Messages_zh_CN.properties | 3 +- .../unmarshaller/Messages_zh_TW.properties | 3 +- .../v2/model/annotation/Messages.properties | 3 +- .../model/annotation/Messages_de.properties | 3 +- .../model/annotation/Messages_es.properties | 3 +- .../model/annotation/Messages_fr.properties | 3 +- .../model/annotation/Messages_it.properties | 3 +- .../model/annotation/Messages_ja.properties | 3 +- .../model/annotation/Messages_ko.properties | 3 +- .../annotation/Messages_pt_BR.properties | 3 +- .../annotation/Messages_zh_CN.properties | 3 +- .../annotation/Messages_zh_TW.properties | 3 +- .../v2/model/impl/Messages.properties | 4 +- .../v2/model/impl/Messages_de.properties | 4 +- .../v2/model/impl/Messages_es.properties | 4 +- .../v2/model/impl/Messages_fr.properties | 4 +- .../v2/model/impl/Messages_it.properties | 4 +- .../v2/model/impl/Messages_ja.properties | 4 +- .../v2/model/impl/Messages_ko.properties | 4 +- .../v2/model/impl/Messages_pt_BR.properties | 4 +- .../v2/model/impl/Messages_zh_CN.properties | 4 +- .../v2/model/impl/Messages_zh_TW.properties | 4 +- .../runtime}/v2/runtime/Messages.properties | 3 +- .../v2/runtime/Messages_de.properties | 3 +- .../v2/runtime/Messages_es.properties | 3 +- .../v2/runtime/Messages_fr.properties | 3 +- .../v2/runtime/Messages_it.properties | 3 +- .../v2/runtime/Messages_ja.properties | 3 +- .../v2/runtime/Messages_ko.properties | 3 +- .../v2/runtime/Messages_pt_BR.properties | 3 +- .../v2/runtime/Messages_zh_CN.properties | 3 +- .../v2/runtime/Messages_zh_TW.properties | 3 +- .../v2/runtime/property/Messages.properties | 3 +- .../runtime/property/Messages_de.properties | 3 +- .../runtime/property/Messages_es.properties | 3 +- .../runtime/property/Messages_fr.properties | 3 +- .../runtime/property/Messages_it.properties | 3 +- .../runtime/property/Messages_ja.properties | 3 +- .../runtime/property/Messages_ko.properties | 3 +- .../property/Messages_pt_BR.properties | 3 +- .../property/Messages_zh_CN.properties | 3 +- .../property/Messages_zh_TW.properties | 3 +- .../v2/runtime/reflect/Messages.properties | 3 +- .../v2/runtime/reflect/Messages_de.properties | 3 +- .../v2/runtime/reflect/Messages_es.properties | 3 +- .../v2/runtime/reflect/Messages_fr.properties | 3 +- .../v2/runtime/reflect/Messages_it.properties | 3 +- .../v2/runtime/reflect/Messages_ja.properties | 3 +- .../v2/runtime/reflect/Messages_ko.properties | 3 +- .../runtime/reflect/Messages_pt_BR.properties | 3 +- .../runtime/reflect/Messages_zh_CN.properties | 3 +- .../runtime/reflect/Messages_zh_TW.properties | 3 +- .../runtime/unmarshaller/Messages.properties | 3 +- .../unmarshaller/Messages_de.properties | 3 +- .../unmarshaller/Messages_es.properties | 3 +- .../unmarshaller/Messages_fr.properties | 3 +- .../unmarshaller/Messages_it.properties | 3 +- .../unmarshaller/Messages_ja.properties | 3 +- .../unmarshaller/Messages_ko.properties | 3 +- .../unmarshaller/Messages_pt_BR.properties | 3 +- .../unmarshaller/Messages_zh_CN.properties | 3 +- .../unmarshaller/Messages_zh_TW.properties | 3 +- .../runtime}/v2/schemagen/Messages.properties | 3 +- .../v2/schemagen/Messages_de.properties | 3 +- .../v2/schemagen/Messages_es.properties | 3 +- .../v2/schemagen/Messages_fr.properties | 3 +- .../v2/schemagen/Messages_it.properties | 3 +- .../v2/schemagen/Messages_ja.properties | 3 +- .../v2/schemagen/Messages_ko.properties | 3 +- .../v2/schemagen/Messages_pt_BR.properties | 3 +- .../v2/schemagen/Messages_zh_CN.properties | 3 +- .../v2/schemagen/Messages_zh_TW.properties | 3 +- .../xmlschema/xmlschema-for-jaxb.rng | 2 +- .../runtime}/marshaller/XMLWriterTest.java | 6 +- .../test/AbstractTestMultiRelease.java | 5 +- .../jaxb/runtime}/test/SinceJava9.java | 5 +- .../v2/BackupWithParentNamespaceTest.java | 5 +- .../runtime}/v2/CompositeStructureTest.java | 10 +- .../jaxb/runtime}/v2/runtime/Printer.java | 4 +- .../v2/runtime/reflect/opt/ConstTest.java | 2 +- .../runtime/reflect/opt/OptimizationTest.java | 3 +- .../opt/OptimizationTestMultiRelease.java | 13 +- .../v2/schemagen/MarshallingAbstractTest.java | 12 +- .../jaxb/runtime}/v2/schemagen/MyRef.java | 2 +- .../jaxb/runtime}/v2/schemagen/NSParent.java | 2 +- .../v2/schemagen/XmlSchemaGeneratorTest.java | 3 +- .../xmlschema/JaxbConcreteContainer.java | 2 +- .../xmlschema/JaxbConcreteDeployment.java | 2 +- .../v2/schemagen/xmlschema/JaxbContainer.java | 2 +- .../schemagen/xmlschema/JaxbDeployment.java | 2 +- .../schemagen/xmlschema/JaxbDistribution.java | 2 +- .../xmlschema/JaxbEnvironmentModel.java | 2 +- .../v2/util/CollisionCheckStackTest.java | 4 +- jaxb-ri/xjc/pom.xml | 14 +- jaxb-ri/xjc/src/main/java/module-info.java | 2 +- 627 files changed, 3440 insertions(+), 3154 deletions(-) create mode 100644 jaxb-ri/bundles/core/pom.xml create mode 100644 jaxb-ri/bundles/core/src/main/java/module-info.java create mode 100644 jaxb-ri/bundles/core/src/test/java/jaxb/core/test/OSGiBundleVersionTest.java create mode 100644 jaxb-ri/core/exclude-core.xml create mode 100644 jaxb-ri/core/pom.xml rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/Locatable.java (93%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/Utils.java (94%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/WhiteSpaceProcessor.java (98%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/annotation/OverrideAnnotationOf.java (92%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/annotation/XmlIsSet.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/annotation/XmlLocation.java (96%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/api/ErrorListener.java (95%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/api/impl/NameConverter.java (99%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/api/impl/NameUtil.java (99%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/marshaller/CharacterEscapeHandler.java (93%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/marshaller/DataWriter.java (99%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/marshaller/DumbEscapeHandler.java (96%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/marshaller/Messages.java (97%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/marshaller/MinimumEscapeHandler.java (97%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/marshaller/NoEscapeHandler.java (92%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java (99%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/marshaller/XMLWriter.java (98%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/unmarshaller/DOMScanner.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/unmarshaller/InfosetScanner.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/util/SecureLoader.java (96%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/util/Which.java (95%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/ClassFactory.java (99%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/Messages.java (94%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/TODO.java (94%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/WellKnownNamespace.java (95%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java (98%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationSource.java (95%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/annotation/Locatable.java (95%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/Adapter.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java (93%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/AttributePropertyInfo.java (94%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java (93%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/ClassInfo.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/Element.java (94%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/ElementInfo.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/ElementPropertyInfo.java (98%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/EnumConstant.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/EnumLeafInfo.java (95%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/ErrorHandler.java (95%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/ID.java (85%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/LeafInfo.java (91%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/MapPropertyInfo.java (97%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/MaybeElement.java (94%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/NonElement.java (95%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/NonElementRef.java (92%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/PropertyKind.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/Ref.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/ReferencePropertyInfo.java (98%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/RegistryInfo.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfo.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfoSet.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/TypeRef.java (93%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/ValuePropertyInfo.java (88%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/WildcardMode.java (91%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/WildcardTypeInfo.java (89%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/core/package-info.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilderI.java (90%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/nav/GenericArrayTypeImpl.java (96%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/nav/Navigator.java (99%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/nav/ParameterizedTypeImpl.java (98%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/nav/ReflectionNavigator.java (99%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/nav/SecureLoader.java (96%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/nav/TypeVisitor.java (96%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/nav/WildcardTypeImpl.java (94%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/nav/package-info.java (87%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/model/util/ArrayInfoUtil.java (94%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/runtime/IllegalAnnotationException.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/runtime/Location.java (91%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/runtime/RuntimeUtil.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/runtime/SwaRefAdapterMarker.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LocatorEx.java (100%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Bindings.java (93%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Klass.java (90%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Package.java (89%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/SchemaBindings.java (90%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/schemagen/episode/package-info.java (89%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/util/EditDistance.java (98%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/util/FlattenIterator.java (95%) rename jaxb-ri/{runtime/impl => core}/src/main/java/com/sun/xml/bind/v2/util/XmlFactory.java (99%) create mode 100644 jaxb-ri/core/src/main/java/module-info.java rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages.properties (95%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages_de.properties (95%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages_es.properties (95%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages_fr.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages_it.properties (95%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages_ja.properties (97%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages_ko.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages_pt_BR.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_CN.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_TW.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages.properties (97%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages_de.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages_es.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages_fr.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages_it.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages_ja.properties (97%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages_ko.properties (97%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages_pt_BR.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages_zh_CN.properties (96%) rename jaxb-ri/{runtime/impl => core}/src/main/resources/com/sun/xml/bind/v2/Messages_zh_TW.properties (96%) create mode 100644 jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/MUtils.java rename jaxb-ri/runtime/impl/src/main/java-mr/9/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/AccessorInjector.java (68%) rename jaxb-ri/runtime/impl/src/main/java-mr/9/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/Injector.java (86%) rename jaxb-ri/runtime/impl/src/main/java-mr/9/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/OptimizedAccessorFactory.java (65%) rename jaxb-ri/runtime/impl/src/main/java-mr/9/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java (53%) delete mode 100644 jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Utils.java delete mode 100644 jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/SecureLoader.java delete mode 100644 jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/SecureLoader.java rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/AccessorFactory.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/AccessorFactoryImpl.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/AnyTypeAdapter.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/CycleRecoverable.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/DatatypeConverterImpl.java (99%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/IDResolver.java (99%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/InternalAccessorFactory.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/ValidationEventLocatorEx.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/XmlAccessorFactory.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/AccessorException.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Bridge.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/BridgeContext.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/ClassResolver.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/CompositeStructure.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/JAXBRIContext.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/RawAccessor.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/TypeReference.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind/v2/model/impl => org/glassfish/jaxb/runtime/api}/Utils.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/package-info.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/marshaller/NamespacePrefixMapper.java (99%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/marshaller/NioEscapeHandler.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Patcher.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/util/AttributesImpl.java (99%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/util/ValidationEventLocatorExImpl.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/ContextFactory.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/JAXBContextFactory.java (97%) create mode 100644 jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/MUtils.java rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/bytecode/ClassTailor.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind/v2/model/impl => org/glassfish/jaxb/runtime/v2/bytecode}/SecureLoader.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/bytecode/package-info.java (75%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/ClassLocatable.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/FieldLocatable.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Init.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/LocatableAnnotation.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/MethodLocatable.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Quick.java (89%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/RuntimeAnnotationReader.java (73%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/RuntimeInlineAnnotationReader.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind/v2/bytecode => org/glassfish/jaxb/runtime/v2/model/annotation}/SecureLoader.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlAttributeQuick.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlElementDeclQuick.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlElementQuick.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlElementRefQuick.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlElementRefsQuick.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlEnumQuick.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlRootElementQuick.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlSchemaQuick.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlSchemaTypeQuick.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlTransientQuick.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlTypeQuick.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/XmlValueQuick.java (89%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/package-info.java (75%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/AnyTypeImpl.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/ArrayInfoImpl.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/AttributePropertyInfoImpl.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/BuiltinLeafInfoImpl.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/ClassInfoImpl.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/DummyPropertyInfo.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/ERPropertyInfoImpl.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/ElementInfoImpl.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/ElementPropertyInfoImpl.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/EnumConstantImpl.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/EnumLeafInfoImpl.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/FieldPropertySeed.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/GetterSetterPropertySeed.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/LeafInfoImpl.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/MapPropertyInfoImpl.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/ModelBuilder.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/PropertyInfoImpl.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/PropertySeed.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/ReferencePropertyInfoImpl.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RegistryInfoImpl.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeAnyTypeImpl.java (72%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeArrayInfoImpl.java (75%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeAttributePropertyInfoImpl.java (77%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeClassInfoImpl.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeElementInfoImpl.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeElementPropertyInfoImpl.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeEnumConstantImpl.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeEnumLeafInfoImpl.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeMapPropertyInfoImpl.java (76%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeModelBuilder.java (83%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeReferencePropertyInfoImpl.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeTypeInfoSetImpl.java (89%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeTypeRefImpl.java (72%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/RuntimeValuePropertyInfoImpl.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind/v2/runtime/output => org/glassfish/jaxb/runtime/v2/model/impl}/SecureLoader.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/SingleTypePropertyInfoImpl.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/TypeInfoImpl.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/TypeInfoSetImpl.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/TypeRefImpl.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Util.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind/v2/runtime => org/glassfish/jaxb/runtime/v2/model/impl}/Utils.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/ValuePropertyInfoImpl.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/package-info.java (75%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeArrayInfo.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeAttributePropertyInfo.java (83%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeBuiltinLeafInfo.java (80%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeClassInfo.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeElement.java (80%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeElementInfo.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeElementPropertyInfo.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeEnumLeafInfo.java (80%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeLeafInfo.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeMapPropertyInfo.java (83%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeNonElement.java (80%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeNonElementRef.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimePropertyInfo.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeReferencePropertyInfo.java (83%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeTypeInfo.java (79%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeTypeInfoSet.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeTypeRef.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/RuntimeValuePropertyInfo.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/runtime/package-info.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/package-info.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/AnyTypeBeanInfo.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/ArrayBeanInfoImpl.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/AssociationMap.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/AttributeAccessor.java (77%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/BinderImpl.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/BridgeAdapter.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/BridgeContextImpl.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/BridgeImpl.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/ClassBeanInfoImpl.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/CompositeStructureBeanInfo.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/ContentHandlerAdaptor.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Coordinator.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/DomPostInitAction.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/ElementBeanInfoImpl.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/FilterTransducer.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/IllegalAnnotationsException.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/InlineBinaryTransducer.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/InternalBridge.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/JAXBContextImpl.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/JaxBeanInfo.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/LeafBeanInfoImpl.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/LifecycleMethods.java (76%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/MarshallerImpl.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/MimeTypedTransducer.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Name.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/NameBuilder.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/NameList.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/NamespaceContext2.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/SchemaTypeTransducer.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/StAXPostInitAction.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/SwaRefAdapter.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Transducer.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind/api => org/glassfish/jaxb/runtime/v2/runtime}/Utils.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/ValueListBeanInfoImpl.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/XMLSerializer.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/C14nXmlOutput.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/DOMOutput.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/Encoded.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/FastInfosetStreamWriterOutput.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/ForkXmlOutput.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/IndentingUTF8XmlOutput.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/MTOMXmlOutput.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/NamespaceContextImpl.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/Pcdata.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/SAXOutput.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind/v2/model/annotation => org/glassfish/jaxb/runtime/v2/runtime/output}/SecureLoader.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/StAXExStreamWriterOutput.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/UTF8XmlOutput.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/XMLEventWriterOutput.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/XMLStreamWriterOutput.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/XmlOutput.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/XmlOutputAbstractImpl.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/output/package-info.java (75%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/package-info.java (75%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/ArrayERProperty.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/ArrayElementLeafProperty.java (76%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/ArrayElementNodeProperty.java (72%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/ArrayElementProperty.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/ArrayProperty.java (73%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/ArrayReferenceNodeProperty.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/AttributeProperty.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/ListElementProperty.java (71%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Property.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/PropertyFactory.java (89%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/PropertyImpl.java (80%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/SingleElementLeafProperty.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/SingleElementNodeProperty.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/SingleMapNodeProperty.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/SingleReferenceNodeProperty.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/StructureLoaderBuilder.java (80%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/TagAndType.java (72%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/UnmarshallerChain.java (82%) create mode 100644 jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Utils.java rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/ValueProperty.java (76%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Accessor.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/AdaptedAccessor.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/AdaptedLister.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/DefaultTransducedAccessor.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/ListIterator.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/ListTransducedAccessorImpl.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Lister.java (89%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/NullSafeAccessor.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/PrimitiveArrayListerBoolean.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/PrimitiveArrayListerByte.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/PrimitiveArrayListerCharacter.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/PrimitiveArrayListerDouble.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/PrimitiveArrayListerFloat.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/PrimitiveArrayListerInteger.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/PrimitiveArrayListerLong.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/PrimitiveArrayListerShort.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/TransducedAccessor.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind/v2/runtime/property => org/glassfish/jaxb/runtime/v2/runtime/reflect}/Utils.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/AccessorInjector.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/Bean.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/Const.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/FieldAccessor_Boolean.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/FieldAccessor_Byte.java (81%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/FieldAccessor_Character.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/FieldAccessor_Double.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/FieldAccessor_Float.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/FieldAccessor_Integer.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/FieldAccessor_Long.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/FieldAccessor_Ref.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/FieldAccessor_Short.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/Injector.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/MethodAccessor_Boolean.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/MethodAccessor_Byte.java (81%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/MethodAccessor_Character.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/MethodAccessor_Double.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/MethodAccessor_Float.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/MethodAccessor_Integer.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/MethodAccessor_Long.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/MethodAccessor_Ref.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/MethodAccessor_Short.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/OptimizedAccessorFactory.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/Ref.java (67%) create mode 100644 jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/SecureLoader.java rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java (74%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java (73%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java (74%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java (74%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java (71%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java (74%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java (74%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java (77%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java (71%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/package-info.java (61%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/package-info.java (73%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/AttributesEx.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/AttributesExImpl.java (79%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Base64Data.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/ChildLoader.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/DefaultIDResolver.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java (89%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Discarder.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/DomLoader.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/FastInfosetConnector.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/IntArrayData.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/IntData.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Intercepter.java (75%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/InterningXmlVisitor.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/LeafPropertyLoader.java (79%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Loader.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/LocatorExWrapper.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/MTOMDecorator.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Patcher.java (76%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/ProxyLoader.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Receiver.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/SAXConnector.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Scope.java (91%) create mode 100644 jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/SecureLoader.java rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/StAXConnector.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/StAXEventConnector.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/StAXExConnector.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/StAXStreamConnector.java (99%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/StructureLoader.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/TagName.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/TextLoader.java (81%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/UnmarshallerImpl.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/UnmarshallingContext.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/ValidatingUnmarshaller.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/ValuePropertyLoader.java (89%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/WildcardLoader.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/XmlVisitor.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/XsiNilLoader.java (92%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/XsiTypeLoader.java (94%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/FoolProofResolver.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Form.java (89%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/GroupKind.java (72%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/MultiMap.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Tree.java (93%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Util.java (96%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/XmlSchemaGenerator.java (95%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/package-info.java (63%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Annotated.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Annotation.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Any.java (80%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Appinfo.java (83%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/AttrDecls.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/AttributeType.java (83%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/ComplexContent.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/ComplexExtension.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/ComplexRestriction.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/ComplexType.java (89%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/ComplexTypeHost.java (81%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/ComplexTypeModel.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/ContentModelContainer.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Documentation.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Element.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/ExplicitGroup.java (79%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/ExtensionType.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/FixedOrDefault.java (83%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Import.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/List.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/LocalAttribute.java (87%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/LocalElement.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/NestedParticle.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/NoFixedFacet.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Occurs.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Particle.java (75%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Redefinable.java (79%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Schema.java (91%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/SchemaTop.java (83%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/SimpleContent.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/SimpleDerivation.java (83%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/SimpleExtension.java (81%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/SimpleRestriction.java (82%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/SimpleRestrictionModel.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/SimpleType.java (86%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/SimpleTypeHost.java (81%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/TopLevelAttribute.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/TopLevelElement.java (88%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/TypeDefParticle.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/TypeHost.java (78%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Union.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/Wildcard.java (85%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/package-info.java (76%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/util/ByteArrayOutputStreamEx.java (84%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/util/CollisionCheckStack.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/util/DataSourceSource.java (98%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/util/FatalAdapter.java (90%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/util/QNameMap.java (97%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/util/StackRecorder.java (79%) rename jaxb-ri/runtime/impl/src/main/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/util/TypeCast.java (89%) rename jaxb-ri/runtime/impl/src/main/javadoc/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/doc-files/j2s_architecture.gif (100%) rename jaxb-ri/runtime/impl/src/main/javadoc/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/doc-files/j2s_architecture.sxd (100%) rename jaxb-ri/runtime/impl/src/main/javadoc/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/doc-files/packages.png (100%) rename jaxb-ri/runtime/impl/src/main/javadoc/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/doc-files/packages.vsd (100%) rename jaxb-ri/runtime/impl/src/main/javadoc/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/doc-files/readme.txt (100%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages.properties (84%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages_de.properties (85%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages_es.properties (84%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages_fr.properties (84%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages_it.properties (85%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages_ja.properties (86%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages_ko.properties (86%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages_pt_BR.properties (84%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages_zh_CN.properties (85%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/Messages_zh_TW.properties (84%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages.properties (83%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages_de.properties (83%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages_es.properties (83%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages_fr.properties (83%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages_it.properties (84%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages_ja.properties (84%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages_ko.properties (84%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages_pt_BR.properties (83%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages_zh_CN.properties (84%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/api/Messages_zh_TW.properties (83%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages.properties (96%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages_de.properties (96%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages_es.properties (96%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages_fr.properties (97%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages_it.properties (97%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages_ja.properties (97%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages_ko.properties (97%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages_pt_BR.properties (96%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages_zh_CN.properties (97%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/unmarshaller/Messages_zh_TW.properties (97%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages.properties (88%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages_de.properties (89%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages_es.properties (89%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages_fr.properties (89%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages_it.properties (89%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages_ja.properties (92%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages_ko.properties (92%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages_pt_BR.properties (89%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages_zh_CN.properties (89%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/annotation/Messages_zh_TW.properties (90%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages_de.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages_es.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages_fr.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages_it.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages_ja.properties (99%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages_ko.properties (99%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages_pt_BR.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages_zh_CN.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/model/impl/Messages_zh_TW.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages_de.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages_es.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages_fr.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages_it.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages_ja.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages_ko.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages_pt_BR.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages_zh_CN.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Messages_zh_TW.properties (98%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages.properties (88%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages_de.properties (88%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages_es.properties (88%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages_fr.properties (89%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages_it.properties (88%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages_ja.properties (92%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages_ko.properties (91%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages_pt_BR.properties (88%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages_zh_CN.properties (89%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/property/Messages_zh_TW.properties (89%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages.properties (93%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages_de.properties (93%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages_es.properties (92%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages_fr.properties (93%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages_it.properties (93%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages_ja.properties (95%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages_ko.properties (95%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages_pt_BR.properties (92%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages_zh_CN.properties (93%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/Messages_zh_TW.properties (94%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages.properties (95%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages_de.properties (94%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages_es.properties (94%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages_fr.properties (94%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages_it.properties (94%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages_ja.properties (96%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages_ko.properties (96%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages_pt_BR.properties (94%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages_zh_CN.properties (95%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/unmarshaller/Messages_zh_TW.properties (95%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages.properties (91%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages_de.properties (91%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages_es.properties (91%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages_fr.properties (93%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages_it.properties (92%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages_ja.properties (94%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages_ko.properties (94%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages_pt_BR.properties (92%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages_zh_CN.properties (92%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/Messages_zh_TW.properties (92%) rename jaxb-ri/runtime/impl/src/main/resources/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng (99%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/marshaller/XMLWriterTest.java (92%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/test/AbstractTestMultiRelease.java (92%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/test/SinceJava9.java (84%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/BackupWithParentNamespaceTest.java (94%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/CompositeStructureTest.java (89%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/Printer.java (89%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/ConstTest.java (92%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/OptimizationTest.java (97%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/runtime/reflect/opt/OptimizationTestMultiRelease.java (83%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/MarshallingAbstractTest.java (96%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/MyRef.java (94%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/NSParent.java (95%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/XmlSchemaGeneratorTest.java (99%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/JaxbConcreteContainer.java (93%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/JaxbConcreteDeployment.java (93%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/JaxbContainer.java (97%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/JaxbDeployment.java (96%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/JaxbDistribution.java (97%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/schemagen/xmlschema/JaxbEnvironmentModel.java (97%) rename jaxb-ri/runtime/impl/src/test/java/{com/sun/xml/bind => org/glassfish/jaxb/runtime}/v2/util/CollisionCheckStackTest.java (91%) diff --git a/.gitignore b/.gitignore index 599d709df..c9779a27a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ target/ **/.settings **/.classpath **/.project -**/.iml +**/*.iml diff --git a/jaxb-ri/boms/bom/pom.xml b/jaxb-ri/boms/bom/pom.xml index d193c7450..de805a84a 100644 --- a/jaxb-ri/boms/bom/pom.xml +++ b/jaxb-ri/boms/bom/pom.xml @@ -49,6 +49,12 @@ ${project.version} sources + + org.glassfish.jaxb + jaxb-core + ${project.version} + sources + org.glassfish.jaxb jaxb-xjc @@ -69,6 +75,12 @@ ${project.version} sources + + com.sun.xml.bind + jaxb-core + ${project.version} + sources + com.sun.xml.bind jaxb-xjc @@ -109,6 +121,11 @@ jaxb-runtime ${project.version} + + org.glassfish.jaxb + jaxb-core + ${project.version} + org.glassfish.jaxb jaxb-xjc @@ -126,6 +143,11 @@ jaxb-impl ${project.version} + + com.sun.xml.bind + jaxb-core + ${project.version} + com.sun.xml.bind jaxb-xjc diff --git a/jaxb-ri/bundles/core/pom.xml b/jaxb-ri/bundles/core/pom.xml new file mode 100644 index 000000000..42428df7d --- /dev/null +++ b/jaxb-ri/bundles/core/pom.xml @@ -0,0 +1,305 @@ + + + + + 4.0.0 + + + com.sun.xml.bind.mvn + jaxb-bundles + 3.0.0-SNAPSHOT + ../pom.xml + + + com.sun.xml.bind + jaxb-core + + jar + Old JAXB Core + Old JAXB Core module. Contains sources required by XJC, JXC and Runtime modules with dependencies. + + + + + jakarta.activation + jakarta.activation-api + provided + + + + org.glassfish.jaxb + jaxb-core + provided + + + org.glassfish.jaxb + txw2 + provided + + + com.sun.istack + istack-commons-runtime + provided + + + junit + junit + test + + + + + ${project.build.directory}/generated-sources/dependencies + ${project.build.directory}/generated-sources/dependencies-mr + + + + + default-profile + + + !dev + + + + + org.osgi + osgi.core + ${felix.osgi.core} + test + + + org.glassfish.jaxb + osgi-test-core + ${project.version} + test + + + org.glassfish.jaxb + osgi-test-parent + ${project.version} + test + + + + + + + + + org.apache.felix + maven-junit4osgi-plugin + ${felix.junit4osgi} + + + + test + + integration-test + + ${skipOsgiTests} + true + + + org.xml.sax.ext, + org.xml.sax.helpers, + javax.xml.validation, + org.w3c.dom, + javax.xml.transform.sax, + javax.xml.stream, + javax.lang.model, + javax.xml.parsers, + javax.xml.transform.dom, + javax.xml.transform, + javax.xml.xpath, + javax.xml.namespace, + javax.xml.transform.stream, + org.xml.sax, + javax.activation, + javax.xml + + + + + + + + maven-dependency-plugin + + + unpack-sources + generate-sources + + unpack-dependencies + + + org.glassfish.jaxb,com.sun.istack + provided + sources + true + module-info.*,META-INF/versions/**,META-INF/MANIFEST.MF + ${dep.sources} + + + + unpack-sources-mr + generate-sources + + unpack-dependencies + + + org.glassfish.jaxb,com.sun.istack + provided + sources + true + META-INF/versions/9/** + ${dep.sources.mr} + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-resource + generate-resources + + add-resource + + + + + ${dep.sources} + + **/*.java + + + + + + + add-sources + generate-sources + + add-source + + + + ${dep.sources} + + + + + add-mr-resource + prepare-package + + add-resource + + + + + ${dep.sources.mr} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile-mr + + compile + + + + ${dep.sources.mr}/META-INF/versions/9 + + ${project.build.outputDirectory}/META-INF/versions/${upper.java.level} + + + + + + org.apache.felix + maven-bundle-plugin + + + bundle-manifest + prepare-package + + manifest + + + + + !META-INF.*, + * + + + + + + + + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + true + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + false + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + integration-test + + test + + integration-test + + false + + ${jaxb-api.version} + ${project.build.directory}/${project.build.finalName} + + + + + + + + diff --git a/jaxb-ri/bundles/core/src/main/java/module-info.java b/jaxb-ri/bundles/core/src/main/java/module-info.java new file mode 100644 index 000000000..389667a89 --- /dev/null +++ b/jaxb-ri/bundles/core/src/main/java/module-info.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0, which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +module com.sun.xml.bind.core { + requires transitive jakarta.xml.bind; + requires java.compiler; + requires java.logging; + + requires transitive jakarta.activation; + requires transitive java.xml; + + exports com.sun.istack; + exports com.sun.istack.localization; + exports com.sun.istack.logging; + + exports com.sun.xml.bind; + exports com.sun.xml.bind.annotation; + exports com.sun.xml.bind.api; + exports com.sun.xml.bind.api.impl; + exports com.sun.xml.bind.marshaller; + exports com.sun.xml.bind.unmarshaller; + exports com.sun.xml.bind.util; + exports com.sun.xml.bind.v2; + exports com.sun.xml.bind.v2.model.annotation; + exports com.sun.xml.bind.v2.model.core; + exports com.sun.xml.bind.v2.model.impl; + exports com.sun.xml.bind.v2.model.nav; + exports com.sun.xml.bind.v2.model.util; + exports com.sun.xml.bind.v2.runtime; + exports com.sun.xml.bind.v2.runtime.unmarshaller; + exports com.sun.xml.bind.v2.schemagen.episode; + exports com.sun.xml.bind.v2.util; + + exports com.sun.xml.txw2; + exports com.sun.xml.txw2.annotation; + exports com.sun.xml.txw2.output; + + opens com.sun.xml.bind.v2.model.nav to + com.sun.xml.bind, + com.sun.tools.xjc, + com.sun.xml.ws.rt, + com.sun.xml.ws, + com.sun.tools.ws; + +// uses jakarta.xml.bind.JAXBContextFactory with com.sun.xml.bind.v2.JAXBContextFactory; +} diff --git a/jaxb-ri/bundles/core/src/test/java/jaxb/core/test/OSGiBundleVersionTest.java b/jaxb-ri/bundles/core/src/test/java/jaxb/core/test/OSGiBundleVersionTest.java new file mode 100644 index 000000000..d04a4f5dd --- /dev/null +++ b/jaxb-ri/bundles/core/src/test/java/jaxb/core/test/OSGiBundleVersionTest.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0, which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package jaxb.core.test; + +import junit.framework.TestCase; + +import java.io.File; +import java.io.IOException; +import java.util.jar.JarFile; +import java.util.jar.Manifest; + +/** + * Tests if MANIFEST Bundle-Version has correct version format. + * + * @author Martin Vojtek + */ +public class OSGiBundleVersionTest extends TestCase { + + public OSGiBundleVersionTest(String name) { + super(name); + } + + public void testJaxbOsgiBundleVersion() throws IOException { + String osgiJar = System.getProperty("osgi.dist"); + assertNotNull("osgi.dist not set", osgiJar); + checkVersion(new File(osgiJar + ".jar")); + } + + private void checkVersion(File f) throws IOException { + System.out.println("Checking: " + f.getAbsolutePath()); + Manifest mf = new JarFile(f).getManifest(); + String version = mf.getMainAttributes().getValue("Bundle-Version"); + assertNotNull(version); + String[] v = version.split("\\."); + assertTrue("only or is allowed but was: <" + version + ">", v.length <= 4); + for (int i = 0; i < (4 == v.length ? v.length - 1 : v.length); i++) { + try { + Integer.parseInt(v[i]); + } catch (Throwable t) { + fail("'" + v[i] + "' is not a number"); + } + } + } + +} diff --git a/jaxb-ri/bundles/jxc/pom.xml b/jaxb-ri/bundles/jxc/pom.xml index 9019e3c24..fb67902a6 100644 --- a/jaxb-ri/bundles/jxc/pom.xml +++ b/jaxb-ri/bundles/jxc/pom.xml @@ -263,7 +263,7 @@ ${project.build.outputDirectory}/META-INF/MANIFEST.MF - jaxb-impl.jar jaxb-xjc.jar + jaxb-core.jar jaxb-impl.jar jaxb-xjc.jar true diff --git a/jaxb-ri/bundles/osgi/osgi/pom.xml b/jaxb-ri/bundles/osgi/osgi/pom.xml index d30136d00..96149d83a 100644 --- a/jaxb-ri/bundles/osgi/osgi/pom.xml +++ b/jaxb-ri/bundles/osgi/osgi/pom.xml @@ -40,6 +40,11 @@ provided + + org.glassfish.jaxb + jaxb-core + provided + org.glassfish.jaxb jaxb-runtime diff --git a/jaxb-ri/bundles/osgi/osgi/src/main/java/module-info.java b/jaxb-ri/bundles/osgi/osgi/src/main/java/module-info.java index 5fd1388a8..9ce9e2d78 100644 --- a/jaxb-ri/bundles/osgi/osgi/src/main/java/module-info.java +++ b/jaxb-ri/bundles/osgi/osgi/src/main/java/module-info.java @@ -8,6 +8,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ +import org.glassfish.jaxb.runtime.v2.JAXBContextFactory; + module com.sun.xml.bind.osgi { requires transitive jakarta.xml.bind; @@ -34,15 +36,27 @@ exports com.sun.xml.bind.v2.model.core; exports com.sun.xml.bind.v2.model.impl; exports com.sun.xml.bind.v2.model.nav; - exports com.sun.xml.bind.v2.model.runtime; exports com.sun.xml.bind.v2.model.util; exports com.sun.xml.bind.v2.runtime; exports com.sun.xml.bind.v2.runtime.unmarshaller; - exports com.sun.xml.bind.v2.schemagen; exports com.sun.xml.bind.v2.schemagen.episode; - exports com.sun.xml.bind.v2.schemagen.xmlschema; exports com.sun.xml.bind.v2.util; + exports org.glassfish.jaxb.runtime; + exports org.glassfish.jaxb.runtime.api; + exports org.glassfish.jaxb.runtime.marshaller; + exports org.glassfish.jaxb.runtime.unmarshaller; + exports org.glassfish.jaxb.runtime.util; + exports org.glassfish.jaxb.runtime.v2; + exports org.glassfish.jaxb.runtime.v2.model.annotation; + exports org.glassfish.jaxb.runtime.v2.model.impl; + exports org.glassfish.jaxb.runtime.v2.model.runtime; + exports org.glassfish.jaxb.runtime.v2.runtime; + exports org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; + exports org.glassfish.jaxb.runtime.v2.schemagen; + exports org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; + exports org.glassfish.jaxb.runtime.v2.util; + exports com.sun.tools.xjc; exports com.sun.tools.xjc.reader; exports com.sun.tools.xjc.reader.internalizer; @@ -116,7 +130,7 @@ uses jakarta.xml.bind.JAXBContextFactory; uses com.sun.tools.xjc.Plugin; - provides jakarta.xml.bind.JAXBContextFactory with com.sun.xml.bind.v2.JAXBContextFactory; + provides jakarta.xml.bind.JAXBContextFactory with JAXBContextFactory; provides com.sun.tools.xjc.Plugin with com.sun.tools.xjc.addon.accessors.PluginImpl, com.sun.tools.xjc.addon.at_generated.PluginImpl, diff --git a/jaxb-ri/bundles/pom.xml b/jaxb-ri/bundles/pom.xml index ba9337634..4af70660f 100644 --- a/jaxb-ri/bundles/pom.xml +++ b/jaxb-ri/bundles/pom.xml @@ -33,6 +33,7 @@ + core runtime xjc jxc diff --git a/jaxb-ri/bundles/ri/pom.xml b/jaxb-ri/bundles/ri/pom.xml index b4950d393..3ae36a418 100644 --- a/jaxb-ri/bundles/ri/pom.xml +++ b/jaxb-ri/bundles/ri/pom.xml @@ -34,6 +34,10 @@ jakarta.xml.bind jakarta.xml.bind-api + + com.sun.xml.bind + jaxb-core + com.sun.xml.bind jaxb-impl diff --git a/jaxb-ri/bundles/ri/src/main/assembly/assembly.xml b/jaxb-ri/bundles/ri/src/main/assembly/assembly.xml index 1d95b1ce2..bacc93c4d 100644 --- a/jaxb-ri/bundles/ri/src/main/assembly/assembly.xml +++ b/jaxb-ri/bundles/ri/src/main/assembly/assembly.xml @@ -1,7 +1,7 @@ + + + + + + + + + diff --git a/jaxb-ri/core/pom.xml b/jaxb-ri/core/pom.xml new file mode 100644 index 000000000..e5686a2f5 --- /dev/null +++ b/jaxb-ri/core/pom.xml @@ -0,0 +1,56 @@ + + + + + 4.0.0 + + + com.sun.xml.bind.mvn + jaxb-parent + 3.0.0-SNAPSHOT + ../pom.xml + + + org.glassfish.jaxb + jaxb-core + + jar + JAXB Core + JAXB Core module. Contains sources required by XJC, JXC and Runtime modules. + + + ${project.basedir}/exclude-core.xml + + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + jakarta.activation + jakarta.activation-api + provided + + + ${project.groupId} + txw2 + + + com.sun.istack + istack-commons-runtime + + + + diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/Locatable.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/Locatable.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/Locatable.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/Locatable.java index 5a5eed166..8d49342a7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/Locatable.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/Locatable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/Utils.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/Utils.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/Utils.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/Utils.java index b945abb2f..c05afbe6e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/Utils.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/WhiteSpaceProcessor.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/WhiteSpaceProcessor.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/WhiteSpaceProcessor.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/WhiteSpaceProcessor.java index cbc22b251..d9decd6b5 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/WhiteSpaceProcessor.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/WhiteSpaceProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/annotation/OverrideAnnotationOf.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/annotation/OverrideAnnotationOf.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/annotation/OverrideAnnotationOf.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/annotation/OverrideAnnotationOf.java index 7e185a7aa..0905b7921 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/annotation/OverrideAnnotationOf.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/annotation/OverrideAnnotationOf.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/annotation/XmlIsSet.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/annotation/XmlIsSet.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/annotation/XmlIsSet.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/annotation/XmlIsSet.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/annotation/XmlLocation.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/annotation/XmlLocation.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/annotation/XmlLocation.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/annotation/XmlLocation.java index 2402b31fa..45709ef6b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/annotation/XmlLocation.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/annotation/XmlLocation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ErrorListener.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/api/ErrorListener.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ErrorListener.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/api/ErrorListener.java index b7dbf7348..5dd17517d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ErrorListener.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/api/ErrorListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/impl/NameConverter.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/api/impl/NameConverter.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/impl/NameConverter.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/api/impl/NameConverter.java index d50385045..22cadf707 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/impl/NameConverter.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/api/impl/NameConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/impl/NameUtil.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/api/impl/NameUtil.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/impl/NameUtil.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/api/impl/NameUtil.java index d8828c9cc..18f4db91f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/impl/NameUtil.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/api/impl/NameUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/CharacterEscapeHandler.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/CharacterEscapeHandler.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/CharacterEscapeHandler.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/CharacterEscapeHandler.java index 19a02bb25..17522d7c7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/CharacterEscapeHandler.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/CharacterEscapeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/DataWriter.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/DataWriter.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/DataWriter.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/DataWriter.java index 990a195e2..d4e7c8100 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/DataWriter.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/DataWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/DumbEscapeHandler.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/DumbEscapeHandler.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/DumbEscapeHandler.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/DumbEscapeHandler.java index 82dae523f..cfd891bf1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/DumbEscapeHandler.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/DumbEscapeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/Messages.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/Messages.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/Messages.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/Messages.java index bb1e49aba..b0b3ea395 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/Messages.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/MinimumEscapeHandler.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/MinimumEscapeHandler.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/MinimumEscapeHandler.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/MinimumEscapeHandler.java index 19723a1dc..e295cd89d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/MinimumEscapeHandler.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/MinimumEscapeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/NoEscapeHandler.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/NoEscapeHandler.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/NoEscapeHandler.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/NoEscapeHandler.java index edd14d9f7..8acbae7f7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/NoEscapeHandler.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/NoEscapeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java index a7e0dd025..6b9e25915 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/XMLWriter.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/XMLWriter.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/XMLWriter.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/XMLWriter.java index 14e5cb1aa..3e89406ce 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/XMLWriter.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/marshaller/XMLWriter.java @@ -1,3 +1,12 @@ +/* + * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0, which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ // @@3RD PARTY CODE@@ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/DOMScanner.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/unmarshaller/DOMScanner.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/DOMScanner.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/unmarshaller/DOMScanner.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/InfosetScanner.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/unmarshaller/InfosetScanner.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/InfosetScanner.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/unmarshaller/InfosetScanner.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/SecureLoader.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/util/SecureLoader.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/SecureLoader.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/util/SecureLoader.java index ad98202e9..ee8aa44bd 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/SecureLoader.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/util/SecureLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/Which.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/util/Which.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/Which.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/util/Which.java index 491450f10..32f080740 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/Which.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/util/Which.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ClassFactory.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/ClassFactory.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ClassFactory.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/ClassFactory.java index 13f3eb612..72c5ac639 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ClassFactory.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/ClassFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/Messages.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/Messages.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/Messages.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/Messages.java index 9528ec54e..3bc456ffc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/Messages.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/TODO.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/TODO.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/TODO.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/TODO.java index f8c34d496..68a5b6e36 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/TODO.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/TODO.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/WellKnownNamespace.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/WellKnownNamespace.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/WellKnownNamespace.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/WellKnownNamespace.java index 8b5d63426..8aa47ab88 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/WellKnownNamespace.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/WellKnownNamespace.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java index cb097aea7..89f6182a7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationSource.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationSource.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationSource.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationSource.java index 3cdd9a3b6..5a34e4517 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationSource.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Locatable.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/annotation/Locatable.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Locatable.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/annotation/Locatable.java index da9f21f41..2afe84878 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Locatable.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/annotation/Locatable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/Adapter.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/Adapter.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/Adapter.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/Adapter.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java index 3f801403f..f131a3d29 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/AttributePropertyInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/AttributePropertyInfo.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/AttributePropertyInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/AttributePropertyInfo.java index 42cf7c597..4b5ba1e9a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/AttributePropertyInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/AttributePropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java index 2a814e9f5..59cfe5d1c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ClassInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ClassInfo.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ClassInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ClassInfo.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/Element.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/Element.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/Element.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/Element.java index ace69f023..e43f60318 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/Element.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/Element.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ElementInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ElementInfo.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ElementInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ElementInfo.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ElementPropertyInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ElementPropertyInfo.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ElementPropertyInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ElementPropertyInfo.java index 0a9a9c570..499877d2b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ElementPropertyInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ElementPropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/EnumConstant.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/EnumConstant.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/EnumConstant.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/EnumConstant.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/EnumLeafInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/EnumLeafInfo.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/EnumLeafInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/EnumLeafInfo.java index cd623e7bc..b45bfd06e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/EnumLeafInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/EnumLeafInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ErrorHandler.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ErrorHandler.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ErrorHandler.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ErrorHandler.java index 5a77c3e03..91878832f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ErrorHandler.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ErrorHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ID.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ID.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ID.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ID.java index 0f79a590e..fad94a8d1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ID.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ID.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/LeafInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/LeafInfo.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/LeafInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/LeafInfo.java index 5d9501ef4..98650167a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/LeafInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/LeafInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/MapPropertyInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/MapPropertyInfo.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/MapPropertyInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/MapPropertyInfo.java index 64d5a269d..e3e49952d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/MapPropertyInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/MapPropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/MaybeElement.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/MaybeElement.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/MaybeElement.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/MaybeElement.java index 24c6a6cb5..b37a9f70f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/MaybeElement.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/MaybeElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/NonElement.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/NonElement.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/NonElement.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/NonElement.java index 3aa4e8a9e..a8ce2f243 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/NonElement.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/NonElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/NonElementRef.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/NonElementRef.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/NonElementRef.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/NonElementRef.java index 827abd8d6..9811a529a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/NonElementRef.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/NonElementRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/PropertyKind.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyKind.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/PropertyKind.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyKind.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/Ref.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/Ref.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/Ref.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/Ref.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ReferencePropertyInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ReferencePropertyInfo.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ReferencePropertyInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ReferencePropertyInfo.java index 0cadd1f71..25c1538fc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ReferencePropertyInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ReferencePropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/RegistryInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/RegistryInfo.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/RegistryInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/RegistryInfo.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfo.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfo.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfoSet.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfoSet.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfoSet.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/TypeInfoSet.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/TypeRef.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/TypeRef.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/TypeRef.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/TypeRef.java index b3447fcd7..bd83653bf 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/TypeRef.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/TypeRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ValuePropertyInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ValuePropertyInfo.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ValuePropertyInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ValuePropertyInfo.java index 6861ce9e8..134e80720 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/ValuePropertyInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ValuePropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/WildcardMode.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/WildcardMode.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/WildcardMode.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/WildcardMode.java index 184d3199b..fcbdc36fb 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/WildcardMode.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/WildcardMode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/WildcardTypeInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/WildcardTypeInfo.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/WildcardTypeInfo.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/WildcardTypeInfo.java index 2590c17d5..cd9ac17cb 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/WildcardTypeInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/WildcardTypeInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/package-info.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/package-info.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/package-info.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/package-info.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilderI.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilderI.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilderI.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilderI.java index 79d431596..e3e22565d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilderI.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilderI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/GenericArrayTypeImpl.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/GenericArrayTypeImpl.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/GenericArrayTypeImpl.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/GenericArrayTypeImpl.java index f6941b2b2..64d30e1c8 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/GenericArrayTypeImpl.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/GenericArrayTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/Navigator.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/Navigator.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/Navigator.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/Navigator.java index 651a28d5e..9d401d096 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/Navigator.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/Navigator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/ParameterizedTypeImpl.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/ParameterizedTypeImpl.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/ParameterizedTypeImpl.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/ParameterizedTypeImpl.java index 11baca016..33288a36e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/ParameterizedTypeImpl.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/ParameterizedTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/ReflectionNavigator.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/ReflectionNavigator.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/ReflectionNavigator.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/ReflectionNavigator.java index fa0b24350..62bded84f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/ReflectionNavigator.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/ReflectionNavigator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/SecureLoader.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/SecureLoader.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/SecureLoader.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/SecureLoader.java index e442a3e20..59bdabb47 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/SecureLoader.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/SecureLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/TypeVisitor.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/TypeVisitor.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/TypeVisitor.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/TypeVisitor.java index 00ba8af6a..a73f53908 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/TypeVisitor.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/TypeVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/WildcardTypeImpl.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/WildcardTypeImpl.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/WildcardTypeImpl.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/WildcardTypeImpl.java index d68e3347d..84b3ea247 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/WildcardTypeImpl.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/WildcardTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/package-info.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/package-info.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/package-info.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/package-info.java index d4f21cfdb..156f4f1b4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/nav/package-info.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/nav/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/util/ArrayInfoUtil.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/util/ArrayInfoUtil.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/util/ArrayInfoUtil.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/util/ArrayInfoUtil.java index 77caa3e2d..2c81015f7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/util/ArrayInfoUtil.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/util/ArrayInfoUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/IllegalAnnotationException.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/IllegalAnnotationException.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/IllegalAnnotationException.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/IllegalAnnotationException.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Location.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/Location.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Location.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/Location.java index b3b9e348d..f4a7be333 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Location.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/Location.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/RuntimeUtil.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/RuntimeUtil.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/RuntimeUtil.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/RuntimeUtil.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/SwaRefAdapterMarker.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/SwaRefAdapterMarker.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/SwaRefAdapterMarker.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/SwaRefAdapterMarker.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LocatorEx.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LocatorEx.java similarity index 100% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LocatorEx.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LocatorEx.java diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Bindings.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Bindings.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Bindings.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Bindings.java index a6ab23368..62e3fd1db 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Bindings.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Bindings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Klass.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Klass.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Klass.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Klass.java index 333fdefcc..767aa2eb6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Klass.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Klass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Package.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Package.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Package.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Package.java index 6e5eb030c..2f2adaca0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Package.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/Package.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/SchemaBindings.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/SchemaBindings.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/SchemaBindings.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/SchemaBindings.java index 9f614945b..a671ff258 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/SchemaBindings.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/SchemaBindings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/package-info.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/package-info.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/package-info.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/package-info.java index 26065d830..3281c0252 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/episode/package-info.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/schemagen/episode/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/EditDistance.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/util/EditDistance.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/EditDistance.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/util/EditDistance.java index a98f899cf..c0559a957 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/EditDistance.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/util/EditDistance.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/FlattenIterator.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/util/FlattenIterator.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/FlattenIterator.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/util/FlattenIterator.java index 01b5b471f..6bed650d9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/FlattenIterator.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/util/FlattenIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/XmlFactory.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/util/XmlFactory.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/XmlFactory.java rename to jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/util/XmlFactory.java index 6c645af03..47d78baca 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/XmlFactory.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/util/XmlFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at diff --git a/jaxb-ri/core/src/main/java/module-info.java b/jaxb-ri/core/src/main/java/module-info.java new file mode 100644 index 000000000..82596e657 --- /dev/null +++ b/jaxb-ri/core/src/main/java/module-info.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0, which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * The XML Binding implementation. + * + * @uses jakarta.xml.bind.JAXBContextFactory + * + */ +module org.glassfish.jaxb.core { + requires transitive jakarta.xml.bind; + requires java.compiler; + requires java.desktop; + requires java.logging; + + requires transitive jakarta.activation; + requires transitive java.xml; + + requires transitive com.sun.xml.txw2; + requires transitive com.sun.istack.runtime; + + exports com.sun.xml.bind; + exports com.sun.xml.bind.annotation; + exports com.sun.xml.bind.api; + exports com.sun.xml.bind.api.impl; + exports com.sun.xml.bind.marshaller; + exports com.sun.xml.bind.unmarshaller; + exports com.sun.xml.bind.util; + exports com.sun.xml.bind.v2; + exports com.sun.xml.bind.v2.model.annotation; + exports com.sun.xml.bind.v2.model.core; + exports com.sun.xml.bind.v2.model.impl; + exports com.sun.xml.bind.v2.model.nav; + exports com.sun.xml.bind.v2.model.util; + exports com.sun.xml.bind.v2.runtime; + exports com.sun.xml.bind.v2.runtime.unmarshaller; + exports com.sun.xml.bind.v2.schemagen.episode; + exports com.sun.xml.bind.v2.util; + + opens com.sun.xml.bind.v2.model.nav to + org.glassfish.jaxb.runtime, + org.glassfish.jaxb.xjc; + + uses jakarta.xml.bind.JAXBContextFactory; + +} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages.properties similarity index 95% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages.properties index d6c382109..02b559020 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_de.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_de.properties similarity index 95% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_de.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_de.properties index 2399a164a..735456bd7 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_de.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_es.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_es.properties similarity index 95% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_es.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_es.properties index d16f8a4c8..4a7b005e8 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_es.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_fr.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_fr.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_fr.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_fr.properties index c7f7498fb..a152daaf7 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_fr.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_it.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_it.properties similarity index 95% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_it.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_it.properties index 569852803..ddbadb8c3 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_it.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_ja.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_ja.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_ja.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_ja.properties index a55c275ba..18f2dc0e1 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_ja.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_ko.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_ko.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_ko.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_ko.properties index 8127a43b2..b7a231c52 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_ko.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_pt_BR.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_pt_BR.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_pt_BR.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_pt_BR.properties index 598b2930c..424442798 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_pt_BR.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_CN.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_CN.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_CN.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_CN.properties index b42bf286a..2943530b7 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_CN.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_TW.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_TW.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_TW.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_TW.properties index 2430425b4..b74990b83 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_TW.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/marshaller/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages.properties index 278fc679a..8529d7ebd 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = \ illegal entry: "{0}", entries should be of the form "ClassName" or "OuterClass.InnerClass", not "ClassName.class" or "fully.qualified.ClassName" diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_de.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_de.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_de.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_de.properties index 73b380f29..22ecd0444 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_de.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = ung\u00FCltiger Eintrag: "{0}", Eintr\u00E4ge m\u00FCssen folgende Form aufweisen "ClassName" oder "OuterClass.InnerClass", nicht "ClassName.class" oder "fully.qualified.ClassName" diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_es.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_es.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_es.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_es.properties index d0cd4c2f5..a759b2a83 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_es.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = Entrada no v\u00E1lida: "{0}"; las entradas deben tener el formato "ClassName" o "OuterClass.InnerClass", no "ClassName.class" ni "fully.qualified.ClassName". diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_fr.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_fr.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_fr.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_fr.properties index 56bcd7fe8..1fbb862eb 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_fr.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = entr\u00E9e "{0}" interdite, les entr\u00E9es doivent \u00EAtre au format "ClassName" ou "OuterClass.InnerClass", et non"ClassName.class" ou "fully.qualified.ClassName" diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_it.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_it.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_it.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_it.properties index 52b868f00..6934fc254 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_it.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = voce non valida: "{0}". Le voci devono avere il formato "ClassName" o "OuterClass.InnerClass", non "ClassName.class" o "fully.qualified.ClassName" diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_ja.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_ja.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_ja.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_ja.properties index 492cffd69..83255c7fd 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_ja.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = \u4E0D\u6B63\u306A\u30A8\u30F3\u30C8\u30EA: "{0}"\u3002\u30A8\u30F3\u30C8\u30EA\u306F\u3001"ClassName.class"\u307E\u305F\u306F"fully.qualified.ClassName"\u3067\u306F\u306A\u304F\u3001"ClassName"\u307E\u305F\u306F"OuterClass.InnerClass"\u306E\u5F62\u5F0F\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_ko.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_ko.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_ko.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_ko.properties index da56d8e96..82b266c1e 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_ko.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = \uC798\uBABB\uB41C \uD56D\uBAA9: "{0}". \uD56D\uBAA9\uC740 "ClassName.class" \uB610\uB294 "fully.qualified.ClassName" \uD615\uC2DD\uC774 \uC544\uB2CC "ClassName" \uB610\uB294 "OuterClass.InnerClass" \uD615\uC2DD\uC774\uC5B4\uC57C \uD569\uB2C8\uB2E4. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_pt_BR.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_pt_BR.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_pt_BR.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_pt_BR.properties index 122a50b1d..b994feb84 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_pt_BR.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = entrada inv\u00E1lida: "{0}"; as entradas devem estar no formato "ClassName" ou "OuterClass.InnerClass", n\u00E3o no formato "ClassName.class" ou "fully.qualified.ClassName" diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_zh_CN.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_zh_CN.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_zh_CN.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_zh_CN.properties index e94d07ee4..7df807ea1 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_zh_CN.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = \u975E\u6CD5\u6761\u76EE: "{0}", \u6761\u76EE\u7684\u683C\u5F0F\u5E94\u4E3A "ClassName" \u6216 "OuterClass.InnerClass", \u800C\u4E0D\u662F "ClassName.class" \u6216 "fully.qualified.ClassName" diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_zh_TW.properties b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_zh_TW.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_zh_TW.properties rename to jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_zh_TW.properties index 1dcdb388e..9abc1c7bd 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/Messages_zh_TW.properties +++ b/jaxb-ri/core/src/main/resources/com/sun/xml/bind/v2/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not concatenated with any other string (written on a separate line). ILLEGAL_ENTRY = \u7121\u6548\u7684\u9805\u76EE: "{0}", \u9805\u76EE\u7684\u683C\u5F0F\u61C9\u70BA "ClassName" \u6216 "OuterClass.InnerClass", \u800C\u975E "ClassName.class" \u6216 "fully.qualified.ClassName" diff --git a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-runtime-properties.xml b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-runtime-properties.xml index d9e7336a8..7a0886fda 100644 --- a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-runtime-properties.xml +++ b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-ri-extensions-runtime-properties.xml @@ -559,7 +559,7 @@ public abstract class NamespacePrefixMapper { Property name: - com.sun.xml.bind.XmlAccessorFactory + XmlAccessorFactory @@ -587,7 +587,7 @@ public abstract class NamespacePrefixMapper { In JAXB 2.1, set the property to enable: - + diff --git a/jaxb-ri/docs/release-documentation/src/docbook/users-guide-annotating-your-classes-mapping-interfaces.xml b/jaxb-ri/docs/release-documentation/src/docbook/users-guide-annotating-your-classes-mapping-interfaces.xml index 190d84290..144cbbdc9 100644 --- a/jaxb-ri/docs/release-documentation/src/docbook/users-guide-annotating-your-classes-mapping-interfaces.xml +++ b/jaxb-ri/docs/release-documentation/src/docbook/users-guide-annotating-your-classes-mapping-interfaces.xml @@ -1,7 +1,7 @@ - - - - - + + + + + - + - + diff --git a/jaxb-ri/runtime/impl/pom.xml b/jaxb-ri/runtime/impl/pom.xml index 3f8bdcc1f..585bb442a 100644 --- a/jaxb-ri/runtime/impl/pom.xml +++ b/jaxb-ri/runtime/impl/pom.xml @@ -32,12 +32,12 @@ ${project.basedir}/exclude-runtime.xml - --add-opens org.glassfish.jaxb.runtime/com.sun.xml.bind.v2=java.xml.bind - --add-opens org.glassfish.jaxb.runtime/com.sun.xml.bind.v2.schemagen=java.xml.bind - --add-opens org.glassfish.jaxb.runtime/com.sun.xml.bind.v2.schemagen.xmlidref=java.xml.bind + --add-opens org.glassfish.jaxb.runtime/org.glassfish.jaxb.runtime.v2=org.glassfish.jaxb.core + --add-opens org.glassfish.jaxb.runtime/org.glassfish.jaxb.runtime.v2.schemagen=org.glassfish.jaxb.core + --add-opens org.glassfish.jaxb.runtime/org.glassfish.jaxb.runtime.v2.schemagen.xmlidref=java.xml.bind --add-opens java.base/java.lang=org.glassfish.jaxb.runtime --add-opens java.base/java.lang.reflect=org.glassfish.jaxb.runtime - --add-opens org.glassfish.jaxb.runtime/com.sun.xml.bind.v2.runtime.reflect.opt=java.xml.bind + --add-opens org.glassfish.jaxb.runtime/org.glassfish.jaxb.runtime.v2.runtime.reflect.opt=org.glassfish.jaxb.core @@ -54,11 +54,7 @@ ${project.groupId} - txw2 - - - com.sun.istack - istack-commons-runtime + jaxb-core @@ -178,6 +174,7 @@ + false java.util.logging.config.file @@ -185,10 +182,10 @@ - --add-opens java.base/java.lang=com.sun.xml.bind - --add-opens org.glassfish.jaxb.runtime/com.sun.xml.bind.v2=jakarta.xml.bind - --add-opens org.glassfish.jaxb.runtime/com.sun.xml.bind.v2.schemagen=jakarta.xml.bind - --add-opens org.glassfish.jaxb.runtime/com.sun.xml.bind.v2.schemagen.xmlidref=jakarta.xml.bind + --add-opens java.base/java.lang=org.glassfish.runtime + --add-opens org.glassfish.jaxb.runtime/org.glassfish.jaxb.runtime.v2=jakarta.xml.bind + --add-opens org.glassfish.jaxb.runtime/org.glassfish.jaxb.runtime.v2.schemagen=jakarta.xml.bind + --add-opens org.glassfish.jaxb.runtime/org.glassfish.jaxb.runtime.v2.schemagen.xmlidref=jakarta.xml.bind **/*TestMultiRelease.java diff --git a/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/MUtils.java b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/MUtils.java new file mode 100644 index 000000000..3822658e0 --- /dev/null +++ b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/MUtils.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0, which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.glassfish.jaxb.runtime.v2; + +import java.util.logging.Level; +import java.util.logging.Logger; + +import jakarta.xml.bind.JAXBException; + +final class MUtils { + + private static final Logger logger = Logger.getLogger("org.glassfish.jaxb.runtime"); + + /** + * Api may be defined in a different module, in such case we need to delegate + * {@linkplain Module#isOpen open} of classes to that module. + * + * @param classes used to resolve module for {@linkplain Module#addOpens(String, Module)} + * @param factorySPI used to resolve {@link Module} of the implementation. + * + * @throws JAXBException if any of a classes package is not open to our module. + */ + static void open(Class[] classes) throws JAXBException { + final Module coreModule = com.sun.xml.bind.v2.ClassFactory.class.getModule(); + final Module rtModule = JAXBContextFactory.class.getModule(); + + if (rtModule == coreModule) { + return; + } + + for (Class cls : classes) { + Class jaxbClass = cls.isArray() ? + cls.getComponentType() : cls; + + final Module classModule = jaxbClass.getModule(); + //no need for unnamed and java.base types + if (!classModule.isNamed() || "java.base".equals(classModule.getName())) { + continue; + } + final String packageName = jaxbClass.getPackageName(); + + if (classModule.isOpen(packageName, rtModule)) { + classModule.addOpens(packageName, coreModule); + if (logger.isLoggable(Level.FINE)) { + logger.log(Level.FINE, "Openning package {0} in {1} to {2}.", + new String[]{ packageName, classModule.getName(), coreModule.getName() }); + } + } else { + //report error if they are not open to api or our module + throw new JAXBException(java.text.MessageFormat.format("Package {0} with class {1} defined in a module {2} must be open to at least {3} module.", + packageName, jaxbClass.getName(), classModule.getName(), rtModule.getName())); + } + } + } + +} diff --git a/jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/AccessorInjector.java b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/AccessorInjector.java similarity index 68% rename from jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/AccessorInjector.java rename to jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/AccessorInjector.java index 7e15a18fc..03615f4f4 100644 --- a/jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/AccessorInjector.java +++ b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/AccessorInjector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,14 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; - -import java.io.InputStream; -import java.util.logging.Level; -import java.util.logging.Logger; - -import com.sun.xml.bind.Utils; -import com.sun.xml.bind.v2.bytecode.ClassTailor; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; /** * Stub version of {@link AccessorInjector} for java versions >= 9 diff --git a/jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/Injector.java b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Injector.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/Injector.java rename to jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Injector.java index 9ac324e31..d7fcaed00 100644 --- a/jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/Injector.java +++ b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Injector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; /** * Stub version of {@link Injector} for java versions >= 9 diff --git a/jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedAccessorFactory.java similarity index 65% rename from jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java rename to jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedAccessorFactory.java index a389e2f19..84b42133e 100644 --- a/jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedAccessorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,26 +8,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; import java.util.logging.Logger; import java.lang.reflect.Method; import java.lang.reflect.Field; -import java.util.logging.Logger; - /** - * Stub version of {@link OptimizedAccessorFactory} for java versions >= 9 + * Stub version of {@link org.glassfish.jaxb.runtime.v2.runtime.reflect.opt.OptimizedAccessorFactory} for java versions >= 9 * * @author Daniel Kec */ public abstract class OptimizedAccessorFactory { private OptimizedAccessorFactory() {} // no instantiation please - private static final Logger logger = Logger.getLogger(OptimizedAccessorFactory.class.getName()); + private static final Logger logger = Logger.getLogger(org.glassfish.jaxb.runtime.v2.runtime.reflect.opt.OptimizedAccessorFactory.class.getName()); public static Accessor get(Method param1, Method param2) { diff --git a/jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java similarity index 53% rename from jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java rename to jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java index 88696b1ef..dabb5f766 100644 --- a/jaxb-ri/runtime/impl/src/main/java-mr/9/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java-mr/9/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,22 +8,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; import java.util.logging.Logger; /** - * Stub version of {@link OptimizedTransducedAccessorFactory} for java versions >= 9 + * Stub version of {@link org.glassfish.jaxb.runtime.v2.runtime.reflect.opt.OptimizedTransducedAccessorFactory} for java versions >= 9 * * @author Daniel Kec */ public abstract class OptimizedTransducedAccessorFactory { private OptimizedTransducedAccessorFactory() {} // no instantiation please - private static final Logger logger = Logger.getLogger(OptimizedTransducedAccessorFactory.class.getName()); + private static final Logger logger = Logger.getLogger(org.glassfish.jaxb.runtime.v2.runtime.reflect.opt.OptimizedTransducedAccessorFactory.class.getName()); public static final TransducedAccessor get(RuntimePropertyInfo prop) { logger.finer("Optimization is not available since java 9"); diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Utils.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Utils.java deleted file mode 100644 index 61525861d..000000000 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Utils.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0, which is available at - * http://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package com.sun.xml.bind.v2.runtime.reflect; - -import com.sun.xml.bind.v2.model.nav.Navigator; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * Utils class. - * - * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages. - * - * Has *package private* access to avoid inappropriate usage. - */ -final class Utils { - - private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); - - /** - * static ReflectionNavigator field to avoid usage of reflection every time we use it. - */ - static final Navigator REFLECTION_NAVIGATOR; - - static { // we statically initializing REFLECTION_NAVIGATOR property - try { - final Class refNav = Class.forName("com.sun.xml.bind.v2.model.nav.ReflectionNavigator"); - - // requires accessClassInPackage privilege - final Method getInstance = AccessController.doPrivileged( - new PrivilegedAction() { - @Override - public Method run() { - try { - Method getInstance = refNav.getDeclaredMethod("getInstance"); - getInstance.setAccessible(true); - return getInstance; - } catch (NoSuchMethodException e) { - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); - } - } - } - ); - - //noinspection unchecked - REFLECTION_NAVIGATOR = (Navigator) getInstance.invoke(null); - } catch (ClassNotFoundException e) { - throw new IllegalStateException("Can't find ReflectionNavigator class"); - } catch (InvocationTargetException e) { - throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (IllegalAccessException e) { - throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); - } catch (SecurityException e) { - LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e); - throw e; - } - } - - /** - * private constructor to avoid util class instantiating - */ - private Utils() { - } -} diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/SecureLoader.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/SecureLoader.java deleted file mode 100644 index 97285d736..000000000 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/SecureLoader.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0, which is available at - * http://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package com.sun.xml.bind.v2.runtime.reflect.opt; - -/** - * Class defined for safe calls of getClassLoader methods of any kind (context/system/class - * classloader. This MUST be package private and defined in every package which - * uses such invocations. - * @author snajper - */ -class SecureLoader { - - static ClassLoader getContextClassLoader() { - if (System.getSecurityManager() == null) { - return Thread.currentThread().getContextClassLoader(); - } else { - return (ClassLoader) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public java.lang.Object run() { - return Thread.currentThread().getContextClassLoader(); - } - }); - } - } - - static ClassLoader getClassClassLoader(final Class c) { - if (System.getSecurityManager() == null) { - return c.getClassLoader(); - } else { - return (ClassLoader) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public java.lang.Object run() { - return c.getClassLoader(); - } - }); - } - } - - static ClassLoader getSystemClassLoader() { - if (System.getSecurityManager() == null) { - return ClassLoader.getSystemClassLoader(); - } else { - return (ClassLoader) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public java.lang.Object run() { - return ClassLoader.getSystemClassLoader(); - } - }); - } - } - -} diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/SecureLoader.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/SecureLoader.java deleted file mode 100644 index b29cb6d20..000000000 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/SecureLoader.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0, which is available at - * http://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package com.sun.xml.bind.v2.runtime.unmarshaller; - -/** - * Class defined for safe calls of getClassLoader methods of any kind (context/system/class - * classloader. This MUST be package private and defined in every package which - * uses such invocations. - * @author snajper - */ -class SecureLoader { - - static ClassLoader getContextClassLoader() { - if (System.getSecurityManager() == null) { - return Thread.currentThread().getContextClassLoader(); - } else { - return (ClassLoader) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public java.lang.Object run() { - return Thread.currentThread().getContextClassLoader(); - } - }); - } - } - - static ClassLoader getClassClassLoader(final Class c) { - if (System.getSecurityManager() == null) { - return c.getClassLoader(); - } else { - return (ClassLoader) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public java.lang.Object run() { - return c.getClassLoader(); - } - }); - } - } - - static ClassLoader getSystemClassLoader() { - if (System.getSecurityManager() == null) { - return ClassLoader.getSystemClassLoader(); - } else { - return (ClassLoader) java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { - public java.lang.Object run() { - return ClassLoader.getSystemClassLoader(); - } - }); - } - } - -} diff --git a/jaxb-ri/runtime/impl/src/main/java/module-info.java b/jaxb-ri/runtime/impl/src/main/java/module-info.java index 65abf97b2..1efcbc639 100644 --- a/jaxb-ri/runtime/impl/src/main/java/module-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/module-info.java @@ -23,39 +23,32 @@ requires transitive jakarta.activation; requires transitive java.xml; - requires transitive com.sun.xml.txw2; + requires transitive org.glassfish.jaxb.core; requires static com.sun.xml.fastinfoset; requires static org.jvnet.staxex; - requires transitive com.sun.istack.runtime; - exports com.sun.xml.bind; - exports com.sun.xml.bind.annotation; - exports com.sun.xml.bind.api; - exports com.sun.xml.bind.api.impl; - exports com.sun.xml.bind.marshaller; - exports com.sun.xml.bind.unmarshaller; - exports com.sun.xml.bind.util; - exports com.sun.xml.bind.v2; - exports com.sun.xml.bind.v2.model.annotation; - exports com.sun.xml.bind.v2.model.core; - exports com.sun.xml.bind.v2.model.impl; - exports com.sun.xml.bind.v2.model.nav; - exports com.sun.xml.bind.v2.model.runtime; - exports com.sun.xml.bind.v2.model.util; - exports com.sun.xml.bind.v2.runtime; - exports com.sun.xml.bind.v2.runtime.unmarshaller; - exports com.sun.xml.bind.v2.schemagen; - exports com.sun.xml.bind.v2.schemagen.episode; - exports com.sun.xml.bind.v2.schemagen.xmlschema; - exports com.sun.xml.bind.v2.util; + exports org.glassfish.jaxb.runtime; + exports org.glassfish.jaxb.runtime.api; + exports org.glassfish.jaxb.runtime.marshaller; + exports org.glassfish.jaxb.runtime.unmarshaller; + exports org.glassfish.jaxb.runtime.util; + exports org.glassfish.jaxb.runtime.v2; + exports org.glassfish.jaxb.runtime.v2.model.annotation; + exports org.glassfish.jaxb.runtime.v2.model.impl; + exports org.glassfish.jaxb.runtime.v2.model.runtime; + exports org.glassfish.jaxb.runtime.v2.runtime; + exports org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; + exports org.glassfish.jaxb.runtime.v2.schemagen; + exports org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; + exports org.glassfish.jaxb.runtime.v2.util; - opens com.sun.xml.bind.v2.model.nav to org.glassfish.jaxb.xjc; - opens com.sun.xml.bind.v2.runtime.reflect.opt to jakarta.xml.bind; - opens com.sun.xml.bind.v2.schemagen to jakarta.xml.bind; - opens com.sun.xml.bind.v2.schemagen.xmlschema to jakarta.xml.bind; - opens com.sun.xml.bind.v2 to jakarta.xml.bind; + opens org.glassfish.jaxb.runtime.v2.runtime.reflect.opt to jakarta.xml.bind; + opens org.glassfish.jaxb.runtime.v2.schemagen to jakarta.xml.bind; + opens org.glassfish.jaxb.runtime.v2.schemagen.xmlschema to jakarta.xml.bind; + opens org.glassfish.jaxb.runtime.v2 to jakarta.xml.bind; uses jakarta.xml.bind.JAXBContextFactory; - provides jakarta.xml.bind.JAXBContextFactory with com.sun.xml.bind.v2.JAXBContextFactory; + provides jakarta.xml.bind.JAXBContextFactory + with org.glassfish.jaxb.runtime.v2.JAXBContextFactory; } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/AccessorFactory.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactory.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/AccessorFactory.java index 4db714df2..524052ede 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/AccessorFactory.java @@ -8,14 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; +package org.glassfish.jaxb.runtime; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; import jakarta.xml.bind.JAXBException; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; /** * A means to allow the user to provide customized Accessor diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactoryImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/AccessorFactoryImpl.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactoryImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/AccessorFactoryImpl.java index e6d720405..fe362fbaf 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactoryImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/AccessorFactoryImpl.java @@ -8,15 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; +package org.glassfish.jaxb.runtime; + +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; import java.lang.reflect.Field; import java.lang.reflect.Method; -import jakarta.xml.bind.JAXBException; - -import com.sun.xml.bind.v2.runtime.reflect.Accessor; - public class AccessorFactoryImpl implements InternalAccessorFactory { private static AccessorFactoryImpl instance = new AccessorFactoryImpl(); diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AnyTypeAdapter.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/AnyTypeAdapter.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AnyTypeAdapter.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/AnyTypeAdapter.java index 8975d3da2..2364d0fa9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AnyTypeAdapter.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/AnyTypeAdapter.java @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; +package org.glassfish.jaxb.runtime; import jakarta.xml.bind.annotation.adapters.XmlAdapter; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/CycleRecoverable.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/CycleRecoverable.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/CycleRecoverable.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/CycleRecoverable.java index 055fc2e32..75327464b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/CycleRecoverable.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/CycleRecoverable.java @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; +package org.glassfish.jaxb.runtime; import jakarta.xml.bind.Marshaller; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/DatatypeConverterImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/DatatypeConverterImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java index eb0d828f8..c35530c5f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/DatatypeConverterImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/DatatypeConverterImpl.java @@ -8,27 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Calendar; -import java.util.Collections; -import java.util.GregorianCalendar; -import java.util.Map; -import java.util.TimeZone; -import java.util.WeakHashMap; +package org.glassfish.jaxb.runtime; +import com.sun.xml.bind.WhiteSpaceProcessor; import jakarta.xml.bind.DatatypeConverter; import jakarta.xml.bind.DatatypeConverterInterface; + import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.*; /** * This class is the JAXB RI's default implementation of the diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/IDResolver.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/IDResolver.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/IDResolver.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/IDResolver.java index 3279edb93..1508cc3c4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/IDResolver.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/IDResolver.java @@ -8,16 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; - -import java.util.concurrent.Callable; +package org.glassfish.jaxb.runtime; import jakarta.xml.bind.Unmarshaller; import jakarta.xml.bind.ValidationEventHandler; import jakarta.xml.bind.annotation.XmlIDREF; - import org.xml.sax.SAXException; +import java.util.concurrent.Callable; + /** * Pluggable ID/IDREF handling layer. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/InternalAccessorFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/InternalAccessorFactory.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/InternalAccessorFactory.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/InternalAccessorFactory.java index f7923b78b..33622df37 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/InternalAccessorFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/InternalAccessorFactory.java @@ -8,12 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; +package org.glassfish.jaxb.runtime; -import java.lang.reflect.Field; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; import jakarta.xml.bind.JAXBException; +import java.lang.reflect.Field; + /** * A means to allow the user to provide customized Accessor * to be used by JAXB. Adds ability to suppress warnings. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/Messages.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/Messages.java index 99371195d..e92d9b9e5 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; +package org.glassfish.jaxb.runtime; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/ValidationEventLocatorEx.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/ValidationEventLocatorEx.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/ValidationEventLocatorEx.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/ValidationEventLocatorEx.java index 2bfba80ff..9eaaecf8b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/ValidationEventLocatorEx.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/ValidationEventLocatorEx.java @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; +package org.glassfish.jaxb.runtime; import jakarta.xml.bind.ValidationEventLocator; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/XmlAccessorFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/XmlAccessorFactory.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/XmlAccessorFactory.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/XmlAccessorFactory.java index 4c21d3c40..500c5f6f2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/XmlAccessorFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/XmlAccessorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind; +package org.glassfish.jaxb.runtime; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - /** * Identifies a user provided customized Accessor * to be used. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/AccessorException.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/AccessorException.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/AccessorException.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/AccessorException.java index 797f4d528..f6780f32a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/AccessorException.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/AccessorException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; +package org.glassfish.jaxb.runtime.api; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/Bridge.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/Bridge.java index 2c33478c1..9b2fcfdd2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/Bridge.java @@ -8,29 +8,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; - -import java.io.InputStream; -import java.io.OutputStream; +package org.glassfish.jaxb.runtime.api; +import com.sun.istack.NotNull; +import com.sun.istack.Nullable; +import org.glassfish.jaxb.runtime.v2.runtime.BridgeContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; import jakarta.xml.bind.attachment.AttachmentMarshaller; import jakarta.xml.bind.attachment.AttachmentUnmarshaller; +import org.w3c.dom.Node; +import org.xml.sax.ContentHandler; + import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Result; import javax.xml.transform.Source; - -import com.sun.istack.NotNull; -import com.sun.istack.Nullable; -import com.sun.xml.bind.v2.runtime.BridgeContextImpl; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; - -import org.w3c.dom.Node; -import org.xml.sax.ContentHandler; +import java.io.InputStream; +import java.io.OutputStream; /** * Mini-marshaller/unmarshaller that is specialized for a particular diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/BridgeContext.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/BridgeContext.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/BridgeContext.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/BridgeContext.java index 63120f1c8..9b0dd27aa 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/BridgeContext.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/BridgeContext.java @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; +package org.glassfish.jaxb.runtime.api; import jakarta.xml.bind.ValidationEventHandler; import jakarta.xml.bind.attachment.AttachmentMarshaller; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/ClassResolver.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/ClassResolver.java index 7e2bfed43..8d95917f2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/ClassResolver.java @@ -8,16 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; +package org.glassfish.jaxb.runtime.api; +import com.sun.istack.NotNull; +import com.sun.istack.Nullable; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.Unmarshaller; import jakarta.xml.bind.ValidationEventHandler; import jakarta.xml.bind.annotation.XmlAnyElement; -import com.sun.istack.NotNull; -import com.sun.istack.Nullable; - /** * Dynamically locates classes to represent elements discovered during the unmarshalling. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/CompositeStructure.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/CompositeStructure.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/CompositeStructure.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/CompositeStructure.java index c1dcee448..96876c99b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/CompositeStructure.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/CompositeStructure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; +package org.glassfish.jaxb.runtime.api; /** * A JAXB Bean that works like a DOM. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/JAXBRIContext.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/JAXBRIContext.java index dc1086aab..4876869a6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/JAXBRIContext.java @@ -8,30 +8,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; - -import java.io.IOException; -import java.lang.reflect.Type; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; +package org.glassfish.jaxb.runtime.api; +import com.sun.istack.NotNull; +import com.sun.istack.Nullable; +import com.sun.xml.bind.api.impl.NameConverter; +import org.glassfish.jaxb.runtime.v2.ContextFactory; +import org.glassfish.jaxb.runtime.v2.model.annotation.RuntimeAnnotationReader; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeInfoSet; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.SchemaOutputResolver; import jakarta.xml.bind.annotation.XmlAttachmentRef; + import javax.xml.namespace.QName; import javax.xml.transform.Result; - -import com.sun.istack.NotNull; -import com.sun.istack.Nullable; -import com.sun.xml.bind.api.impl.NameConverter; -import com.sun.xml.bind.v2.ContextFactory; -import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfoSet; -import java.util.HashMap; +import java.io.IOException; +import java.lang.reflect.Type; +import java.util.*; /** * {@link JAXBContext} enhanced with JAXB RI specific functionalities. @@ -484,7 +479,7 @@ public abstract RawAccessor getElementPropertyAccessor( Class wrap * * @since 2.1 EA2 */ - public static final String XMLACCESSORFACTORY_SUPPORT = "com.sun.xml.bind.XmlAccessorFactory"; + public static final String XMLACCESSORFACTORY_SUPPORT = "XmlAccessorFactory"; /** * Retains references to PropertyInfos. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/Messages.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/Messages.java index ded1307c6..8f9f6cf94 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; +package org.glassfish.jaxb.runtime.api; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/RawAccessor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/RawAccessor.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/RawAccessor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/RawAccessor.java index cc012ebda..a7304847d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/RawAccessor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/RawAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; +package org.glassfish.jaxb.runtime.api; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/TypeReference.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/TypeReference.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/TypeReference.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/TypeReference.java index f82f2fc21..bf23ed2e0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/TypeReference.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/TypeReference.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; +package org.glassfish.jaxb.runtime.api; +import javax.xml.namespace.QName; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Arrays; import java.util.Collection; -import javax.xml.namespace.QName; - /** * A reference to a JAXB-bound type. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/Utils.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/Utils.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/Utils.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/Utils.java index a1156889b..a99ef9f24 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/Utils.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.api; import com.sun.xml.bind.v2.model.nav.Navigator; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/package-info.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/package-info.java index afbba24ee..a3df0d31a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/api/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -22,4 +22,4 @@ *

* So the compatibility of this API has to be managed carefully. */ -package com.sun.xml.bind.api; +package org.glassfish.jaxb.runtime.api; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/NamespacePrefixMapper.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/marshaller/NamespacePrefixMapper.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/NamespacePrefixMapper.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/marshaller/NamespacePrefixMapper.java index 203e8f4c8..6d59bc489 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/NamespacePrefixMapper.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/marshaller/NamespacePrefixMapper.java @@ -8,16 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.marshaller; - -import java.io.OutputStream; +package org.glassfish.jaxb.runtime.marshaller; import jakarta.xml.bind.JAXBContext; +import org.w3c.dom.Node; + import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.dom.DOMResult; - -import org.w3c.dom.Node; +import java.io.OutputStream; // be careful about changing this class. this class is supposed to be // extended by users and therefore we are not allowed to break diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/NioEscapeHandler.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/marshaller/NioEscapeHandler.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/NioEscapeHandler.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/marshaller/NioEscapeHandler.java index 2f6a85642..e77fdd5ea 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/NioEscapeHandler.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/marshaller/NioEscapeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.marshaller; +package org.glassfish.jaxb.runtime.marshaller; + +import com.sun.xml.bind.marshaller.CharacterEscapeHandler; import java.io.IOException; import java.io.Writer; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/unmarshaller/Messages.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/unmarshaller/Messages.java index 2a7d9acac..300f5f18b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/unmarshaller/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.unmarshaller; +package org.glassfish.jaxb.runtime.unmarshaller; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/Patcher.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/unmarshaller/Patcher.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/Patcher.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/unmarshaller/Patcher.java index 52bf9db72..91ecd05d7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/unmarshaller/Patcher.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/unmarshaller/Patcher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.unmarshaller; +package org.glassfish.jaxb.runtime.unmarshaller; import org.xml.sax.SAXException; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/AttributesImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/util/AttributesImpl.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/AttributesImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/util/AttributesImpl.java index 06609cf8b..d3fd34a10 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/AttributesImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/util/AttributesImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -12,7 +12,7 @@ // http://www.saxproject.org // Written by David Megginson // NO WARRANTY! This class is in the public domain. -package com.sun.xml.bind.util; +package org.glassfish.jaxb.runtime.util; import org.xml.sax.Attributes; @@ -52,10 +52,9 @@ * @author David Megginson * @version 2.0.1 (sax2r2) */ -public class AttributesImpl implements Attributes -{ +public class AttributesImpl implements Attributes { + - //////////////////////////////////////////////////////////////////// // Constructors. //////////////////////////////////////////////////////////////////// @@ -85,7 +84,7 @@ public AttributesImpl (Attributes atts) } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.Attributes. //////////////////////////////////////////////////////////////////// diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/ValidationEventLocatorExImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/util/ValidationEventLocatorExImpl.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/ValidationEventLocatorExImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/util/ValidationEventLocatorExImpl.java index acd6b3416..1103734d0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/util/ValidationEventLocatorExImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/util/ValidationEventLocatorExImpl.java @@ -8,12 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.util; +package org.glassfish.jaxb.runtime.util; +import org.glassfish.jaxb.runtime.ValidationEventLocatorEx; import jakarta.xml.bind.helpers.ValidationEventLocatorImpl; -import com.sun.xml.bind.ValidationEventLocatorEx; - /** * * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java index e17dedb0c..cdb0c4eec 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/ContextFactory.java @@ -8,31 +8,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2; +package org.glassfish.jaxb.runtime.v2; + +import com.sun.istack.FinalArrayList; +import com.sun.xml.bind.Utils; +import org.glassfish.jaxb.runtime.api.JAXBRIContext; +import org.glassfish.jaxb.runtime.api.TypeReference; +import org.glassfish.jaxb.runtime.v2.model.annotation.RuntimeAnnotationReader; +import com.sun.xml.bind.v2.Messages; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.util.TypeCast; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; +import java.util.*; import java.util.logging.Level; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; - -import com.sun.istack.FinalArrayList; -import com.sun.xml.bind.Utils; -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.api.TypeReference; -import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.util.TypeCast; - /** * This class is responsible for producing RI JAXBContext objects. In * the RI, this is the class that the jakarta.xml.bind.context.factory @@ -50,13 +45,14 @@ public class ContextFactory { * The API will invoke this method via reflection */ public static JAXBContext createContext(Class[] classes, Map properties ) throws JAXBException { + MUtils.open(classes); // fool-proof check, and copy the map to make it easier to find unrecognized properties. if(properties==null) properties = Collections.emptyMap(); else properties = new HashMap(properties); - String defaultNsUri = getPropertyValue(properties,JAXBRIContext.DEFAULT_NAMESPACE_REMAP,String.class); + String defaultNsUri = getPropertyValue(properties, JAXBRIContext.DEFAULT_NAMESPACE_REMAP,String.class); Boolean c14nSupport = getPropertyValue(properties,JAXBRIContext.CANONICALIZATION_SUPPORT,Boolean.class); if(c14nSupport==null) @@ -202,6 +198,7 @@ public static JAXBRIContext createContext( Class[] classes, Collection typeRefs, Map subclassReplacements, String defaultNsUri, boolean c14nSupport, RuntimeAnnotationReader ar, boolean xmlAccessorFactorySupport, boolean allNillable, boolean retainPropertyInfo, boolean improvedXsiTypeHandling) throws JAXBException { + MUtils.open(classes); JAXBContextImpl.JAXBContextBuilder builder = new JAXBContextImpl.JAXBContextBuilder(); builder.setClasses(classes); diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/JAXBContextFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/JAXBContextFactory.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/JAXBContextFactory.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/JAXBContextFactory.java index f3f549d4b..770984621 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/JAXBContextFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/JAXBContextFactory.java @@ -8,10 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2; +package org.glassfish.jaxb.runtime.v2; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; + import java.util.Map; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/MUtils.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/MUtils.java new file mode 100644 index 000000000..fdbd758c0 --- /dev/null +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/MUtils.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0, which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.glassfish.jaxb.runtime.v2; + +import jakarta.xml.bind.JAXBException; + +final class MUtils { + + /** + * Api may be defined in a different module, in such case we need to delegate + * {@linkplain Module#isOpen open} of classes to that module. + * + * @param classes used to resolve module for {@linkplain Module#addOpens(String, Module)} + * @param factorySPI used to resolve {@link Module} of the implementation. + * + * @throws JAXBException if ony of a classes package is not open to {@code java.xml.bind} module. + */ + static void open(Class[] classes) throws JAXBException { + //noop on jdk < 9 + } + +} diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/bytecode/ClassTailor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/bytecode/ClassTailor.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/bytecode/ClassTailor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/bytecode/ClassTailor.java index 5711bbb98..16300b85c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/bytecode/ClassTailor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/bytecode/ClassTailor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,18 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.bytecode; +package org.glassfish.jaxb.runtime.v2.bytecode; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.InputStream; +import com.sun.xml.bind.Utils; + +import java.io.*; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.xml.bind.Utils; - /** * Replaces a few constant pool tokens from a class "template" and then loads it into the VM. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/SecureLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/bytecode/SecureLoader.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/SecureLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/bytecode/SecureLoader.java index d966ea86f..5d22ad4f1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/SecureLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/bytecode/SecureLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.bytecode; /** * Class defined for safe calls of getClassLoader methods of any kind (context/system/class diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/bytecode/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/bytecode/package-info.java similarity index 75% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/bytecode/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/bytecode/package-info.java index 950124cb4..d7c23287c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/bytecode/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/bytecode/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -11,4 +11,4 @@ /** * Code that deals with low level byte code manipulation. */ -package com.sun.xml.bind.v2.bytecode; +package org.glassfish.jaxb.runtime.v2.bytecode; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java index c4d5fcc00..8b0b26abd 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; - -import java.lang.annotation.Annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; +import com.sun.xml.bind.v2.model.annotation.AnnotationReader; +import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.core.ErrorHandler; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; +import java.lang.annotation.Annotation; + /** * {@link AnnotationReader} that reads annotation from classes, * not from external binding files. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/ClassLocatable.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/ClassLocatable.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/ClassLocatable.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/ClassLocatable.java index e6fe3ce28..49990153e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/ClassLocatable.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/ClassLocatable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,8 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.nav.Navigator; import com.sun.xml.bind.v2.runtime.Location; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/FieldLocatable.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/FieldLocatable.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/FieldLocatable.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/FieldLocatable.java index ee7b65e56..73b6706cc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/FieldLocatable.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/FieldLocatable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,8 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.nav.Navigator; import com.sun.xml.bind.v2.runtime.Location; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Init.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/Init.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Init.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/Init.java index 0b5c4b519..4e818d68f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Init.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/Init.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/LocatableAnnotation.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/LocatableAnnotation.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/LocatableAnnotation.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/LocatableAnnotation.java index a4bf65a09..e319e51d3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/LocatableAnnotation.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/LocatableAnnotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,19 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; + +import com.sun.xml.bind.v2.model.annotation.Locatable; +import com.sun.xml.bind.v2.runtime.Location; import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.lang.reflect.Modifier; +import java.lang.reflect.*; import java.util.HashMap; import java.util.Map; -import com.sun.xml.bind.v2.runtime.Location; - /** * {@link Annotation} that also implements {@link Locatable}. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/Messages.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/Messages.java index 95e928011..3f97e6371 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/MethodLocatable.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/MethodLocatable.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/MethodLocatable.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/MethodLocatable.java index 41200d32d..849548830 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/MethodLocatable.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/MethodLocatable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,8 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.nav.Navigator; import com.sun.xml.bind.v2.runtime.Location; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Quick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/Quick.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Quick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/Quick.java index 6b3e4e475..5b13bfb91 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/Quick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/Quick.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; - -import java.lang.annotation.Annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.runtime.Location; +import java.lang.annotation.Annotation; + /** * Base implementation of {@link Locatable} {@link Annotation}. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/RuntimeAnnotationReader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/RuntimeAnnotationReader.java similarity index 73% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/RuntimeAnnotationReader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/RuntimeAnnotationReader.java index eecd2dd98..0521eab4d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/RuntimeAnnotationReader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/RuntimeAnnotationReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; + +import com.sun.xml.bind.v2.model.annotation.AnnotationReader; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/RuntimeInlineAnnotationReader.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/RuntimeInlineAnnotationReader.java index 69e3f7442..46acc111b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/RuntimeInlineAnnotationReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; + +import com.sun.xml.bind.v2.model.annotation.Locatable; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -19,7 +21,7 @@ import java.util.Map; /** - * {@link AnnotationReader} that uses {@code java.lang.reflect} to + * {@link com.sun.xml.bind.v2.model.annotation.AnnotationReader} that uses {@code java.lang.reflect} to * read annotations from class files. * * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/bytecode/SecureLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/SecureLoader.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/bytecode/SecureLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/SecureLoader.java index 9ed3d50a9..7a1a116c3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/bytecode/SecureLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/SecureLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.bytecode; +package org.glassfish.jaxb.runtime.v2.model.annotation; /** * Class defined for safe calls of getClassLoader methods of any kind (context/system/class diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlAttributeQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlAttributeQuick.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlAttributeQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlAttributeQuick.java index f69b355ee..b3f73a4c6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlAttributeQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlAttributeQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlAttribute; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementDeclQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementDeclQuick.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementDeclQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementDeclQuick.java index b05f62f6b..a814fa18c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementDeclQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementDeclQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlElementDecl; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementQuick.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementQuick.java index 022bd48b9..e70f1dbf9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlElement; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementRefQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementRefQuick.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementRefQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementRefQuick.java index a72b845bb..677b77838 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementRefQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementRefQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlElementRef; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementRefsQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementRefsQuick.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementRefsQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementRefsQuick.java index cc684e9c6..24dcfb69a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlElementRefsQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlElementRefsQuick.java @@ -8,12 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlElementRef; import jakarta.xml.bind.annotation.XmlElementRefs; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlEnumQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlEnumQuick.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlEnumQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlEnumQuick.java index 8eb4a12e2..a3c4f148b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlEnumQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlEnumQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlEnum; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlRootElementQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlRootElementQuick.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlRootElementQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlRootElementQuick.java index 38c8ead8c..5b4c98aa9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlRootElementQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlRootElementQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlRootElement; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlSchemaQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlSchemaQuick.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlSchemaQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlSchemaQuick.java index b8c24cf3c..3ba1b7ae7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlSchemaQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlSchemaQuick.java @@ -8,13 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlNs; import jakarta.xml.bind.annotation.XmlNsForm; import jakarta.xml.bind.annotation.XmlSchema; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlSchemaTypeQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlSchemaTypeQuick.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlSchemaTypeQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlSchemaTypeQuick.java index 1f91b28dd..70569a3b4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlSchemaTypeQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlSchemaTypeQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlSchemaType; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlTransientQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlTransientQuick.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlTransientQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlTransientQuick.java index 95bbb1f8f..1a4c0e206 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlTransientQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlTransientQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlTransient; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlTypeQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlTypeQuick.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlTypeQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlTypeQuick.java index c9f0d07e5..d33e879ff 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlTypeQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlTypeQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlType; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlValueQuick.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlValueQuick.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlValueQuick.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlValueQuick.java index f64ab7576..75ed1e248 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/XmlValueQuick.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/XmlValueQuick.java @@ -8,11 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; -import java.lang.annotation.Annotation; +import com.sun.xml.bind.v2.model.annotation.Locatable; import jakarta.xml.bind.annotation.XmlValue; +import java.lang.annotation.Annotation; + /** *

Auto-generated, do not edit.

diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/package-info.java similarity index 75% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/package-info.java index dd200cf49..bbef88eb3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/annotation/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -11,4 +11,4 @@ /** * Abstraction around reading annotations, to support internal/external annotations. */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.model.annotation; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/AnyTypeImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/AnyTypeImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java index 1a05475f8..94ff9072b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/AnyTypeImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AnyTypeImpl.java @@ -8,16 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; -import javax.xml.namespace.QName; -import jakarta.xml.bind.annotation.XmlIDREF; - -import com.sun.xml.bind.v2.runtime.Location; +import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.core.NonElement; import com.sun.xml.bind.v2.model.core.TypeInfo; import com.sun.xml.bind.v2.model.nav.Navigator; -import com.sun.xml.bind.v2.model.annotation.Locatable; +import com.sun.xml.bind.v2.runtime.Location; +import jakarta.xml.bind.annotation.XmlIDREF; + +import javax.xml.namespace.QName; /** * {@link TypeInfo} implementation for {@code xs:anyType}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ArrayInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ArrayInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java index 429099246..a243464ea 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ArrayInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ArrayInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,16 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.core.ArrayInfo; import com.sun.xml.bind.v2.model.core.NonElement; import com.sun.xml.bind.v2.model.util.ArrayInfoUtil; -import com.sun.xml.bind.v2.runtime.Location; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; +import com.sun.xml.bind.v2.runtime.Location; + +import javax.xml.namespace.QName; /** * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/AttributePropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AttributePropertyInfoImpl.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/AttributePropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AttributePropertyInfoImpl.java index 5f96e6afe..351f593b7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/AttributePropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/AttributePropertyInfoImpl.java @@ -8,15 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlSchema; -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.api.impl.NameConverter; import com.sun.xml.bind.v2.model.core.AttributePropertyInfo; import com.sun.xml.bind.v2.model.core.PropertyKind; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlSchema; + +import javax.xml.namespace.QName; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/BuiltinLeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/BuiltinLeafInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java index 817e6a608..7926ae8d7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/BuiltinLeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/BuiltinLeafInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,18 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.core.BuiltinLeafInfo; -import com.sun.xml.bind.v2.model.core.LeafInfo; import com.sun.xml.bind.v2.model.core.Element; +import com.sun.xml.bind.v2.model.core.LeafInfo; import com.sun.xml.bind.v2.model.nav.Navigator; +import javax.xml.namespace.QName; +import java.util.HashMap; +import java.util.Map; + /** * JAXB spec designates a few Java classes to be mapped to XML types * in a way that ignores restrictions placed on user-defined beans. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java index a536bacc3..e92da70bd 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ClassInfoImpl.java @@ -8,64 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import java.util.AbstractList; - -import jakarta.xml.bind.annotation.XmlAccessOrder; -import jakarta.xml.bind.annotation.XmlAccessType; -import jakarta.xml.bind.annotation.XmlAccessorOrder; -import jakarta.xml.bind.annotation.XmlAccessorType; -import jakarta.xml.bind.annotation.XmlAnyAttribute; -import jakarta.xml.bind.annotation.XmlAnyElement; -import jakarta.xml.bind.annotation.XmlAttachmentRef; -import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementRef; -import jakarta.xml.bind.annotation.XmlElementRefs; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import jakarta.xml.bind.annotation.XmlElements; -import jakarta.xml.bind.annotation.XmlID; -import jakarta.xml.bind.annotation.XmlIDREF; -import jakarta.xml.bind.annotation.XmlInlineBinaryData; -import jakarta.xml.bind.annotation.XmlList; -import jakarta.xml.bind.annotation.XmlMimeType; -import jakarta.xml.bind.annotation.XmlMixed; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchemaType; -import jakarta.xml.bind.annotation.XmlTransient; -import jakarta.xml.bind.annotation.XmlType; -import jakarta.xml.bind.annotation.XmlValue; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.istack.FinalArrayList; import com.sun.xml.bind.annotation.OverrideAnnotationOf; import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.annotation.MethodLocatable; -import com.sun.xml.bind.v2.model.core.ClassInfo; -import com.sun.xml.bind.v2.model.core.Element; -import com.sun.xml.bind.v2.model.core.ID; -import com.sun.xml.bind.v2.model.core.NonElement; -import com.sun.xml.bind.v2.model.core.PropertyInfo; -import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.core.ValuePropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.annotation.MethodLocatable; +import com.sun.xml.bind.v2.model.core.*; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; import com.sun.xml.bind.v2.runtime.Location; import com.sun.xml.bind.v2.util.EditDistance; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import javax.xml.namespace.QName; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.*; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/DummyPropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/DummyPropertyInfo.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/DummyPropertyInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/DummyPropertyInfo.java index 11996f08c..4ddc08fc4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/DummyPropertyInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/DummyPropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.core.PropertyInfo; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ERPropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ERPropertyInfoImpl.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ERPropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ERPropertyInfoImpl.java index 2cd782001..3f0e24e75 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ERPropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ERPropertyInfoImpl.java @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; +import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; import jakarta.xml.bind.annotation.XmlElementWrapper; -import javax.xml.namespace.QName; -import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; +import javax.xml.namespace.QName; /** * Common part of {@link ElementPropertyInfoImpl} and {@link ReferencePropertyInfoImpl}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java index 4eae2475c..d678399a3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementInfoImpl.java @@ -8,41 +8,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.lang.annotation.Annotation; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import jakarta.activation.MimeType; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlAttachmentRef; -import jakarta.xml.bind.annotation.XmlElementDecl; -import jakarta.xml.bind.annotation.XmlID; -import jakarta.xml.bind.annotation.XmlIDREF; -import jakarta.xml.bind.annotation.XmlInlineBinaryData; -import jakarta.xml.bind.annotation.XmlSchema; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.istack.FinalArrayList; import com.sun.xml.bind.v2.TODO; import com.sun.xml.bind.v2.model.annotation.AnnotationSource; import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.core.Adapter; -import com.sun.xml.bind.v2.model.core.ClassInfo; -import com.sun.xml.bind.v2.model.core.ElementInfo; -import com.sun.xml.bind.v2.model.core.ElementPropertyInfo; -import com.sun.xml.bind.v2.model.core.ID; -import com.sun.xml.bind.v2.model.core.NonElement; -import com.sun.xml.bind.v2.model.core.PropertyInfo; -import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.core.TypeInfo; -import com.sun.xml.bind.v2.model.core.TypeRef; +import com.sun.xml.bind.v2.model.core.*; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; import com.sun.xml.bind.v2.runtime.Location; -import com.sun.xml.bind.v2.runtime.SwaRefAdapter; +import org.glassfish.jaxb.runtime.v2.runtime.SwaRefAdapter; +import jakarta.activation.MimeType; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + +import javax.xml.namespace.QName; +import java.lang.annotation.Annotation; +import java.util.Collection; +import java.util.Collections; +import java.util.List; /** * {@link ElementInfo} implementation. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementPropertyInfoImpl.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementPropertyInfoImpl.java index 2264bf089..84a76b9bb 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ElementPropertyInfoImpl.java @@ -8,24 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.util.AbstractList; -import java.util.Collections; -import java.util.List; +package org.glassfish.jaxb.runtime.v2.model.impl; +import com.sun.istack.FinalArrayList; +import com.sun.xml.bind.v2.model.core.*; +import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElements; import jakarta.xml.bind.annotation.XmlList; -import javax.xml.namespace.QName; -import com.sun.istack.FinalArrayList; -import com.sun.xml.bind.v2.model.core.ElementPropertyInfo; -import com.sun.xml.bind.v2.model.core.ID; -import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.core.TypeInfo; -import com.sun.xml.bind.v2.model.core.TypeRef; -import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; +import javax.xml.namespace.QName; +import java.util.AbstractList; +import java.util.Collections; +import java.util.List; /** * Common {@link ElementPropertyInfo} implementation used for both diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/EnumConstantImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumConstantImpl.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/EnumConstantImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumConstantImpl.java index 58c232e06..4e2264d18 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/EnumConstantImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumConstantImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.core.EnumConstant; import com.sun.xml.bind.v2.model.core.EnumLeafInfo; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/EnumLeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/EnumLeafInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java index f5ede335a..6bea928a7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/EnumLeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/EnumLeafInfoImpl.java @@ -8,24 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.util.Iterator; +package org.glassfish.jaxb.runtime.v2.model.impl; +import com.sun.xml.bind.v2.model.annotation.Locatable; +import com.sun.xml.bind.v2.model.core.*; +import com.sun.xml.bind.v2.runtime.Location; import jakarta.xml.bind.annotation.XmlEnum; import jakarta.xml.bind.annotation.XmlEnumValue; import jakarta.xml.bind.annotation.XmlRootElement; -import javax.xml.namespace.QName; +import jakarta.xml.bind.annotation.XmlSchemaType; -import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.core.EnumConstant; -import com.sun.xml.bind.v2.model.core.EnumLeafInfo; -import com.sun.xml.bind.v2.model.core.NonElement; -import com.sun.xml.bind.v2.model.core.Element; -import com.sun.xml.bind.v2.model.core.ClassInfo; -import com.sun.xml.bind.v2.runtime.Location; +import javax.xml.namespace.QName; import java.util.Collection; -import jakarta.xml.bind.annotation.XmlSchemaType; +import java.util.Iterator; /** * {@link EnumLeafInfo} implementation. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/FieldPropertySeed.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/FieldPropertySeed.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/FieldPropertySeed.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/FieldPropertySeed.java index 995bc8048..57f9c177e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/FieldPropertySeed.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/FieldPropertySeed.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,14 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.lang.annotation.Annotation; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.core.PropertyInfo; import com.sun.xml.bind.v2.runtime.Location; +import java.lang.annotation.Annotation; + /** * {@link PropertyInfo} implementation backed by a field. */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/GetterSetterPropertySeed.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/GetterSetterPropertySeed.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/GetterSetterPropertySeed.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/GetterSetterPropertySeed.java index 63dae674a..541833cc7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/GetterSetterPropertySeed.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/GetterSetterPropertySeed.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.lang.annotation.Annotation; -import java.beans.Introspector; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.core.PropertyInfo; import com.sun.xml.bind.v2.runtime.Location; +import java.beans.Introspector; +import java.lang.annotation.Annotation; + /** * {@link PropertyInfo} implementation backed by a getter and a setter. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/LeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/LeafInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java index 43daf806f..0f3ab1f98 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/LeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/LeafInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,14 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.core.LeafInfo; import com.sun.xml.bind.v2.runtime.Location; +import javax.xml.namespace.QName; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/MapPropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/MapPropertyInfoImpl.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/MapPropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/MapPropertyInfoImpl.java index 369e09db7..1009b7ae1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/MapPropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/MapPropertyInfoImpl.java @@ -8,19 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Map; - -import jakarta.xml.bind.annotation.XmlElementWrapper; -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.core.MapPropertyInfo; import com.sun.xml.bind.v2.model.core.NonElement; import com.sun.xml.bind.v2.model.core.PropertyKind; import com.sun.xml.bind.v2.model.core.TypeInfo; +import jakarta.xml.bind.annotation.XmlElementWrapper; + +import javax.xml.namespace.QName; +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/Messages.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/Messages.java index 8d59b1acc..e9e66359b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilder.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ModelBuilder.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilder.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ModelBuilder.java index 5f61d20db..c0ca2243c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ModelBuilder.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ModelBuilder.java @@ -8,8 +8,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; +import com.sun.xml.bind.WhiteSpaceProcessor; +import com.sun.xml.bind.util.Which; +import com.sun.xml.bind.v2.model.annotation.AnnotationReader; +import org.glassfish.jaxb.runtime.v2.model.annotation.ClassLocatable; +import com.sun.xml.bind.v2.model.annotation.Locatable; +import com.sun.xml.bind.v2.model.core.*; +import com.sun.xml.bind.v2.model.impl.ModelBuilderI; +import com.sun.xml.bind.v2.model.nav.Navigator; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.*; + +import javax.xml.namespace.QName; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.HashMap; @@ -17,33 +31,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlAttachmentRef; -import jakarta.xml.bind.annotation.XmlRegistry; -import jakarta.xml.bind.annotation.XmlSchema; -import jakarta.xml.bind.annotation.XmlSeeAlso; -import jakarta.xml.bind.annotation.XmlTransient; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.util.Which; -import com.sun.xml.bind.v2.model.annotation.AnnotationReader; -import com.sun.xml.bind.v2.model.annotation.ClassLocatable; -import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.core.ClassInfo; -import com.sun.xml.bind.v2.model.core.ErrorHandler; -import com.sun.xml.bind.v2.model.core.LeafInfo; -import com.sun.xml.bind.v2.model.core.NonElement; -import com.sun.xml.bind.v2.model.core.PropertyInfo; -import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.core.Ref; -import com.sun.xml.bind.v2.model.core.RegistryInfo; -import com.sun.xml.bind.v2.model.core.TypeInfo; -import com.sun.xml.bind.v2.model.core.TypeInfoSet; -import com.sun.xml.bind.v2.model.nav.Navigator; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; -import com.sun.xml.bind.WhiteSpaceProcessor; - /** * Builds a {@link TypeInfoSet} (a set of JAXB properties) * by using {@link ElementInfoImpl} and {@link ClassInfoImpl}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/PropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertyInfoImpl.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/PropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertyInfoImpl.java index e92e5f285..38aa43015 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/PropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertyInfoImpl.java @@ -8,37 +8,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.util.Collection; -import java.lang.annotation.Annotation; - -import jakarta.activation.MimeType; -import jakarta.xml.bind.annotation.XmlAttachmentRef; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import jakarta.xml.bind.annotation.XmlID; -import jakarta.xml.bind.annotation.XmlIDREF; -import jakarta.xml.bind.annotation.XmlInlineBinaryData; -import jakarta.xml.bind.annotation.XmlMimeType; -import jakarta.xml.bind.annotation.XmlSchema; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; -import jakarta.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.TODO; import com.sun.xml.bind.v2.model.annotation.AnnotationReader; import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.core.Adapter; -import com.sun.xml.bind.v2.model.core.ID; -import com.sun.xml.bind.v2.model.core.PropertyInfo; -import com.sun.xml.bind.v2.model.core.TypeInfo; -import com.sun.xml.bind.v2.model.core.TypeInfoSet; +import com.sun.xml.bind.v2.model.core.*; import com.sun.xml.bind.v2.model.nav.Navigator; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; import com.sun.xml.bind.v2.runtime.Location; -import com.sun.xml.bind.v2.runtime.SwaRefAdapter; +import org.glassfish.jaxb.runtime.v2.runtime.SwaRefAdapter; +import jakarta.activation.MimeType; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; + +import javax.xml.namespace.QName; +import java.lang.annotation.Annotation; +import java.util.Collection; /** * Default partial implementation for {@link PropertyInfo}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/PropertySeed.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertySeed.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/PropertySeed.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertySeed.java index 07364c004..c8745f694 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/PropertySeed.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/PropertySeed.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; -import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.annotation.AnnotationSource; +import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.core.PropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; /** * Exposes the core information that forms a {@link PropertyInfo}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ReferencePropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ReferencePropertyInfoImpl.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ReferencePropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ReferencePropertyInfoImpl.java index 6f02cf8f0..cc964edc3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ReferencePropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ReferencePropertyInfoImpl.java @@ -8,32 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.Set; - -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.XmlAnyElement; -import jakarta.xml.bind.annotation.XmlElementRef; -import jakarta.xml.bind.annotation.XmlElementRefs; -import jakarta.xml.bind.annotation.XmlMixed; -import jakarta.xml.bind.annotation.XmlSchema; -import jakarta.xml.bind.annotation.XmlNsForm; -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.annotation.AnnotationReader; -import com.sun.xml.bind.v2.model.core.ClassInfo; -import com.sun.xml.bind.v2.model.core.Element; -import com.sun.xml.bind.v2.model.core.ElementInfo; -import com.sun.xml.bind.v2.model.core.NonElement; -import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.core.ReferencePropertyInfo; -import com.sun.xml.bind.v2.model.core.WildcardMode; +import com.sun.xml.bind.v2.model.core.*; import com.sun.xml.bind.v2.model.nav.Navigator; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; -import java.util.Iterator; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.*; + +import javax.xml.namespace.QName; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.Set; /** * Implementation of {@link ReferencePropertyInfo}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RegistryInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RegistryInfoImpl.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RegistryInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RegistryInfoImpl.java index 05c3ea1d2..b9d2451c4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RegistryInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RegistryInfoImpl.java @@ -8,21 +8,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.util.LinkedHashSet; -import java.util.Set; - -import jakarta.xml.bind.annotation.XmlElementDecl; +package org.glassfish.jaxb.runtime.v2.model.impl; +import org.glassfish.jaxb.runtime.v2.ContextFactory; import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.annotation.MethodLocatable; +import org.glassfish.jaxb.runtime.v2.model.annotation.MethodLocatable; import com.sun.xml.bind.v2.model.core.RegistryInfo; import com.sun.xml.bind.v2.model.core.TypeInfo; import com.sun.xml.bind.v2.model.nav.Navigator; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; import com.sun.xml.bind.v2.runtime.Location; -import com.sun.xml.bind.v2.ContextFactory; +import jakarta.xml.bind.annotation.XmlElementDecl; + +import java.util.LinkedHashSet; +import java.util.Set; /** * Implementation of {@link RegistryInfo}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeAnyTypeImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeAnyTypeImpl.java similarity index 72% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeAnyTypeImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeAnyTypeImpl.java index 5d6c9fddf..d70794172 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeAnyTypeImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeAnyTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; -import java.lang.reflect.Type; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; -import com.sun.xml.bind.v2.model.nav.Navigator; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.runtime.Transducer; +import java.lang.reflect.Type; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeArrayInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeArrayInfoImpl.java similarity index 75% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeArrayInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeArrayInfoImpl.java index c04a65b24..b2670dd5a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeArrayInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeArrayInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; + +import com.sun.xml.bind.v2.model.annotation.Locatable; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeArrayInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; -import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.runtime.RuntimeArrayInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.runtime.Transducer; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeAttributePropertyInfoImpl.java similarity index 77% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeAttributePropertyInfoImpl.java index 234fdf628..1f2bd5091 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeAttributePropertyInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; + +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeAttributePropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.List; -import com.sun.xml.bind.v2.model.runtime.RuntimeAttributePropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java index 548e5c1ae..96326c1e6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java @@ -8,48 +8,35 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.awt.Component; -import java.awt.Graphics; -import java.awt.Image; -import java.awt.MediaTracker; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Type; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.UUID; +package org.glassfish.jaxb.runtime.v2.model.impl; +import com.sun.istack.ByteArrayDataSource; +import com.sun.xml.bind.Utils; +import com.sun.xml.bind.WhiteSpaceProcessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.api.AccessorException; +import com.sun.xml.bind.v2.TODO; +import com.sun.xml.bind.v2.WellKnownNamespace; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeBuiltinLeafInfo; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.output.Pcdata; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Base64Data; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import org.glassfish.jaxb.runtime.v2.util.ByteArrayOutputStreamEx; +import org.glassfish.jaxb.runtime.v2.util.DataSourceSource; import jakarta.activation.DataHandler; import jakarta.activation.DataSource; import jakarta.activation.MimeType; import jakarta.activation.MimeTypeParseException; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.helpers.ValidationEventImpl; +import org.xml.sax.SAXException; + import javax.imageio.ImageIO; import javax.imageio.ImageWriter; import javax.imageio.stream.ImageOutputStream; -import jakarta.xml.bind.ValidationEvent; -import jakarta.xml.bind.helpers.ValidationEventImpl; import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; @@ -60,27 +47,22 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamResult; - -import com.sun.istack.ByteArrayDataSource; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.WhiteSpaceProcessor; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.TODO; -import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.model.runtime.RuntimeBuiltinLeafInfo; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.output.Pcdata; -import com.sun.xml.bind.v2.runtime.unmarshaller.Base64Data; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.util.ByteArrayOutputStreamEx; -import com.sun.xml.bind.v2.util.DataSourceSource; -import java.util.logging.Logger; -import com.sun.xml.bind.Utils; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.*; +import java.lang.reflect.Type; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.List; +import java.util.*; import java.util.logging.Level; - -import org.xml.sax.SAXException; +import java.util.logging.Logger; /** * {@link BuiltinLeafInfoImpl} with a support for runtime. @@ -245,7 +227,7 @@ public String run() { new StringImpl(Character.class, createXS("unsignedShort")) { public Character parse(CharSequence text) { // TODO.checkSpec("default mapping for char is not defined yet"); - return (char)DatatypeConverterImpl._parseInt(text); + return (char) DatatypeConverterImpl._parseInt(text); } public String print(Character v) { return Integer.toString(v); diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeClassInfoImpl.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeClassInfoImpl.java index 8401c7da3..5b6bfcb71 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeClassInfoImpl.java @@ -8,48 +8,46 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.Type; -import java.util.List; -import java.util.Map; - -import jakarta.xml.bind.JAXBException; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.istack.NotNull; -import com.sun.xml.bind.AccessorFactory; -import com.sun.xml.bind.AccessorFactoryImpl; -import com.sun.xml.bind.InternalAccessorFactory; -import com.sun.xml.bind.XmlAccessorFactory; import com.sun.xml.bind.annotation.XmlLocation; -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.AccessorFactory; +import org.glassfish.jaxb.runtime.AccessorFactoryImpl; +import org.glassfish.jaxb.runtime.InternalAccessorFactory; +import org.glassfish.jaxb.runtime.XmlAccessorFactory; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; import com.sun.xml.bind.v2.ClassFactory; import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.runtime.RuntimeClassInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeElement; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeValuePropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeClassInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeValuePropertyInfo; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; import com.sun.xml.bind.v2.runtime.Location; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; - +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import jakarta.xml.bind.JAXBException; import org.xml.sax.Locator; import org.xml.sax.SAXException; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.util.List; +import java.util.Map; + /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) */ @@ -212,7 +210,7 @@ private Transducer calcTransducer() { if( !valuep.getTarget().isSimpleType() ) return null; // if there's an error, recover from it by returning null. - return new TransducerImpl(getClazz(),TransducedAccessor.get( + return new TransducerImpl(getClazz(), TransducedAccessor.get( ((RuntimeModelBuilder)builder).context,valuep)); } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeElementInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeElementInfoImpl.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeElementInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeElementInfoImpl.java index 73d1ae982..3c7b31bc0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeElementInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeElementInfoImpl.java @@ -8,7 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; + +import com.sun.xml.bind.v2.model.core.Adapter; +import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import org.glassfish.jaxb.runtime.v2.model.runtime.*; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -17,20 +25,6 @@ import java.util.Collections; import java.util.List; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.adapters.XmlAdapter; - -import com.sun.xml.bind.v2.model.core.Adapter; -import com.sun.xml.bind.v2.model.runtime.RuntimeClassInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeRef; -import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeElementPropertyInfoImpl.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeElementPropertyInfoImpl.java index ae9a3f0ad..9d20fc7f9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeElementPropertyInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,19 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElementPropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeInfo; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; + +import javax.xml.namespace.QName; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.List; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfo; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeEnumConstantImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeEnumConstantImpl.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeEnumConstantImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeEnumConstantImpl.java index 6ccbf7571..b454e0c25 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeEnumConstantImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeEnumConstantImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeEnumLeafInfoImpl.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeEnumLeafInfoImpl.java index 2bd2cb025..0e4869cf4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeEnumLeafInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,8 +8,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.model.annotation.FieldLocatable; +import com.sun.xml.bind.v2.model.annotation.Locatable; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeEnumLeafInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement; +import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.xml.sax.SAXException; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -18,21 +31,6 @@ import java.util.HashMap; import java.util.Map; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.model.annotation.FieldLocatable; -import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.runtime.RuntimeEnumLeafInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.XMLSerializer; - -import org.xml.sax.SAXException; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeMapPropertyInfoImpl.java similarity index 76% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeMapPropertyInfoImpl.java index 7dd9cc605..452042ae4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeMapPropertyInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,18 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; + +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeMapPropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeInfo; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.List; -import com.sun.xml.bind.v2.model.runtime.RuntimeMapPropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfo; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeModelBuilder.java similarity index 83% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeModelBuilder.java index c50f38fc7..74ababda3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeModelBuilder.java @@ -8,38 +8,30 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.util.Map; - -import jakarta.activation.MimeType; +package org.glassfish.jaxb.runtime.v2.model.impl; +import com.sun.istack.Nullable; import com.sun.xml.bind.WhiteSpaceProcessor; -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; +import com.sun.xml.bind.v2.WellKnownNamespace; import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader; +import org.glassfish.jaxb.runtime.v2.model.annotation.RuntimeAnnotationReader; import com.sun.xml.bind.v2.model.core.ID; -import com.sun.xml.bind.v2.model.nav.Navigator; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElementRef; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfoSet; -import com.sun.xml.bind.v2.runtime.FilterTransducer; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElementRef; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeInfoSet; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; -import com.sun.xml.bind.v2.runtime.InlineBinaryTransducer; -import com.sun.xml.bind.v2.runtime.MimeTypedTransducer; -import com.sun.xml.bind.v2.runtime.SchemaTypeTransducer; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.istack.Nullable; +import org.glassfish.jaxb.runtime.v2.runtime.*; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import jakarta.activation.MimeType; +import org.xml.sax.SAXException; -import com.sun.xml.bind.v2.WellKnownNamespace; import javax.xml.namespace.QName; -import org.xml.sax.SAXException; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.Map; /** * {@link ModelBuilder} that works at the run-time by using @@ -56,7 +48,8 @@ public class RuntimeModelBuilder extends ModelBuilder { * The {@link JAXBContextImpl} for which the model is built. * Null when created for reflection. */ - public final @Nullable JAXBContextImpl context; + public final @Nullable + JAXBContextImpl context; public RuntimeModelBuilder(JAXBContextImpl context, RuntimeAnnotationReader annotationReader, Map subclassReplacements, String defaultNamespaceRemap) { super(annotationReader, Utils.REFLECTION_NAVIGATOR, subclassReplacements, defaultNamespaceRemap); @@ -64,7 +57,7 @@ public RuntimeModelBuilder(JAXBContextImpl context, RuntimeAnnotationReader anno } @Override - public RuntimeNonElement getClassInfo( Class clazz, Locatable upstream ) { + public RuntimeNonElement getClassInfo(Class clazz, Locatable upstream ) { return (RuntimeNonElement)super.getClassInfo(clazz,upstream); } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeReferencePropertyInfoImpl.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeReferencePropertyInfoImpl.java index fd88edc5e..3dcd3fe2f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeReferencePropertyInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; + +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeReferencePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Set; -import com.sun.xml.bind.v2.model.runtime.RuntimeElement; -import com.sun.xml.bind.v2.model.runtime.RuntimeReferencePropertyInfo; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeTypeInfoSetImpl.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeTypeInfoSetImpl.java index ce216a643..d27e38606 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeTypeInfoSetImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,21 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; +import com.sun.xml.bind.v2.model.annotation.AnnotationReader; +import com.sun.xml.bind.v2.model.core.TypeInfoSet; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeInfoSet; + +import javax.xml.namespace.QName; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Map; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.v2.model.annotation.AnnotationReader; -import com.sun.xml.bind.v2.model.core.TypeInfoSet; -import com.sun.xml.bind.v2.model.nav.Navigator; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfoSet; - /** * {@link TypeInfoSet} specialized for runtime. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeTypeRefImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeTypeRefImpl.java similarity index 72% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeTypeRefImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeTypeRefImpl.java index c595f6b58..d08846940 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeTypeRefImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeTypeRefImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,16 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; -import java.lang.reflect.Type; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeRef; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; import javax.xml.namespace.QName; - -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeRef; -import com.sun.xml.bind.v2.runtime.Transducer; +import java.lang.reflect.Type; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeValuePropertyInfoImpl.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeValuePropertyInfoImpl.java index 434128e54..b56290e29 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/RuntimeValuePropertyInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; + +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeValuePropertyInfo; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.List; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeValuePropertyInfo; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/SecureLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/SecureLoader.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/SecureLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/SecureLoader.java index bb043c468..36f23b4d6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/SecureLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/SecureLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.model.impl; /** * Class defined for safe calls of getClassLoader methods of any kind (context/system/class diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/SingleTypePropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/SingleTypePropertyInfoImpl.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/SingleTypePropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/SingleTypePropertyInfoImpl.java index 33909e7f3..f57db8b40 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/SingleTypePropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/SingleTypePropertyInfoImpl.java @@ -8,21 +8,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.util.Collections; -import java.util.List; - -import jakarta.xml.bind.annotation.XmlList; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.core.ID; import com.sun.xml.bind.v2.model.core.NonElement; import com.sun.xml.bind.v2.model.core.PropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElementRef; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElementRef; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import jakarta.xml.bind.annotation.XmlList; + +import java.util.Collections; +import java.util.List; /** * {@link PropertyInfoImpl} that can only have one type. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/TypeInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/TypeInfoImpl.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/TypeInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/TypeInfoImpl.java index 8f7598725..eab325e45 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/TypeInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/TypeInfoImpl.java @@ -8,12 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.annotation.XmlSchema; -import jakarta.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.api.impl.NameConverter; import com.sun.xml.bind.v2.model.annotation.AnnotationReader; @@ -21,6 +16,11 @@ import com.sun.xml.bind.v2.model.core.TypeInfo; import com.sun.xml.bind.v2.model.core.TypeInfoSet; import com.sun.xml.bind.v2.model.nav.Navigator; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlType; + +import javax.xml.namespace.QName; /** * Common implementation between {@link ClassInfoImpl} and {@link ElementInfoImpl}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/TypeInfoSetImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/TypeInfoSetImpl.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/TypeInfoSetImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/TypeInfoSetImpl.java index 8bfc54b4d..0d15a93e7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/TypeInfoSetImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/TypeInfoSetImpl.java @@ -8,38 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; +package org.glassfish.jaxb.runtime.v2.model.impl; +import com.sun.xml.bind.v2.model.annotation.AnnotationReader; +import com.sun.xml.bind.v2.model.core.*; +import com.sun.xml.bind.v2.model.nav.Navigator; +import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; +import com.sun.xml.bind.v2.runtime.RuntimeUtil; +import com.sun.xml.bind.v2.util.FlattenIterator; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.annotation.XmlNs; -import jakarta.xml.bind.annotation.XmlNsForm; -import jakarta.xml.bind.annotation.XmlRegistry; -import jakarta.xml.bind.annotation.XmlSchema; -import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.*; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import javax.xml.namespace.QName; import javax.xml.transform.Result; - -import com.sun.xml.bind.v2.model.annotation.AnnotationReader; -import com.sun.xml.bind.v2.model.core.BuiltinLeafInfo; -import com.sun.xml.bind.v2.model.core.ClassInfo; -import com.sun.xml.bind.v2.model.core.LeafInfo; -import com.sun.xml.bind.v2.model.core.NonElement; -import com.sun.xml.bind.v2.model.core.Ref; -import com.sun.xml.bind.v2.model.core.TypeInfo; -import com.sun.xml.bind.v2.model.core.TypeInfoSet; -import com.sun.xml.bind.v2.model.nav.Navigator; -import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; -import com.sun.xml.bind.v2.runtime.RuntimeUtil; -import com.sun.xml.bind.v2.util.FlattenIterator; +import java.util.*; /** * Set of {@link TypeInfo}s. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/TypeRefImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/TypeRefImpl.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/TypeRefImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/TypeRefImpl.java index 15cc99ecf..e63c7fda0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/TypeRefImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/TypeRefImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,14 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; - -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.core.NonElement; import com.sun.xml.bind.v2.model.core.PropertyInfo; import com.sun.xml.bind.v2.model.core.TypeRef; +import javax.xml.namespace.QName; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/Util.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/Util.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/Util.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/Util.java index 4be92d206..200a5b8a2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/Util.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/Util.java @@ -8,19 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; +import com.sun.xml.bind.v2.model.annotation.AnnotationReader; +import com.sun.xml.bind.v2.model.annotation.AnnotationSource; +import com.sun.xml.bind.v2.model.annotation.Locatable; +import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; import jakarta.activation.MimeType; import jakarta.activation.MimeTypeParseException; import jakarta.xml.bind.annotation.XmlMimeType; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlSchemaTypes; -import javax.xml.namespace.QName; -import com.sun.xml.bind.v2.model.annotation.AnnotationReader; -import com.sun.xml.bind.v2.model.annotation.AnnotationSource; -import com.sun.xml.bind.v2.model.annotation.Locatable; -import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; +import javax.xml.namespace.QName; /** * Common code between {@link PropertyInfoImpl} and {@link ElementInfoImpl}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Utils.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/Utils.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Utils.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/Utils.java index 53049e982..6eaa7bd3b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Utils.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.nav.Navigator; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ValuePropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ValuePropertyInfoImpl.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ValuePropertyInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ValuePropertyInfoImpl.java index 019e73667..f33f50fe1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ValuePropertyInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/ValuePropertyInfoImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; import com.sun.xml.bind.v2.model.core.PropertyKind; import com.sun.xml.bind.v2.model.core.ValuePropertyInfo; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/package-info.java similarity index 75% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/package-info.java index 56a758a86..590bfdbfc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/impl/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -11,4 +11,4 @@ /** * Implementation of the com.sun.xml.bind.j2s.model package. */ -package com.sun.xml.bind.v2.model.impl; +package org.glassfish.jaxb.runtime.v2.model.impl; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeArrayInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeArrayInfo.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeArrayInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeArrayInfo.java index 28aa57969..88aa5f991 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeArrayInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeArrayInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.ArrayInfo; import com.sun.xml.bind.v2.model.core.TypeInfo; +import java.lang.reflect.Type; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeAttributePropertyInfo.java similarity index 83% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeAttributePropertyInfo.java index 4e5c023c7..daa89d013 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeAttributePropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.AttributePropertyInfo; +import java.lang.reflect.Type; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeBuiltinLeafInfo.java similarity index 80% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeBuiltinLeafInfo.java index 6a65e7dca..043152179 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeBuiltinLeafInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.BuiltinLeafInfo; +import java.lang.reflect.Type; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeClassInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeClassInfo.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeClassInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeClassInfo.java index 8e934a091..bcff18225 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeClassInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeClassInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,22 +8,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; +package org.glassfish.jaxb.runtime.v2.model.runtime; -import java.lang.reflect.Type; +import com.sun.xml.bind.annotation.XmlLocation; +import com.sun.xml.bind.v2.model.core.ClassInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.xml.sax.Locator; + +import javax.xml.namespace.QName; import java.lang.reflect.Method; +import java.lang.reflect.Type; import java.util.List; import java.util.Map; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.v2.model.core.ClassInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.annotation.XmlLocation; - -import org.xml.sax.Locator; - /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeElement.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElement.java similarity index 80% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeElement.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElement.java index 32c0bd40b..65e6e9d7f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeElement.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.Element; +import java.lang.reflect.Type; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeElementInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElementInfo.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeElementInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElementInfo.java index 3d814a628..b48935e4c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeElementInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElementInfo.java @@ -8,13 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; +import com.sun.xml.bind.v2.model.core.ElementInfo; import jakarta.xml.bind.JAXBElement; -import com.sun.xml.bind.v2.model.core.ElementInfo; +import java.lang.reflect.Type; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeElementPropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElementPropertyInfo.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeElementPropertyInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElementPropertyInfo.java index 00df8e603..db1f82aec 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeElementPropertyInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeElementPropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,14 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; +package org.glassfish.jaxb.runtime.v2.model.runtime; + +import com.sun.xml.bind.v2.model.core.ElementPropertyInfo; import java.lang.reflect.Type; import java.util.Collection; import java.util.List; -import com.sun.xml.bind.v2.model.core.ElementPropertyInfo; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeEnumLeafInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeEnumLeafInfo.java similarity index 80% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeEnumLeafInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeEnumLeafInfo.java index a7e9517d7..654423801 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeEnumLeafInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeEnumLeafInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.EnumLeafInfo; +import java.lang.reflect.Type; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeLeafInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeLeafInfo.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeLeafInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeLeafInfo.java index 7c4d91876..b389adb1a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeLeafInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeLeafInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,14 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; +package org.glassfish.jaxb.runtime.v2.model.runtime; -import java.lang.reflect.Type; +import com.sun.xml.bind.v2.model.core.LeafInfo; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; import javax.xml.namespace.QName; - -import com.sun.xml.bind.v2.model.core.LeafInfo; -import com.sun.xml.bind.v2.runtime.Transducer; +import java.lang.reflect.Type; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeMapPropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeMapPropertyInfo.java similarity index 83% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeMapPropertyInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeMapPropertyInfo.java index ae446a425..e2b6a4d13 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeMapPropertyInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeMapPropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.MapPropertyInfo; +import java.lang.reflect.Type; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeNonElement.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeNonElement.java similarity index 80% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeNonElement.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeNonElement.java index 51a30f392..f7871d636 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeNonElement.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeNonElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.NonElement; -import com.sun.xml.bind.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; + +import java.lang.reflect.Type; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeNonElementRef.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeNonElementRef.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeNonElementRef.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeNonElementRef.java index 5a145f84b..7badf21b9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeNonElementRef.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeNonElementRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.NonElementRef; -import com.sun.xml.bind.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; + +import java.lang.reflect.Type; /** * Runtime version of {@link NonElementRef}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimePropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimePropertyInfo.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimePropertyInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimePropertyInfo.java index e2b2d9ba7..d6f423777 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimePropertyInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimePropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; +package org.glassfish.jaxb.runtime.v2.model.runtime; + +import com.sun.xml.bind.v2.model.core.PropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; import java.lang.reflect.Type; import java.util.Collection; -import com.sun.xml.bind.v2.model.core.PropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; - /** * {@link PropertyInfo} that exposes more information. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeReferencePropertyInfo.java similarity index 83% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeReferencePropertyInfo.java index b4a97b85c..e9133f5be 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeReferencePropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; +package org.glassfish.jaxb.runtime.v2.model.runtime; + +import com.sun.xml.bind.v2.model.core.ReferencePropertyInfo; import java.lang.reflect.Type; import java.util.Set; -import com.sun.xml.bind.v2.model.core.ReferencePropertyInfo; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeTypeInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeTypeInfo.java similarity index 79% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeTypeInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeTypeInfo.java index 8e5023f3a..01222bd16 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeTypeInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeTypeInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.TypeInfo; +import java.lang.reflect.Type; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeTypeInfoSet.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeTypeInfoSet.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeTypeInfoSet.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeTypeInfoSet.java index d4f516a58..0220c3eb8 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeTypeInfoSet.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeTypeInfoSet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; +package org.glassfish.jaxb.runtime.v2.model.runtime; +import com.sun.xml.bind.v2.model.core.TypeInfoSet; + +import javax.xml.namespace.QName; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Map; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.v2.model.core.TypeInfoSet; - /** * {@link TypeInfoSet} refined for runtime. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeTypeRef.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeTypeRef.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeTypeRef.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeTypeRef.java index 9f313fbe4..17556a49e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeTypeRef.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeTypeRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.TypeRef; +import java.lang.reflect.Type; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeValuePropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeValuePropertyInfo.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeValuePropertyInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeValuePropertyInfo.java index eed66d82d..ca176c74e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/RuntimeValuePropertyInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/RuntimeValuePropertyInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.runtime; - -import java.lang.reflect.Type; +package org.glassfish.jaxb.runtime.v2.model.runtime; import com.sun.xml.bind.v2.model.core.ValuePropertyInfo; +import java.lang.reflect.Type; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/package-info.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/package-info.java index 109c29840..1018a850a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/runtime/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/model/runtime/package-info.java @@ -17,7 +17,7 @@ * with the core package, and they are simply named with {@code Runtime} prefix. */ @XmlSchema(namespace="http://jaxb.dev.java.net/xjc/model",elementFormDefault=XmlNsForm.QUALIFIED) -package com.sun.xml.bind.v2.model.runtime; +package org.glassfish.jaxb.runtime.v2.model.runtime; import jakarta.xml.bind.annotation.XmlNsForm; import jakarta.xml.bind.annotation.XmlSchema; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/package-info.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/package-info.java index a408f3877..9d2ded973 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/package-info.java @@ -22,7 +22,7 @@ *
  • There's a set of classes that constitute the unmarshaller and marshaller. * Each class represents a small portion, and they are composed to perform * the operations. - *
  • {@link com.sun.xml.bind.v2.runtime.JAXBContextImpl} builds itself by reading the model and + *
  • {@link org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl} builds itself by reading the model and * composing unmarshallers and marshallers. * * @@ -128,5 +128,5 @@ * triggers activities. * */ -package com.sun.xml.bind.v2; +package org.glassfish.jaxb.runtime.v2; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/AnyTypeBeanInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/AnyTypeBeanInfo.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/AnyTypeBeanInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/AnyTypeBeanInfo.java index 409402253..0a01e9074 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/AnyTypeBeanInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/AnyTypeBeanInfo.java @@ -8,29 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; +package org.glassfish.jaxb.runtime.v2.runtime; +import com.sun.xml.bind.v2.WellKnownNamespace; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeInfo; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.DomLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.XsiTypeLoader; +import jakarta.xml.bind.ValidationEvent; import jakarta.xml.bind.annotation.W3CDomHandler; import jakarta.xml.bind.helpers.ValidationEventImpl; -import jakarta.xml.bind.ValidationEvent; +import org.w3c.dom.*; +import org.xml.sax.SAXException; + import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfo; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.runtime.unmarshaller.DomLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.XsiTypeLoader; - -import org.w3c.dom.Attr; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; +import java.io.IOException; /** * {@link JaxBeanInfo} for handling {@code xs:anyType}. @@ -41,7 +35,7 @@ final class AnyTypeBeanInfo extends JaxBeanInfo implements AttributeAcce private boolean nilIncluded = false; - public AnyTypeBeanInfo(JAXBContextImpl grammar,RuntimeTypeInfo anyTypeInfo) { + public AnyTypeBeanInfo(JAXBContextImpl grammar, RuntimeTypeInfo anyTypeInfo) { super(grammar, anyTypeInfo, Object.class, new QName(WellKnownNamespace.XML_SCHEMA,"anyType"), false, true, false); } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ArrayBeanInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ArrayBeanInfoImpl.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ArrayBeanInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ArrayBeanInfoImpl.java index 5d8e855a3..c9d48ce6e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ArrayBeanInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ArrayBeanInfoImpl.java @@ -8,8 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeArrayInfo; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Receiver; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.TagName; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.helpers.ValidationEventImpl; +import org.xml.sax.SAXException; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.lang.reflect.Array; import java.util.ArrayList; @@ -17,19 +28,6 @@ import java.util.Collections; import java.util.List; -import jakarta.xml.bind.ValidationEvent; -import jakarta.xml.bind.helpers.ValidationEventImpl; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.v2.model.runtime.RuntimeArrayInfo; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Receiver; -import com.sun.xml.bind.v2.runtime.unmarshaller.TagName; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; - -import org.xml.sax.SAXException; - /** * {@link JaxBeanInfo} implementation that binds T[] to a complex type * with an element for each item. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/AssociationMap.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/AssociationMap.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/AssociationMap.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/AssociationMap.java index 9dc2056a7..8ee6e5aac 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/AssociationMap.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/AssociationMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; import java.util.HashSet; import java.util.IdentityHashMap; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/AttributeAccessor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/AttributeAccessor.java similarity index 77% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/AttributeAccessor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/AttributeAccessor.java index 8ac841e63..367aee8dd 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/AttributeAccessor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/AttributeAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; /** * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BinderImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BinderImpl.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BinderImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BinderImpl.java index 2b0b0cf6c..e5179a2e5 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BinderImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BinderImpl.java @@ -8,26 +8,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import jakarta.xml.bind.Binder; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.PropertyException; -import jakarta.xml.bind.ValidationEventHandler; -import javax.xml.validation.Schema; -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.runtime; import com.sun.xml.bind.unmarshaller.InfosetScanner; -import com.sun.xml.bind.v2.runtime.output.DOMOutput; -import com.sun.xml.bind.v2.runtime.unmarshaller.InterningXmlVisitor; -import com.sun.xml.bind.v2.runtime.unmarshaller.SAXConnector; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallerImpl; - +import org.glassfish.jaxb.runtime.v2.runtime.output.DOMOutput; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.InterningXmlVisitor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.SAXConnector; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallerImpl; +import jakarta.xml.bind.*; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.xml.sax.SAXException; +import javax.xml.namespace.QName; +import javax.xml.validation.Schema; + /** * Implementation of {@link Binder}. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BridgeAdapter.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BridgeAdapter.java index 4d92cf8db..f76de77c5 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BridgeAdapter.java @@ -8,33 +8,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.MarshalException; -import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.UnmarshalException; -import jakarta.xml.bind.Unmarshaller; +import com.sun.istack.NotNull; +import org.glassfish.jaxb.runtime.api.Bridge; +import org.glassfish.jaxb.runtime.api.TypeReference; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallerImpl; +import jakarta.xml.bind.*; import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import org.w3c.dom.Node; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; + import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Result; import javax.xml.transform.Source; - -import com.sun.istack.NotNull; -import com.sun.xml.bind.api.Bridge; -import com.sun.xml.bind.api.TypeReference; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallerImpl; - -import org.w3c.dom.Node; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; /** * {@link Bridge} decorator for {@link XmlAdapter}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeContextImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BridgeContextImpl.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeContextImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BridgeContextImpl.java index 2f023dfd4..09df7a8bc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeContextImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BridgeContextImpl.java @@ -8,16 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; +import org.glassfish.jaxb.runtime.api.BridgeContext; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallerImpl; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.ValidationEventHandler; import jakarta.xml.bind.attachment.AttachmentMarshaller; import jakarta.xml.bind.attachment.AttachmentUnmarshaller; -import com.sun.xml.bind.api.BridgeContext; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallerImpl; - /** * {@link BridgeContext} implementation. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BridgeImpl.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BridgeImpl.java index 2fb379f0e..6064a5496 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/BridgeImpl.java @@ -8,34 +8,32 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +package org.glassfish.jaxb.runtime.v2.runtime; +import com.sun.istack.NotNull; +import com.sun.xml.bind.marshaller.SAX2DOMEx; +import org.glassfish.jaxb.runtime.api.Bridge; +import org.glassfish.jaxb.runtime.api.TypeReference; +import org.glassfish.jaxb.runtime.v2.runtime.output.SAXOutput; +import org.glassfish.jaxb.runtime.v2.runtime.output.XMLStreamWriterOutput; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallerImpl; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; +import org.w3c.dom.Node; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; + import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Result; import javax.xml.transform.Source; - -import com.sun.istack.NotNull; -import com.sun.xml.bind.api.Bridge; -import com.sun.xml.bind.api.TypeReference; -import com.sun.xml.bind.marshaller.SAX2DOMEx; -import com.sun.xml.bind.v2.runtime.output.SAXOutput; -import com.sun.xml.bind.v2.runtime.output.XMLStreamWriterOutput; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallerImpl; - -import org.w3c.dom.Node; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; /** * {@link Bridge} implementaiton. @@ -61,7 +59,7 @@ public BridgeImpl(JAXBContextImpl context, Name tagName, JaxBeanInfo bi,TypeR public void marshal(Marshaller _m, T t, XMLStreamWriter output) throws JAXBException { MarshallerImpl m = (MarshallerImpl)_m; - m.write(tagName,bi,t,XMLStreamWriterOutput.create(output,context, m.getEscapeHandler()),new StAXPostInitAction(output,m.serializer)); + m.write(tagName,bi,t, XMLStreamWriterOutput.create(output,context, m.getEscapeHandler()),new StAXPostInitAction(output,m.serializer)); } public void marshal(Marshaller _m, T t, OutputStream output, NamespaceContext nsContext) throws JAXBException { diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ClassBeanInfoImpl.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ClassBeanInfoImpl.java index 8ef5a7e95..f84cc9f71 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ClassBeanInfoImpl.java @@ -8,8 +8,32 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; +import com.sun.istack.FinalArrayList; +import org.glassfish.jaxb.runtime.api.AccessorException; +import com.sun.xml.bind.v2.ClassFactory; +import com.sun.xml.bind.v2.WellKnownNamespace; +import com.sun.xml.bind.v2.model.core.ID; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeClassInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.property.AttributeProperty; +import org.glassfish.jaxb.runtime.v2.runtime.property.Property; +import org.glassfish.jaxb.runtime.v2.runtime.property.PropertyFactory; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.StructureLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.XsiTypeLoader; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.helpers.ValidationEventImpl; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.LocatorImpl; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -21,32 +45,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.xml.bind.ValidationEvent; -import jakarta.xml.bind.annotation.XmlRootElement; -import jakarta.xml.bind.helpers.ValidationEventImpl; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - -import com.sun.istack.FinalArrayList; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.ClassFactory; -import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.model.core.ID; -import com.sun.xml.bind.v2.model.runtime.RuntimeClassInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.property.AttributeProperty; -import com.sun.xml.bind.v2.runtime.property.Property; -import com.sun.xml.bind.v2.runtime.property.PropertyFactory; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.StructureLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.runtime.unmarshaller.XsiTypeLoader; - -import org.xml.sax.Locator; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.LocatorImpl; - /** * {@link JaxBeanInfo} implementation for j2s bean. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/CompositeStructureBeanInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/CompositeStructureBeanInfo.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/CompositeStructureBeanInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/CompositeStructureBeanInfo.java index fb5c56110..e8bdafb38 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/CompositeStructureBeanInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/CompositeStructureBeanInfo.java @@ -8,21 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; +package org.glassfish.jaxb.runtime.v2.runtime; +import org.glassfish.jaxb.runtime.api.CompositeStructure; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; import jakarta.xml.bind.ValidationEvent; import jakarta.xml.bind.helpers.ValidationEventImpl; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.CompositeStructure; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; - import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ContentHandlerAdaptor.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ContentHandlerAdaptor.java index e8f554b49..39c75b88a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ContentHandlerAdaptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; import com.sun.istack.FinalArrayList; import com.sun.istack.SAXException2; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Coordinator.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Coordinator.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java index ec19ad9ea..93240bc06 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Coordinator.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Coordinator.java @@ -8,23 +8,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.util.HashMap; +package org.glassfish.jaxb.runtime.v2.runtime; +import com.sun.xml.bind.v2.ClassFactory; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; import jakarta.xml.bind.ValidationEvent; import jakarta.xml.bind.ValidationEventHandler; import jakarta.xml.bind.ValidationEventLocator; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import jakarta.xml.bind.helpers.ValidationEventImpl; - -import com.sun.xml.bind.v2.ClassFactory; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; - import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; +import java.util.HashMap; + /** * Object that coordinates the marshalling/unmarshalling. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/DomPostInitAction.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/DomPostInitAction.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/DomPostInitAction.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/DomPostInitAction.java index 554b104ac..ae5830f86 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/DomPostInitAction.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/DomPostInitAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.util.HashSet; -import java.util.Set; - -import javax.xml.XMLConstants; +package org.glassfish.jaxb.runtime.v2.runtime; import org.w3c.dom.Attr; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import javax.xml.XMLConstants; +import java.util.HashSet; +import java.util.Set; + /** * Post-init action for {@link MarshallerImpl} that incorporate the in-scope namespace bindings * from a DOM node. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ElementBeanInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ElementBeanInfoImpl.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ElementBeanInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ElementBeanInfoImpl.java index 0ef626b94..4f2ede120 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ElementBeanInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ElementBeanInfoImpl.java @@ -8,34 +8,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; +package org.glassfish.jaxb.runtime.v2.runtime; +import org.glassfish.jaxb.runtime.api.AccessorException; +import com.sun.xml.bind.v2.model.core.PropertyKind; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElementInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.property.Property; +import org.glassfish.jaxb.runtime.v2.runtime.property.PropertyFactory; +import org.glassfish.jaxb.runtime.v2.runtime.property.UnmarshallerChain; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.*; +import org.xml.sax.SAXException; + import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.property.Property; -import com.sun.xml.bind.v2.runtime.property.PropertyFactory; -import com.sun.xml.bind.v2.runtime.property.UnmarshallerChain; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Discarder; -import com.sun.xml.bind.v2.runtime.unmarshaller.Intercepter; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.TagName; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.util.QNameMap; - -import org.xml.sax.SAXException; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; /** * {@link JaxBeanInfo} implementation for {@link RuntimeElementInfo}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/FilterTransducer.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/FilterTransducer.java index e68cad73a..8ac3ab4ba 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/FilterTransducer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; -import java.io.IOException; +import com.sun.istack.NotNull; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.xml.sax.SAXException; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; - -import com.sun.istack.NotNull; -import com.sun.xml.bind.api.AccessorException; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * {@link Transducer} that delegates to another {@link Transducer}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/IllegalAnnotationsException.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/IllegalAnnotationsException.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/IllegalAnnotationsException.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/IllegalAnnotationsException.java index 8839a61d0..253351e15 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/IllegalAnnotationsException.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/IllegalAnnotationsException.java @@ -8,16 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +package org.glassfish.jaxb.runtime.v2.runtime; +import com.sun.xml.bind.v2.model.core.ErrorHandler; +import com.sun.xml.bind.v2.runtime.IllegalAnnotationException; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; -import com.sun.xml.bind.v2.model.core.ErrorHandler; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * A list of {@link IllegalAnnotationException} wrapped in one exception. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/InlineBinaryTransducer.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/InlineBinaryTransducer.java index 83eb7da47..1b5ad9ae6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/InlineBinaryTransducer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; - -import javax.xml.stream.XMLStreamException; +package org.glassfish.jaxb.runtime.v2.runtime; import com.sun.istack.NotNull; -import com.sun.xml.bind.api.AccessorException; - +import org.glassfish.jaxb.runtime.api.AccessorException; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + /** * Transducer that signals the runtime that this binary data shall be always inlined. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InternalBridge.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/InternalBridge.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InternalBridge.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/InternalBridge.java index ada46a748..12e4776dc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InternalBridge.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/InternalBridge.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; -import java.io.IOException; +import org.glassfish.jaxb.runtime.api.Bridge; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.Bridge; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * Additional methods on {@link Bridge} that are only available for the JAXB runtime. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JAXBContextImpl.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JAXBContextImpl.java index ca14512c3..80a9f40e0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JAXBContextImpl.java @@ -8,100 +8,68 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; -import java.lang.ref.WeakReference; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeSet; -import jakarta.xml.bind.Binder; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.JAXBIntrospector; -import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.SchemaOutputResolver; -import jakarta.xml.bind.Unmarshaller; -import jakarta.xml.bind.Validator; -import jakarta.xml.bind.annotation.XmlAttachmentRef; -import jakarta.xml.bind.annotation.XmlList; -import jakarta.xml.bind.annotation.XmlNs; -import jakarta.xml.bind.annotation.XmlSchema; -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.FactoryConfigurationError; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.Result; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.sax.SAXTransformerFactory; -import javax.xml.transform.sax.TransformerHandler; +package org.glassfish.jaxb.runtime.v2.runtime; import com.sun.istack.NotNull; import com.sun.istack.Pool; -import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.api.Bridge; -import com.sun.xml.bind.api.BridgeContext; -import com.sun.xml.bind.api.CompositeStructure; import com.sun.xml.bind.api.ErrorListener; -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.api.RawAccessor; -import com.sun.xml.bind.api.TypeReference; +import org.glassfish.jaxb.runtime.api.*; import com.sun.xml.bind.unmarshaller.DOMScanner; import com.sun.xml.bind.util.Which; -import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader; -import com.sun.xml.bind.v2.model.annotation.RuntimeInlineAnnotationReader; +import com.sun.xml.bind.v2.WellKnownNamespace; +import org.glassfish.jaxb.runtime.v2.model.annotation.RuntimeAnnotationReader; +import org.glassfish.jaxb.runtime.v2.model.annotation.RuntimeInlineAnnotationReader; import com.sun.xml.bind.v2.model.core.Adapter; import com.sun.xml.bind.v2.model.core.NonElement; import com.sun.xml.bind.v2.model.core.Ref; -import com.sun.xml.bind.v2.model.impl.RuntimeBuiltinLeafInfoImpl; -import com.sun.xml.bind.v2.model.impl.RuntimeModelBuilder; +import org.glassfish.jaxb.runtime.v2.model.impl.RuntimeBuiltinLeafInfoImpl; +import org.glassfish.jaxb.runtime.v2.model.impl.RuntimeModelBuilder; import com.sun.xml.bind.v2.model.nav.Navigator; -import com.sun.xml.bind.v2.model.runtime.RuntimeArrayInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeBuiltinLeafInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeClassInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeEnumLeafInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeLeafInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfoSet; -import com.sun.xml.bind.v2.runtime.output.Encoded; -import com.sun.xml.bind.v2.runtime.property.AttributeProperty; -import com.sun.xml.bind.v2.runtime.property.Property; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.TagName; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallerImpl; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.schemagen.XmlSchemaGenerator; +import com.sun.xml.bind.v2.runtime.RuntimeUtil; +import org.glassfish.jaxb.runtime.v2.runtime.output.Encoded; +import org.glassfish.jaxb.runtime.v2.runtime.property.AttributeProperty; +import org.glassfish.jaxb.runtime.v2.runtime.property.Property; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.TagName; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallerImpl; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import org.glassfish.jaxb.runtime.v2.schemagen.XmlSchemaGenerator; import com.sun.xml.bind.v2.util.EditDistance; -import com.sun.xml.bind.v2.util.QNameMap; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; import com.sun.xml.bind.v2.util.XmlFactory; import com.sun.xml.txw2.output.ResultFactory; - +import jakarta.xml.bind.*; +import jakarta.xml.bind.annotation.XmlAttachmentRef; +import jakarta.xml.bind.annotation.XmlList; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.glassfish.jaxb.runtime.v2.model.runtime.*; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.FactoryConfigurationError; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Result; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; +import java.io.IOException; +import java.lang.ref.WeakReference; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.*; +import java.util.Map.Entry; + /** * This class provides the implementation of JAXBContext. * @@ -111,7 +79,7 @@ public final class JAXBContextImpl extends JAXBRIContext { /** * All the bridge classes. */ - private final Map bridges = new LinkedHashMap(); + private final Map bridges = new LinkedHashMap(); /** * Shared instance of {@link DocumentBuilder}. @@ -211,7 +179,8 @@ public final class JAXBContextImpl extends JAXBRIContext { private WeakReference typeInfoSetCache; - private @NotNull RuntimeAnnotationReader annotationReader; + private @NotNull + RuntimeAnnotationReader annotationReader; private /*almost final*/ boolean hasSwaRef; private final @NotNull Map subclassReplacements; @@ -611,7 +580,7 @@ public final JaxBeanInfo getBeanInfo(Class clazz,boolean fatal) throws * @return * null if the given name pair is not recognized. */ - public final Loader selectRootLoader( UnmarshallingContext.State state, TagName tag ) { + public final Loader selectRootLoader(UnmarshallingContext.State state, TagName tag ) { JaxBeanInfo beanInfo = rootMap.get(tag.uri,tag.local); if(beanInfo==null) return null; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JaxBeanInfo.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JaxBeanInfo.java index 2bc370497..adce3c688 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/JaxBeanInfo.java @@ -8,8 +8,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; +import com.sun.istack.NotNull; +import com.sun.xml.bind.Utils; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeInfo; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallerImpl; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import org.xml.sax.SAXException; + +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -21,22 +35,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.Unmarshaller; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - -import com.sun.istack.NotNull; -import com.sun.xml.bind.Utils; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfo; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallerImpl; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; - -import org.xml.sax.SAXException; - /** * Encapsulates various JAXB operations on objects bound by JAXB. * Immutable and thread-safe. @@ -68,7 +66,7 @@ public abstract class JaxBeanInfo { /** * For {@link JaxBeanInfo} that has multiple type names. */ - protected JaxBeanInfo(JAXBContextImpl grammar, RuntimeTypeInfo rti, Class jaxbType, QName[] typeNames, boolean isElement,boolean isImmutable, boolean hasLifecycleEvents) { + protected JaxBeanInfo(JAXBContextImpl grammar, RuntimeTypeInfo rti, Class jaxbType, QName[] typeNames, boolean isElement, boolean isImmutable, boolean hasLifecycleEvents) { this(grammar,rti,jaxbType,(Object)typeNames,isElement,isImmutable,hasLifecycleEvents); } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/LeafBeanInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/LeafBeanInfoImpl.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/LeafBeanInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/LeafBeanInfoImpl.java index 75401b3b1..93ab20d3e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/LeafBeanInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/LeafBeanInfoImpl.java @@ -8,23 +8,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; - +package org.glassfish.jaxb.runtime.v2.runtime; + +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeLeafInfo; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.TextLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.XsiTypeLoader; import jakarta.xml.bind.ValidationEvent; import jakarta.xml.bind.helpers.ValidationEventImpl; +import org.xml.sax.SAXException; + import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.model.runtime.RuntimeLeafInfo; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.TextLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.runtime.unmarshaller.XsiTypeLoader; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * {@link JaxBeanInfo} implementation for immutable leaf classes. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/LifecycleMethods.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/LifecycleMethods.java similarity index 76% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/LifecycleMethods.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/LifecycleMethods.java index 5f890e01c..0b933c3ac 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/LifecycleMethods.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/LifecycleMethods.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; -import java.lang.reflect.Method; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; +import java.lang.reflect.Method; /** * This class is a simple container for caching lifecycle methods that are diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/MarshallerImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MarshallerImpl.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/MarshallerImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MarshallerImpl.java index 190d848a2..ce1883b99 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/MarshallerImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MarshallerImpl.java @@ -8,28 +8,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.BufferedWriter; -import java.io.Closeable; -import java.io.FileOutputStream; -import java.io.Flushable; -import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; -import java.io.Writer; - -import java.net.URI; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.MarshalException; -import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.PropertyException; -import jakarta.xml.bind.ValidationEvent; -import jakarta.xml.bind.ValidationEventHandler; +package org.glassfish.jaxb.runtime.v2.runtime; + +import com.sun.xml.bind.marshaller.*; +import org.glassfish.jaxb.runtime.api.JAXBRIContext; +import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper; +import org.glassfish.jaxb.runtime.marshaller.NioEscapeHandler; +import org.glassfish.jaxb.runtime.v2.runtime.output.*; +import org.glassfish.jaxb.runtime.v2.util.FatalAdapter; +import jakarta.xml.bind.*; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import jakarta.xml.bind.attachment.AttachmentMarshaller; import jakarta.xml.bind.helpers.AbstractMarshallerImpl; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.XMLFilterImpl; + +import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -39,38 +35,12 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.validation.Schema; import javax.xml.validation.ValidatorHandler; -import javax.xml.namespace.NamespaceContext; - -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.marshaller.CharacterEscapeHandler; -import com.sun.xml.bind.marshaller.DataWriter; -import com.sun.xml.bind.marshaller.DumbEscapeHandler; -import com.sun.xml.bind.marshaller.MinimumEscapeHandler; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; -import com.sun.xml.bind.marshaller.NioEscapeHandler; -import com.sun.xml.bind.marshaller.SAX2DOMEx; -import com.sun.xml.bind.marshaller.XMLWriter; -import com.sun.xml.bind.v2.runtime.output.C14nXmlOutput; -import com.sun.xml.bind.v2.runtime.output.Encoded; -import com.sun.xml.bind.v2.runtime.output.ForkXmlOutput; -import com.sun.xml.bind.v2.runtime.output.IndentingUTF8XmlOutput; -import com.sun.xml.bind.v2.runtime.output.NamespaceContextImpl; -import com.sun.xml.bind.v2.runtime.output.SAXOutput; -import com.sun.xml.bind.v2.runtime.output.UTF8XmlOutput; -import com.sun.xml.bind.v2.runtime.output.XMLEventWriterOutput; -import com.sun.xml.bind.v2.runtime.output.XMLStreamWriterOutput; -import com.sun.xml.bind.v2.runtime.output.XmlOutput; -import com.sun.xml.bind.v2.util.FatalAdapter; - +import java.io.*; +import java.net.URI; import java.net.URISyntaxException; import java.util.logging.Level; import java.util.logging.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.XMLFilterImpl; - /** * Implementation of {@link Marshaller} interface for the JAXB RI. * @@ -281,7 +251,7 @@ public void startPrefixMapping(String prefix, String uri) throws SAXException { } }; f.setContentHandler(validator); - out = new ForkXmlOutput( new SAXOutput(f) { + out = new ForkXmlOutput(new SAXOutput(f) { @Override public void startDocument(XMLSerializer serializer, boolean fragment, int[] nsUriIndex2prefixIndex, NamespaceContextImpl nsContext) throws SAXException, IOException, XMLStreamException { super.startDocument(serializer, false, nsUriIndex2prefixIndex, nsContext); diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Messages.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Messages.java index 5af5ec8d7..7cb120743 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/MimeTypedTransducer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MimeTypedTransducer.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/MimeTypedTransducer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MimeTypedTransducer.java index daf8c2721..e75357bef 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/MimeTypedTransducer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/MimeTypedTransducer.java @@ -8,18 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.awt.*; -import java.io.IOException; +package org.glassfish.jaxb.runtime.v2.runtime; +import org.glassfish.jaxb.runtime.api.AccessorException; import jakarta.activation.MimeType; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; - import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.awt.*; +import java.io.IOException; + /** * {@link Transducer} decorator that wraps another {@link Transducer} * and sets the expected MIME type to the context. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Name.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Name.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Name.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Name.java index 0d8bed577..1f4d33983 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Name.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Name.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; import javax.xml.namespace.QName; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NameBuilder.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/NameBuilder.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NameBuilder.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/NameBuilder.java index 03665735c..81d718edd 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NameBuilder.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/NameBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; + +import javax.xml.namespace.QName; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.v2.util.QNameMap; - /** * Creates {@link Name}s and assign index numbers to them. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NameList.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/NameList.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NameList.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/NameList.java index 5b4b8822c..90e6d1600 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NameList.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/NameList.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; /** * Namespace URIs and local names sorted by their indices. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/NamespaceContext2.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/NamespaceContext2.java index 328df5c74..421de864e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/NamespaceContext2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import javax.xml.namespace.NamespaceContext; +package org.glassfish.jaxb.runtime.v2.runtime; import com.sun.istack.NotNull; +import javax.xml.namespace.NamespaceContext; + /** * Maintains {@code namespace <-> prefix} bindings. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/SchemaTypeTransducer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/SchemaTypeTransducer.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/SchemaTypeTransducer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/SchemaTypeTransducer.java index 5cdba622a..ddd101850 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/SchemaTypeTransducer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/SchemaTypeTransducer.java @@ -8,17 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; +package org.glassfish.jaxb.runtime.v2.runtime; +import org.glassfish.jaxb.runtime.api.AccessorException; import jakarta.xml.bind.annotation.XmlSchemaType; +import org.xml.sax.SAXException; + import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * {@link Transducer} that signals the runtime that this datatype diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/StAXPostInitAction.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/StAXPostInitAction.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/StAXPostInitAction.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/StAXPostInitAction.java index 32a885e71..ea36e95d1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/StAXPostInitAction.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/StAXPostInitAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLEventWriter; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/SwaRefAdapter.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/SwaRefAdapter.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/SwaRefAdapter.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/SwaRefAdapter.java index cf382fb3e..d7db72bd7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/SwaRefAdapter.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/SwaRefAdapter.java @@ -8,9 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; import jakarta.activation.DataHandler; import jakarta.xml.bind.annotation.XmlAttachmentRef; import jakarta.xml.bind.annotation.adapters.XmlAdapter; @@ -18,8 +19,6 @@ import jakarta.xml.bind.attachment.AttachmentMarshaller; import jakarta.xml.bind.attachment.AttachmentUnmarshaller; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; - /** * {@link XmlAdapter} that binds the value as a SOAP attachment. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Transducer.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Transducer.java index 81c93cc4b..ce6c54bfe 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Transducer.java @@ -8,21 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; +package org.glassfish.jaxb.runtime.v2.runtime; +import com.sun.istack.NotNull; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.opt.OptimizedTransducedAccessorFactory; import jakarta.xml.bind.annotation.XmlValue; +import org.xml.sax.SAXException; + import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; - -import com.sun.istack.NotNull; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.reflect.opt.OptimizedTransducedAccessorFactory; - -import org.xml.sax.SAXException; +import java.io.IOException; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Utils.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Utils.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Utils.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Utils.java index f5d2de953..ab5392fc6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Utils.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.api; +package org.glassfish.jaxb.runtime.v2.runtime; import com.sun.xml.bind.v2.model.nav.Navigator; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ValueListBeanInfoImpl.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ValueListBeanInfoImpl.java index 14c48b3f4..0898373e2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/ValueListBeanInfoImpl.java @@ -8,25 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; -import java.lang.reflect.Array; -import java.util.List; +package org.glassfish.jaxb.runtime.v2.runtime; +import com.sun.istack.FinalArrayList; +import com.sun.xml.bind.WhiteSpaceProcessor; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.ValidationEvent; import jakarta.xml.bind.helpers.ValidationEventImpl; -import javax.xml.stream.XMLStreamException; - -import com.sun.istack.FinalArrayList; -import com.sun.xml.bind.WhiteSpaceProcessor; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; - import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; +import java.lang.reflect.Array; +import java.util.List; + /** * {@link JaxBeanInfo} implementation that binds T[] to a list of simple types. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java index f41690a84..05655a6d3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/XMLSerializer.java @@ -8,51 +8,44 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime; - -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +package org.glassfish.jaxb.runtime.v2.runtime; +import com.sun.istack.SAXException2; +import org.glassfish.jaxb.runtime.CycleRecoverable; +import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.util.ValidationEventLocatorExImpl; +import com.sun.xml.bind.v2.WellKnownNamespace; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeBuiltinLeafInfo; +import org.glassfish.jaxb.runtime.v2.runtime.output.MTOMXmlOutput; +import org.glassfish.jaxb.runtime.v2.runtime.output.NamespaceContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.output.Pcdata; +import org.glassfish.jaxb.runtime.v2.runtime.output.XmlOutput; +import org.glassfish.jaxb.runtime.v2.runtime.property.Property; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Base64Data; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.IntData; +import org.glassfish.jaxb.runtime.v2.util.CollisionCheckStack; import jakarta.activation.MimeType; -import jakarta.xml.bind.DatatypeConverter; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Marshaller; -import jakarta.xml.bind.ValidationEvent; -import jakarta.xml.bind.ValidationEventHandler; -import jakarta.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.*; import jakarta.xml.bind.annotation.DomHandler; import jakarta.xml.bind.annotation.XmlNs; import jakarta.xml.bind.attachment.AttachmentMarshaller; import jakarta.xml.bind.helpers.NotIdentifiableEventImpl; import jakarta.xml.bind.helpers.ValidationEventImpl; import jakarta.xml.bind.helpers.ValidationEventLocatorImpl; +import org.xml.sax.SAXException; + import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.sax.SAXResult; - -import com.sun.istack.SAXException2; -import com.sun.xml.bind.CycleRecoverable; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; -import com.sun.xml.bind.util.ValidationEventLocatorExImpl; -import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.model.runtime.RuntimeBuiltinLeafInfo; -import com.sun.xml.bind.v2.runtime.output.MTOMXmlOutput; -import com.sun.xml.bind.v2.runtime.output.NamespaceContextImpl; -import com.sun.xml.bind.v2.runtime.output.Pcdata; -import com.sun.xml.bind.v2.runtime.output.XmlOutput; -import com.sun.xml.bind.v2.runtime.property.Property; -import com.sun.xml.bind.v2.runtime.unmarshaller.Base64Data; -import com.sun.xml.bind.v2.runtime.unmarshaller.IntData; -import com.sun.xml.bind.v2.util.CollisionCheckStack; - -import org.xml.sax.SAXException; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; /** * Receives XML serialization event and writes to {@link XmlOutput}. @@ -297,7 +290,7 @@ public void leafElement( Name tagName, String data, String fieldName ) throws SA try { out.text(data,false); } catch (IllegalArgumentException e) { - throw new IllegalArgumentException(Messages.ILLEGAL_CONTENT.format(fieldName, e.getMessage())); + throw new IllegalArgumentException(org.glassfish.jaxb.runtime.v2.runtime.Messages.ILLEGAL_CONTENT.format(fieldName, e.getMessage())); } out.endTag(tagName); nse = nse.pop(); @@ -310,13 +303,13 @@ public void leafElement( Name tagName, String data, String fieldName ) throws SA try { out.text(data, false); } catch (IllegalArgumentException e) { - throw new IllegalArgumentException(Messages.ILLEGAL_CONTENT.format(fieldName, e.getMessage())); + throw new IllegalArgumentException(org.glassfish.jaxb.runtime.v2.runtime.Messages.ILLEGAL_CONTENT.format(fieldName, e.getMessage())); } endElement(); } } - public void leafElement( Name tagName, Pcdata data, String fieldName ) throws SAXException, IOException, XMLStreamException { + public void leafElement(Name tagName, Pcdata data, String fieldName ) throws SAXException, IOException, XMLStreamException { if(seenRoot) { textHasAlreadyPrinted = false; nse = nse.push(); @@ -438,7 +431,7 @@ public String onIDREF( Object obj ) throws SAXException { if(id==null) { reportError( new NotIdentifiableEventImpl( ValidationEvent.ERROR, - Messages.NOT_IDENTIFIABLE.format(), + org.glassfish.jaxb.runtime.v2.runtime.Messages.NOT_IDENTIFIABLE.format(), new ValidationEventLocatorImpl(obj) ) ); } return id; @@ -506,7 +499,7 @@ public Marshaller getMarshaller() { // cycle detected and no one is catching the error. reportError(new ValidationEventImpl( ValidationEvent.ERROR, - Messages.CYCLE_IN_MARSHALLER.format(cycleDetectionStack.getCycleString()), + org.glassfish.jaxb.runtime.v2.runtime.Messages.CYCLE_IN_MARSHALLER.format(cycleDetectionStack.getCycleString()), getCurrentLocation(fieldName), null)); return null; @@ -632,7 +625,7 @@ public final void childAsXsiType( Object child, String fieldName, JaxBeanInfo ex if(actualTypeName==null) { reportError(new ValidationEventImpl( ValidationEvent.ERROR, - Messages.SUBSTITUTED_BY_ANONYMOUS_TYPE.format( + org.glassfish.jaxb.runtime.v2.runtime.Messages.SUBSTITUTED_BY_ANONYMOUS_TYPE.format( expected.jaxbType.getName(), child.getClass().getName(), actual.jaxbType.getName()), @@ -975,7 +968,7 @@ void reconcileID() throws SAXException { String id = getIdFromObject(idObj); reportError( new NotIdentifiableEventImpl( ValidationEvent.ERROR, - Messages.DANGLING_IDREF.format(id), + org.glassfish.jaxb.runtime.v2.runtime.Messages.DANGLING_IDREF.format(id), new ValidationEventLocatorImpl(idObj) ) ); } catch (JAXBException e) { // this error should have been reported already. just ignore here. @@ -1012,7 +1005,7 @@ public boolean handleEvent(ValidationEvent event) { private void reportMissingObjectError(String fieldName) throws SAXException { reportError(new ValidationEventImpl( ValidationEvent.ERROR, - Messages.MISSING_OBJECT.format(fieldName), + org.glassfish.jaxb.runtime.v2.runtime.Messages.MISSING_OBJECT.format(fieldName), getCurrentLocation(fieldName), new NullPointerException() )); } @@ -1023,7 +1016,7 @@ private void reportMissingObjectError(String fieldName) throws SAXException { public void errorMissingId(Object obj) throws SAXException { reportError( new ValidationEventImpl( ValidationEvent.ERROR, - Messages.MISSING_ID.format(obj), + org.glassfish.jaxb.runtime.v2.runtime.Messages.MISSING_ID.format(obj), new ValidationEventLocatorImpl(obj)) ); } @@ -1057,6 +1050,6 @@ public void clearCurrentProperty() { * returns the current {@link XMLSerializer} in charge. */ public static XMLSerializer getInstance() { - return (XMLSerializer)Coordinator._getInstance(); + return (XMLSerializer) _getInstance(); } } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/C14nXmlOutput.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/C14nXmlOutput.java index 6d38d9699..7380f50f9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/C14nXmlOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,18 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; + +import com.sun.istack.FinalArrayList; +import com.sun.xml.bind.marshaller.CharacterEscapeHandler; +import org.glassfish.jaxb.runtime.api.JAXBRIContext; +import org.glassfish.jaxb.runtime.v2.runtime.Name; import java.io.IOException; import java.io.OutputStream; import java.util.Arrays; import java.util.Collections; -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.istack.FinalArrayList; -import com.sun.xml.bind.marshaller.CharacterEscapeHandler; - /** * {@link XmlOutput} that generates canonical XML. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/DOMOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/DOMOutput.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/DOMOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/DOMOutput.java index 6e56282fa..4a4d3ce9d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/DOMOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/DOMOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; -import com.sun.xml.bind.v2.runtime.AssociationMap; import com.sun.xml.bind.marshaller.SAX2DOMEx; - +import org.glassfish.jaxb.runtime.v2.runtime.AssociationMap; import org.w3c.dom.Node; import org.xml.sax.SAXException; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/Encoded.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/Encoded.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/Encoded.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/Encoded.java index c88007886..6b268378e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/Encoded.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/Encoded.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; import java.io.IOException; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/FastInfosetStreamWriterOutput.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/FastInfosetStreamWriterOutput.java index e70b7a525..c4281424e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/FastInfosetStreamWriterOutput.java @@ -8,19 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; import com.sun.xml.bind.marshaller.NoEscapeHandler; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.unmarshaller.Base64Data; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Base64Data; import com.sun.xml.fastinfoset.EncodingConstants; import com.sun.xml.fastinfoset.stax.StAXDocumentSerializer; +import jakarta.xml.bind.JAXBContext; import org.jvnet.fastinfoset.VocabularyApplicationData; import org.xml.sax.SAXException; -import jakarta.xml.bind.JAXBContext; import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.util.Collection; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/ForkXmlOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/ForkXmlOutput.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/ForkXmlOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/ForkXmlOutput.java index b3dedb69f..c661b2bd1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/ForkXmlOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/ForkXmlOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,16 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; -import java.io.IOException; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.Name; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * {@link XmlOutput} that writes to two {@link XmlOutput}s. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/IndentingUTF8XmlOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/IndentingUTF8XmlOutput.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/IndentingUTF8XmlOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/IndentingUTF8XmlOutput.java index 675f7a94c..a20a4845a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/IndentingUTF8XmlOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/IndentingUTF8XmlOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; import com.sun.xml.bind.marshaller.CharacterEscapeHandler; -import java.io.IOException; -import java.io.OutputStream; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.v2.runtime.Name; - -import org.xml.sax.SAXException; +import java.io.IOException; +import java.io.OutputStream; /** * {@link UTF8XmlOutput} with indentation. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/MTOMXmlOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/MTOMXmlOutput.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/MTOMXmlOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/MTOMXmlOutput.java index b61d8e5d3..b4a3b0b9e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/MTOMXmlOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/MTOMXmlOutput.java @@ -8,20 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; - -import java.io.IOException; - -import jakarta.xml.bind.attachment.AttachmentMarshaller; -import javax.xml.stream.XMLStreamException; +package org.glassfish.jaxb.runtime.v2.runtime.output; import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.unmarshaller.Base64Data; - +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Base64Data; +import jakarta.xml.bind.attachment.AttachmentMarshaller; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + /** * {@link XmlOutput} decorator that supports MTOM. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/NamespaceContextImpl.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/NamespaceContextImpl.java index 50ad0b062..867529070 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/NamespaceContextImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,25 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; - -import java.io.IOException; -import java.util.Collections; -import java.util.Iterator; - -import javax.xml.XMLConstants; -import javax.xml.stream.XMLStreamException; +package org.glassfish.jaxb.runtime.v2.runtime.output; import com.sun.istack.NotNull; import com.sun.istack.Nullable; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; +import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper; import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.NamespaceContext2; -import com.sun.xml.bind.v2.runtime.XMLSerializer; - +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.NamespaceContext2; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; import org.xml.sax.SAXException; +import javax.xml.XMLConstants; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; +import java.util.Collections; +import java.util.Iterator; + /** * Keeps track of in-scope namespace bindings for the marshaller. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/Pcdata.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/Pcdata.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/Pcdata.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/Pcdata.java index 6a578110c..bdcf3f36b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/Pcdata.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/Pcdata.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; import java.io.IOException; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/SAXOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/SAXOutput.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/SAXOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/SAXOutput.java index 8e0199c17..2195bac8a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/SAXOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/SAXOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,19 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; - -import java.io.IOException; - -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.util.AttributesImpl; -import com.sun.xml.bind.v2.runtime.XMLSerializer; +package org.glassfish.jaxb.runtime.v2.runtime.output; +import org.glassfish.jaxb.runtime.util.AttributesImpl; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.LocatorImpl; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + /** * {@link XmlOutput} implementation that writes to SAX {@link ContentHandler}. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/SecureLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/SecureLoader.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/SecureLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/SecureLoader.java index cb79ff10a..b98ae0cc9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/SecureLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/SecureLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.model.annotation; +package org.glassfish.jaxb.runtime.v2.runtime.output; /** * Class defined for safe calls of getClassLoader methods of any kind (context/system/class diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/StAXExStreamWriterOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/StAXExStreamWriterOutput.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/StAXExStreamWriterOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/StAXExStreamWriterOutput.java index 05a62765a..d16f65852 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/StAXExStreamWriterOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/StAXExStreamWriterOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; - -import javax.xml.stream.XMLStreamException; +package org.glassfish.jaxb.runtime.v2.runtime.output; import com.sun.xml.bind.marshaller.NoEscapeHandler; -import com.sun.xml.bind.v2.runtime.unmarshaller.Base64Data; - +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Base64Data; import org.jvnet.staxex.XMLStreamWriterEx; +import javax.xml.stream.XMLStreamException; + /** * {@link XmlOutput} for {@link XMLStreamWriterEx}. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/UTF8XmlOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/UTF8XmlOutput.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/UTF8XmlOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/UTF8XmlOutput.java index 4cbed02b3..626cca6b1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/UTF8XmlOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/UTF8XmlOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,21 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; +import com.sun.xml.bind.marshaller.CharacterEscapeHandler; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.MarshallerImpl; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.xml.sax.SAXException; + +import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.io.OutputStream; - import java.io.StringWriter; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.marshaller.CharacterEscapeHandler; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.MarshallerImpl; - -import org.xml.sax.SAXException; /** * {@link XmlOutput} implementation specialized for UTF-8. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XMLEventWriterOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XMLEventWriterOutput.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XMLEventWriterOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XMLEventWriterOutput.java index e4b0c429e..76b6a496f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XMLEventWriterOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XMLEventWriterOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,19 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; -import java.io.IOException; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.xml.sax.SAXException; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.Attribute; import javax.xml.stream.events.Characters; - -import com.sun.xml.bind.v2.runtime.XMLSerializer; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * {@link XmlOutput} that writes to StAX {@link XMLEventWriter}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XMLStreamWriterOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XMLStreamWriterOutput.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XMLStreamWriterOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XMLStreamWriterOutput.java index a742b3886..b58546ec8 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XMLStreamWriterOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XMLStreamWriterOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,22 +8,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; - -import java.io.IOException; -import java.io.Writer; -import java.lang.reflect.Constructor; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; +package org.glassfish.jaxb.runtime.v2.runtime.output; import com.sun.xml.bind.marshaller.CharacterEscapeHandler; import com.sun.xml.bind.marshaller.NoEscapeHandler; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.XMLSerializer; - +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; +import java.io.IOException; +import java.io.Writer; +import java.lang.reflect.Constructor; + /** * {@link XmlOutput} that writes to StAX {@link XMLStreamWriter}. *

    diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XmlOutput.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XmlOutput.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XmlOutput.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XmlOutput.java index 633730bb9..5f7fbe011 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XmlOutput.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XmlOutput.java @@ -8,19 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; - -import java.io.IOException; +package org.glassfish.jaxb.runtime.v2.runtime.output; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.NameList; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; import jakarta.xml.bind.JAXBContext; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.NameList; -import com.sun.xml.bind.v2.runtime.XMLSerializer; - import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + /** * Well-formed XML writer. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XmlOutputAbstractImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XmlOutputAbstractImpl.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XmlOutputAbstractImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XmlOutputAbstractImpl.java index 1f2e2e515..9734932ed 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/XmlOutputAbstractImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/XmlOutputAbstractImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; -import java.io.IOException; -import java.io.OutputStream; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * Abstract implementation of {@link XmlOutput} diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/package-info.java similarity index 75% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/package-info.java index 88d5328bc..ae7af7668 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/output/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -11,4 +11,4 @@ /** * Code that writes well-formed XML ({@link XmlOutput} and its implementations}. */ -package com.sun.xml.bind.v2.runtime.output; +package org.glassfish.jaxb.runtime.v2.runtime.output; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/package-info.java similarity index 75% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/package-info.java index 6ce8223e8..c8b1bccf3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -11,4 +11,4 @@ /** * Code that implements JAXBContext, Unmarshaller, and Marshaller. */ -package com.sun.xml.bind.v2.runtime; +package org.glassfish.jaxb.runtime.v2.runtime; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayERProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayERProperty.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayERProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayERProperty.java index 993defedf..0399dd600 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayERProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayERProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,31 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; - -import java.io.IOException; -import java.util.Collection; +package org.glassfish.jaxb.runtime.v2.runtime.property; + +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Lister; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.*; +import org.xml.sax.SAXException; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.util.QNameMap; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Lister; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.TagName; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Receiver; -import com.sun.xml.bind.v2.runtime.unmarshaller.Scope; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.runtime.unmarshaller.XsiNilLoader; - -import org.xml.sax.SAXException; +import java.io.IOException; +import java.util.Collection; /** * Commonality between {@link ArrayElementProperty} and {@link ArrayReferenceNodeProperty}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayElementLeafProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementLeafProperty.java similarity index 76% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayElementLeafProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementLeafProperty.java index aaa7ad4b6..bdace9a87 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayElementLeafProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementLeafProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,20 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElementPropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.XMLSerializer; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * {@link ArrayProperty} that contains only one leaf type. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayElementNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementNodeProperty.java similarity index 72% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayElementNodeProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementNodeProperty.java index 6a06d1cc0..35116c6e7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayElementNodeProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementNodeProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,18 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElementPropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.XMLSerializer; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * {@link ArrayProperty} that contains node values. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayElementProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementProperty.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayElementProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementProperty.java index 244b8dcd2..04abab8c8 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayElementProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayElementProperty.java @@ -8,42 +8,31 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; +import org.glassfish.jaxb.runtime.api.AccessorException; +import com.sun.xml.bind.v2.model.core.PropertyKind; +import com.sun.xml.bind.v2.model.core.TypeRef; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElementPropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeRef; +import com.sun.xml.bind.v2.runtime.RuntimeUtil; +import org.glassfish.jaxb.runtime.v2.runtime.*; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Lister; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.NullSafeAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.*; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; +import jakarta.xml.bind.JAXBException; +import org.xml.sax.SAXException; + +import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.lang.reflect.Type; import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.xml.bind.JAXBException; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.core.TypeRef; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeRef; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.RuntimeUtil; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.ListIterator; -import com.sun.xml.bind.v2.runtime.reflect.Lister; -import com.sun.xml.bind.v2.runtime.reflect.NullSafeAccessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.DefaultValueLoaderDecorator; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Receiver; -import com.sun.xml.bind.v2.runtime.unmarshaller.TextLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.XsiNilLoader; -import com.sun.xml.bind.v2.util.QNameMap; - -import org.xml.sax.SAXException; - /** * {@link Property} implementation for multi-value property that maps to an element. * @@ -55,7 +44,7 @@ abstract class ArrayElementProperty extends ArrayERProperty,JaxBeanInfo> refs = new HashMap, JaxBeanInfo>(); + private Map, JaxBeanInfo> refs = new HashMap, JaxBeanInfo>(); /** * Set by the constructor and reset in the {@link #wrapUp()} method. */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayProperty.java similarity index 73% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayProperty.java index 4af3de46c..4b4f9b5cd 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,14 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.Lister; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Lister; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayReferenceNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayReferenceNodeProperty.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayReferenceNodeProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayReferenceNodeProperty.java index 42a99d9d1..ff3684efa 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ArrayReferenceNodeProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ArrayReferenceNodeProperty.java @@ -8,33 +8,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; - -import java.io.IOException; - -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.annotation.DomHandler; -import javax.xml.stream.XMLStreamException; +package org.glassfish.jaxb.runtime.v2.runtime.property; import com.sun.xml.bind.v2.ClassFactory; import com.sun.xml.bind.v2.model.core.PropertyKind; import com.sun.xml.bind.v2.model.core.WildcardMode; -import com.sun.xml.bind.v2.model.runtime.RuntimeElement; -import com.sun.xml.bind.v2.model.runtime.RuntimeReferencePropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.ListIterator; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Receiver; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.runtime.unmarshaller.WildcardLoader; -import com.sun.xml.bind.v2.util.QNameMap; - +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeReferencePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.annotation.DomHandler; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.*; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/AttributeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/AttributeProperty.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/AttributeProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/AttributeProperty.java index 2d35f7255..b3784ea95 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/AttributeProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/AttributeProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,27 +8,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; - -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.util.QNameMap; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.model.core.AttributePropertyInfo; import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.runtime.RuntimeAttributePropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; - +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeAttributePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.ChildLoader; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + /** * {@link Property} implementation for {@link AttributePropertyInfo}. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ListElementProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ListElementProperty.java similarity index 71% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ListElementProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ListElementProperty.java index 121e729ca..08178b544 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ListElementProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ListElementProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,32 +8,30 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; - -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.util.QNameMap; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; import com.sun.xml.bind.v2.model.core.ElementPropertyInfo; import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeRef; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.ListTransducedAccessorImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.DefaultValueLoaderDecorator; -import com.sun.xml.bind.v2.runtime.unmarshaller.LeafPropertyLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; - +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElementPropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeRef; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.ListTransducedAccessorImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.ChildLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.DefaultValueLoaderDecorator; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.LeafPropertyLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + /** * {@link Property} implementation for {@link ElementPropertyInfo} whose * {@link ElementPropertyInfo#isValueList()} is true. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Messages.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Messages.java index 2e1f822fe..3d45161ae 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/Property.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Property.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/Property.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Property.java index 63da35dc3..bee2874dd 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/Property.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Property.java @@ -8,25 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; - -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBElement; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.model.core.ID; import com.sun.xml.bind.v2.model.core.PropertyInfo; import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; - +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + /** * A JAXB property that constitutes a JAXB-bound bean. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/PropertyFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/PropertyFactory.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/PropertyFactory.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/PropertyFactory.java index 353e883ab..39811dc9f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/PropertyFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/PropertyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,22 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; +package org.glassfish.jaxb.runtime.v2.runtime.property; import com.sun.xml.bind.v2.model.core.ClassInfo; import com.sun.xml.bind.v2.model.core.ID; import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.runtime.RuntimeAttributePropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElement; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeValuePropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.model.runtime.*; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.Collection; /** * Create {@link Property} objects. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/PropertyImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/PropertyImpl.java similarity index 80% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/PropertyImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/PropertyImpl.java index b9818c012..72cb4eee5 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/PropertyImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/PropertyImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,19 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleElementLeafProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementLeafProperty.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleElementLeafProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementLeafProperty.java index 186aee1f9..f9b0d443a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleElementLeafProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementLeafProperty.java @@ -8,35 +8,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; -import java.lang.reflect.Modifier; - -import jakarta.xml.bind.JAXBElement; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.model.core.ID; import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeRef; -import com.sun.xml.bind.v2.runtime.ClassBeanInfoImpl; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.DefaultValueLoaderDecorator; -import com.sun.xml.bind.v2.runtime.unmarshaller.LeafPropertyLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.LeafPropertyXsiLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.XsiNilLoader; -import com.sun.xml.bind.v2.util.QNameMap; - +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElementPropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeRef; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; +import jakarta.xml.bind.JAXBElement; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.*; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; +import java.lang.reflect.Modifier; + /** * {@link Property} that contains a leaf value. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleElementNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementNodeProperty.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleElementNodeProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementNodeProperty.java index 0be128678..2df7a72db 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleElementNodeProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleElementNodeProperty.java @@ -8,37 +8,35 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; +import org.glassfish.jaxb.runtime.api.AccessorException; +import com.sun.xml.bind.v2.model.core.PropertyKind; +import com.sun.xml.bind.v2.model.core.TypeRef; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElementPropertyInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeTypeRef; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.ChildLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.DefaultValueLoaderDecorator; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.XsiNilLoader; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; +import jakarta.xml.bind.JAXBElement; +import org.xml.sax.SAXException; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; import java.io.IOException; import java.lang.reflect.Modifier; import java.lang.reflect.Type; import java.util.HashMap; import java.util.Map; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.core.TypeRef; -import com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeTypeRef; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.DefaultValueLoaderDecorator; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.XsiNilLoader; -import com.sun.xml.bind.v2.util.QNameMap; - -import jakarta.xml.bind.JAXBElement; -import org.xml.sax.SAXException; - /** * @author Kohsuke Kawaguchi (kk@kohsuke.org) */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleMapNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleMapNodeProperty.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleMapNodeProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleMapNodeProperty.java index 740f4fc03..711227466 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleMapNodeProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleMapNodeProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,40 +8,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.TreeMap; -import java.util.Collection; -import java.util.Collections; -import java.util.Arrays; -import java.util.Set; - -import javax.xml.stream.XMLStreamException; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.ClassFactory; -import com.sun.xml.bind.v2.util.QNameMap; import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.runtime.RuntimeMapPropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.TagName; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Receiver; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext.State; - +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeMapPropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.*; import org.xml.sax.SAXException; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; +import java.util.*; + /** * @author Kohsuke Kawaguchi */ @@ -150,7 +136,7 @@ public void startElement(UnmarshallingContext.State state, TagName ea) throws SA } @Override - public void leaveElement(State state, TagName ea) throws SAXException { + public void leaveElement(UnmarshallingContext.State state, TagName ea) throws SAXException { super.leaveElement(state, ea); try { acc.set(Stack.pop(target), Stack.pop(map)); diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleReferenceNodeProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleReferenceNodeProperty.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleReferenceNodeProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleReferenceNodeProperty.java index 2276106a7..d197ea71f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/SingleReferenceNodeProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/SingleReferenceNodeProperty.java @@ -8,33 +8,31 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; - -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.annotation.DomHandler; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.ClassFactory; import com.sun.xml.bind.v2.model.core.PropertyKind; import com.sun.xml.bind.v2.model.core.WildcardMode; -import com.sun.xml.bind.v2.model.runtime.RuntimeElement; -import com.sun.xml.bind.v2.model.runtime.RuntimeReferencePropertyInfo; -import com.sun.xml.bind.v2.runtime.ElementBeanInfoImpl; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.WildcardLoader; -import com.sun.xml.bind.v2.util.QNameMap; - +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeElement; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeReferencePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.ElementBeanInfoImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.ChildLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.WildcardLoader; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.annotation.DomHandler; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/StructureLoaderBuilder.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/StructureLoaderBuilder.java similarity index 80% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/StructureLoaderBuilder.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/StructureLoaderBuilder.java index 6a71caef5..5ad248d55 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/StructureLoaderBuilder.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/StructureLoaderBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import javax.xml.namespace.QName; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.ChildLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.StructureLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.ValuePropertyLoader; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; -import com.sun.xml.bind.v2.util.QNameMap; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.StructureLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.ValuePropertyLoader; +import javax.xml.namespace.QName; /** * Component that contributes element unmarshallers into diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/TagAndType.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/TagAndType.java similarity index 72% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/TagAndType.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/TagAndType.java index 2f9dc2a16..1ede474b9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/TagAndType.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/TagAndType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import javax.xml.namespace.QName; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.Name; +import javax.xml.namespace.QName; /** * Pair of {@link QName} and {@link JaxBeanInfo}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/UnmarshallerChain.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/UnmarshallerChain.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/UnmarshallerChain.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/UnmarshallerChain.java index 61857e3e8..76bead034 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/UnmarshallerChain.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/UnmarshallerChain.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.unmarshaller.Scope; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Scope; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Utils.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Utils.java new file mode 100644 index 000000000..ceb6b6886 --- /dev/null +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/Utils.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0, which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.glassfish.jaxb.runtime.v2.runtime.property; + +import com.sun.xml.bind.v2.model.nav.Navigator; + +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Utils class. + * + * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages. + * + * Has *package private* access to avoid inappropriate usage. + */ +final class Utils { + + private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); + + /** + * static ReflectionNavigator field to avoid usage of reflection every time we use it. + */ + static final Navigator REFLECTION_NAVIGATOR; + + static { // we statically initializing REFLECTION_NAVIGATOR property + try { + final Class refNav = Class.forName("com.sun.xml.bind.v2.model.nav.ReflectionNavigator"); + + // requires accessClassInPackage privilege + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction() { + @Override + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } + } + } + ); + + //noinspection unchecked + REFLECTION_NAVIGATOR = (Navigator) getInstance.invoke(null); + } catch (ClassNotFoundException e) { + throw new IllegalStateException("Can't find ReflectionNavigator class"); + } catch (InvocationTargetException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); + } catch (IllegalAccessException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); + } catch (SecurityException e) { + LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e); + throw e; + } + } + + /** + * private constructor to avoid util class instantiating + */ + private Utils() { + } +} diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ValueProperty.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ValueProperty.java similarity index 76% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ValueProperty.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ValueProperty.java index 2f8743bfe..eb896c291 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/ValueProperty.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/property/ValueProperty.java @@ -8,27 +8,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.property; -import java.io.IOException; - -import jakarta.xml.bind.annotation.XmlValue; -import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.model.core.PropertyKind; -import com.sun.xml.bind.v2.model.runtime.RuntimeValuePropertyInfo; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.unmarshaller.ChildLoader; -import com.sun.xml.bind.v2.runtime.unmarshaller.ValuePropertyLoader; -import com.sun.xml.bind.v2.util.QNameMap; - +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeValuePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.ChildLoader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.ValuePropertyLoader; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; +import jakarta.xml.bind.annotation.XmlValue; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; + /** * {@link Property} implementation for {@link XmlValue} properties. * @@ -66,7 +64,7 @@ public boolean hasSerializeURIAction() { } public void buildChildElementUnmarshallers(UnmarshallerChain chainElem, QNameMap handlers) { - handlers.put(StructureLoaderBuilder.TEXT_HANDLER, + handlers.put(TEXT_HANDLER, new ChildLoader(new ValuePropertyLoader(xacc),null)); } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Accessor.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Accessor.java index c45f2b05f..4bb7bd6ab 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Accessor.java @@ -8,13 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.Type; +import com.sun.istack.Nullable; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.api.JAXBRIContext; +import com.sun.xml.bind.v2.model.core.Adapter; +import org.glassfish.jaxb.runtime.v2.model.impl.RuntimeModelBuilder; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.opt.OptimizedAccessorFactory; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Loader; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Receiver; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import org.xml.sax.SAXException; + +import java.lang.reflect.*; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -22,22 +32,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.annotation.adapters.XmlAdapter; - -import com.sun.istack.Nullable; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.api.JAXBRIContext; -import com.sun.xml.bind.v2.model.core.Adapter; -import com.sun.xml.bind.v2.model.impl.RuntimeModelBuilder; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.reflect.opt.OptimizedAccessorFactory; -import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -import com.sun.xml.bind.v2.runtime.unmarshaller.Receiver; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; - -import org.xml.sax.SAXException; - /** * Accesses a particular property of a bean. *

    diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedAccessor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/AdaptedAccessor.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedAccessor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/AdaptedAccessor.java index 9f9573047..a9f248598 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedAccessor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/AdaptedAccessor.java @@ -8,14 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import jakarta.xml.bind.annotation.adapters.XmlAdapter; - -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.ClassFactory; import com.sun.xml.bind.v2.model.core.Adapter; -import com.sun.xml.bind.v2.runtime.Coordinator; +import org.glassfish.jaxb.runtime.v2.runtime.Coordinator; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * {@link Accessor} that adapts the value by using {@link Adapter}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedLister.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/AdaptedLister.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedLister.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/AdaptedLister.java index 0a66a85c0..3aaeef99e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedLister.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/AdaptedLister.java @@ -8,15 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.Coordinator; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; import jakarta.xml.bind.JAXBException; - -import com.sun.xml.bind.v2.runtime.Coordinator; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.api.AccessorException; - +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.xml.sax.SAXException; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/DefaultTransducedAccessor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/DefaultTransducedAccessor.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/DefaultTransducedAccessor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/DefaultTransducedAccessor.java index 624f56742..0ace0380e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/DefaultTransducedAccessor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/DefaultTransducedAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import java.io.IOException; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.Name; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * {@link TransducedAccessor} that prints to {@link String}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/ListIterator.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/ListIterator.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/ListIterator.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/ListIterator.java index 9fd5c0137..7ca302438 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/ListIterator.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/ListIterator.java @@ -8,14 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; - -import java.util.Iterator; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; import jakarta.xml.bind.JAXBException; - import org.xml.sax.SAXException; +import java.util.Iterator; + /** * Almost like {@link Iterator} but can throw JAXB specific exceptions. * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/ListTransducedAccessorImpl.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/ListTransducedAccessorImpl.java index 440e255ae..59e607f73 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/ListTransducedAccessorImpl.java @@ -8,15 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; - -import jakarta.xml.bind.JAXBException; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; import com.sun.xml.bind.WhiteSpaceProcessor; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.XMLSerializer; - +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import jakarta.xml.bind.JAXBException; import org.xml.sax.SAXException; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java index 8b9bd8bd4..c2397a0dc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Lister.java @@ -8,41 +8,28 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; - -import java.lang.ref.WeakReference; -import java.lang.reflect.Array; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.LinkedList; -import java.util.HashSet; -import java.util.TreeSet; -import java.util.Stack; -import java.util.concurrent.Callable; - -import jakarta.xml.bind.JAXBException; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; import com.sun.istack.SAXException2; -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.ClassFactory; import com.sun.xml.bind.v2.TODO; import com.sun.xml.bind.v2.model.core.Adapter; import com.sun.xml.bind.v2.model.core.ID; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.unmarshaller.Patcher; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; - +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Patcher; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import jakarta.xml.bind.JAXBException; import org.xml.sax.SAXException; +import java.lang.ref.WeakReference; +import java.lang.reflect.Array; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.*; +import java.util.concurrent.Callable; + /** * Used to list individual values of a multi-value property, and * to pack individual values into a multi-value property. @@ -59,7 +46,7 @@ protected Lister() {} * @param context * This parameter is used to support ID/IDREF handling. */ - public abstract ListIterator iterator(PropT multiValueProp, XMLSerializer context); + public abstract org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator iterator(PropT multiValueProp, XMLSerializer context); /** * Setting values to a multi-value property starts by creating @@ -172,8 +159,8 @@ public ArrayLister(Class itemType) { this.itemType = itemType; } - public ListIterator iterator(final ItemT[] objects, XMLSerializer context) { - return new ListIterator() { + public org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator iterator(final ItemT[] objects, XMLSerializer context) { + return new org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator() { int idx=0; public boolean hasNext() { return idx implClass) { this.implClass = implClass; } - public ListIterator iterator(T collection, XMLSerializer context) { + public org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator iterator(T collection, XMLSerializer context) { final Iterator itr = collection.iterator(); - return new ListIterator() { + return new org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator() { public boolean hasNext() { return itr.hasNext(); } @@ -316,8 +303,8 @@ public IDREFS(Lister core, Class itemType) { this.itemType = itemType; } - public ListIterator iterator(PropT prop, XMLSerializer context) { - final ListIterator i = core.iterator(prop,context); + public org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator iterator(PropT prop, XMLSerializer context) { + final org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator i = core.iterator(prop,context); return new IDREFSIterator(i, context); } @@ -401,12 +388,12 @@ public void run() throws SAXException { * Only in ArrayElementProperty we need to get the actual * referenced object. This is a kind of ugly way to make that work. */ - public static final class IDREFSIterator implements ListIterator { - private final ListIterator i; + public static final class IDREFSIterator implements org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator { + private final org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator i; private final XMLSerializer context; private Object last; - private IDREFSIterator(ListIterator i, XMLSerializer context) { + private IDREFSIterator(org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator i, XMLSerializer context) { this.i = i; this.context = context; } @@ -441,7 +428,7 @@ public static Lister getErrorInstance() { } public static final Lister ERROR = new Lister() { - public ListIterator iterator(Object o, XMLSerializer context) { + public org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator iterator(Object o, XMLSerializer context) { return EMPTY_ITERATOR; } @@ -459,7 +446,7 @@ public void reset(Object o, Accessor accessor) { } }; - private static final ListIterator EMPTY_ITERATOR = new ListIterator() { + private static final org.glassfish.jaxb.runtime.v2.runtime.reflect.ListIterator EMPTY_ITERATOR = new ListIterator() { public boolean hasNext() { return false; } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages.java index 61d2f7b41..4860be6a7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/NullSafeAccessor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/NullSafeAccessor.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/NullSafeAccessor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/NullSafeAccessor.java index 3e1330be1..da04ba85b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/NullSafeAccessor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/NullSafeAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; /** * {@link Accessor} wrapper that replaces a null with an empty collection. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerBoolean.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerBoolean.java index b3beee0f6..45119f0bc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerBoolean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerByte.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerByte.java index d0df76709..f777caba6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerByte.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. @@ -26,7 +26,7 @@ private PrimitiveArrayListerByte() { } /*package*/ static void register() { - Lister.primitiveArrayListers.put(Byte.TYPE,new PrimitiveArrayListerByte()); + primitiveArrayListers.put(Byte.TYPE,new PrimitiveArrayListerByte()); } public ListIterator iterator(final byte[] objects, XMLSerializer context) { diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerCharacter.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerCharacter.java index 3857e8fc6..acd7542cb 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerCharacter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. @@ -29,7 +29,7 @@ private PrimitiveArrayListerCharacter() { } /*package*/ static void register() { - Lister.primitiveArrayListers.put(Character.TYPE,new PrimitiveArrayListerCharacter()); + primitiveArrayListers.put(Character.TYPE,new PrimitiveArrayListerCharacter()); } public ListIterator iterator(final char[] objects, XMLSerializer context) { diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerDouble.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerDouble.java index c40bd3389..bd42b09f2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerDouble.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerFloat.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerFloat.java index b8b1d251f..8a6173394 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerFloat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerInteger.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerInteger.java index 4bc4106b3..e531babcc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerInteger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. @@ -29,7 +29,7 @@ private PrimitiveArrayListerInteger() { } /*package*/ static void register() { - Lister.primitiveArrayListers.put(Integer.TYPE,new PrimitiveArrayListerInteger()); + primitiveArrayListers.put(Integer.TYPE,new PrimitiveArrayListerInteger()); } public ListIterator iterator(final int[] objects, XMLSerializer context) { diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerLong.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerLong.java index 905979593..1aace4980 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerLong.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerShort.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerShort.java index 44d64a409..4cf8d5425 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/PrimitiveArrayListerShort.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; /** * {@link Lister} for primitive type arrays. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/TransducedAccessor.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/TransducedAccessor.java index 7f04c26f2..59a6427ac 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/TransducedAccessor.java @@ -8,35 +8,33 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect; - -import java.io.IOException; -import java.util.concurrent.Callable; - -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.annotation.XmlValue; -import javax.xml.stream.XMLStreamException; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; import com.sun.istack.NotNull; import com.sun.istack.Nullable; import com.sun.istack.SAXException2; import com.sun.xml.bind.WhiteSpaceProcessor; -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.model.core.ID; -import com.sun.xml.bind.v2.model.impl.RuntimeModelBuilder; -import com.sun.xml.bind.v2.model.runtime.RuntimeNonElementRef; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.Transducer; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.reflect.opt.OptimizedTransducedAccessorFactory; -import com.sun.xml.bind.v2.runtime.unmarshaller.Patcher; -import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; +import org.glassfish.jaxb.runtime.v2.model.impl.RuntimeModelBuilder; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeNonElementRef; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.opt.OptimizedTransducedAccessorFactory; import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; - +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Patcher; +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.UnmarshallingContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.annotation.XmlValue; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import java.io.IOException; +import java.util.concurrent.Callable; + /** * {@link Accessor} and {@link Transducer} combined into one object. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/Utils.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Utils.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/Utils.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Utils.java index 1aa40e2f4..a018afeaa 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/property/Utils.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.property; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; import com.sun.xml.bind.v2.model.nav.Navigator; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/AccessorInjector.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/AccessorInjector.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/AccessorInjector.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/AccessorInjector.java index 62b2c43be..7497f3e95 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/AccessorInjector.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/AccessorInjector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,15 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; + +import com.sun.xml.bind.Utils; +import org.glassfish.jaxb.runtime.v2.bytecode.ClassTailor; import java.io.InputStream; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.xml.bind.Utils; -import com.sun.xml.bind.v2.bytecode.ClassTailor; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Bean.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Bean.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Bean.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Bean.java index b1eeeb9b7..d924f4be1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Bean.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Bean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Used by {@link TransducedAccessor} templates. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Const.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Const.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Const.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Const.java index a52ada7ec..1c3d470fc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Const.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Const.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Boolean.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Boolean.java index 48f0d77cc..84cabd28c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Boolean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean fields. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Byte.java similarity index 81% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Byte.java index fb52b8ea3..326f660e4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Byte.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for byte fields. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Character.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Character.java index 65665a52e..054b915a0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Character.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for char fields. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Double.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Double.java index a565d6ed2..354e4ea50 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Double.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for double fields. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Float.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Float.java index 10b5844ee..e58e1630f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Float.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for float fields. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Integer.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Integer.java index 6f5865e28..56f8f3469 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Integer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for int fields. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Long.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Long.java index 9e4b67106..afa6c6ed9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Long.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for long fields. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Ref.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Ref.java index e4f1146b6..f75d1b392 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Ref.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for reference type fields. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Short.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Short.java index 0e33f5218..bab690b3f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/FieldAccessor_Short.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for short fields. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Injector.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Injector.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Injector.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Injector.java index 746fc9983..ee60f44bd 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Injector.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Injector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,29 +8,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; + +import java.lang.ref.WeakReference; +import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.lang.ref.WeakReference; -import java.security.AccessController; -import java.security.PrivilegedAction; +import java.security.*; import java.util.Arrays; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.HashMap; import java.util.Map; import java.util.WeakHashMap; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import java.lang.reflect.Field; -import java.security.CodeSource; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; -import java.security.ProtectionDomain; - /** * A {@link ClassLoader} used to "inject" optimized accessor classes * into the VM. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Boolean.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Boolean.java index 3f1a6d508..8ecb42df3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Boolean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Byte.java similarity index 81% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Byte.java index 1604a2b6b..387b25030 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Byte.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Character.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Character.java index 1705c422b..e7ba9a39d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Character.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Double.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Double.java index 994d37946..ce333328a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Double.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Float.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Float.java index 972ac192e..bc9ca03a2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Float.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Integer.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Integer.java index d07758fb6..3458134a4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Integer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Long.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Long.java index efa87fb97..9c279fe27 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Long.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Ref.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Ref.java index de2cfb39d..fe69f2adc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Ref.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for reference types getter/setter. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Short.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Short.java index 2841fe19e..e1159b50e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/MethodAccessor_Short.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; /** * Template {@link Accessor} for boolean getter/setter. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedAccessorFactory.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedAccessorFactory.java index 733bfca26..66db3a5f9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedAccessorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; + +import com.sun.xml.bind.v2.runtime.RuntimeUtil; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -16,11 +19,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.RuntimeUtil; - -import static com.sun.xml.bind.v2.bytecode.ClassTailor.toVMClassName; -import static com.sun.xml.bind.v2.bytecode.ClassTailor.toVMTypeName; +import static org.glassfish.jaxb.runtime.v2.bytecode.ClassTailor.toVMClassName; +import static org.glassfish.jaxb.runtime.v2.bytecode.ClassTailor.toVMTypeName; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java index 689012e58..e92fb56b6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -7,7 +7,14 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; + +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; + +import com.sun.xml.bind.v2.model.core.TypeInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimeClassInfo; +import org.glassfish.jaxb.runtime.v2.model.runtime.RuntimePropertyInfo; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -17,13 +24,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.xml.bind.v2.model.core.TypeInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimeClassInfo; -import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; - -import static com.sun.xml.bind.v2.bytecode.ClassTailor.toVMClassName; +import static org.glassfish.jaxb.runtime.v2.bytecode.ClassTailor.toVMClassName; /** * Prepares optimized {@link TransducedAccessor} from templates. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Ref.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Ref.java similarity index 67% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Ref.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Ref.java index 9f73dd292..2394ed899 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/Ref.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/Ref.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Used by {@link TransducedAccessor} templates. diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/SecureLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/SecureLoader.java new file mode 100644 index 000000000..bdcfe702a --- /dev/null +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/SecureLoader.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0, which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; + +/** + * Class defined for safe calls of getClassLoader methods of any kind (context/system/class + * classloader. This MUST be package private and defined in every package which + * uses such invocations. + * @author snajper + */ +class SecureLoader { + + static ClassLoader getContextClassLoader() { + if (System.getSecurityManager() == null) { + return Thread.currentThread().getContextClassLoader(); + } else { + return (ClassLoader) java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public java.lang.Object run() { + return Thread.currentThread().getContextClassLoader(); + } + }); + } + } + + static ClassLoader getClassClassLoader(final Class c) { + if (System.getSecurityManager() == null) { + return c.getClassLoader(); + } else { + return (ClassLoader) java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public java.lang.Object run() { + return c.getClassLoader(); + } + }); + } + } + + static ClassLoader getSystemClassLoader() { + if (System.getSecurityManager() == null) { + return ClassLoader.getSystemClassLoader(); + } else { + return (ClassLoader) java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public java.lang.Object run() { + return ClassLoader.getSystemClassLoader(); + } + }); + } + } + +} diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java similarity index 74% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java index db6d90519..d2958c781 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a boolean field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java similarity index 73% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java index e88f05618..fe3074cd8 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a byte field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java similarity index 74% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java index 53b01f03f..f073ffd3d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a double field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java similarity index 74% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java index a4037d583..50fd2470f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a float field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java similarity index 71% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java index 203bcd03d..7d1695cdf 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,20 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import java.io.IOException; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * Template {@link TransducedAccessor} for a byte field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java similarity index 74% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java index 5d5fedfbb..aa99a4546 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a long field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java similarity index 74% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java index bd99dc78f..bb9cd9e2d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a short field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java index f2995b9bc..0f0a522e4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a boolean field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java similarity index 77% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java index 9e7e369fe..bc765f038 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a byte field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java index 811f3cc51..bbbb480e0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a double field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java index 89146e705..85cebd1e6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a float field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java similarity index 71% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java index c827c13d7..7dc35e366 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,20 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import java.io.IOException; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.Name; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; +import org.xml.sax.SAXException; import javax.xml.stream.XMLStreamException; - -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; - -import org.xml.sax.SAXException; +import java.io.IOException; /** * Template {@link TransducedAccessor} for a byte field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java index a1e8d1414..4b85a8a87 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a long field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java index 6006c4b7c..8e4ba66ae 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.DefaultTransducedAccessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; /** * Template {@link TransducedAccessor} for a short field. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/package-info.java similarity index 61% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/package-info.java index 427d90e65..969769db5 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/opt/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/opt/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -10,12 +10,12 @@ /** * Hosts optimized - * {@link com.sun.xml.bind.v2.runtime.reflect.Accessor}, - * {@link com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor}, and {@link com.sun.xml.bind.v2.runtime.Transducer}. + * {@link org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor}, + * {@link org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor}, and {@link org.glassfish.jaxb.runtime.v2.runtime.Transducer}. * *

    How it works

    *

    * Most of the classes in this package are "templates." At run-time, A template class file is slightly modified to match * the target Java Bean, then it will be loaded into the VM. */ -package com.sun.xml.bind.v2.runtime.reflect.opt; +package org.glassfish.jaxb.runtime.v2.runtime.reflect.opt; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/package-info.java similarity index 73% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/package-info.java index 517b9cc95..ba339b033 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/reflect/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -11,4 +11,4 @@ /** * Abstraction around accessing data of actual objects. */ -package com.sun.xml.bind.v2.runtime.reflect; +package org.glassfish.jaxb.runtime.v2.runtime.reflect; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/AttributesEx.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/AttributesEx.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/AttributesEx.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/AttributesEx.java index 31413e939..3c1ba4b51 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/AttributesEx.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/AttributesEx.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import org.xml.sax.Attributes; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/AttributesExImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/AttributesExImpl.java similarity index 79% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/AttributesExImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/AttributesExImpl.java index deb7e74b1..c884889f8 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/AttributesExImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/AttributesExImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,9 +8,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; -import com.sun.xml.bind.util.AttributesImpl; +import org.glassfish.jaxb.runtime.util.AttributesImpl; /** * {@link AttributesEx} implementation. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Base64Data.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Base64Data.java index 9ce389e83..74e84e04d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Base64Data.java @@ -8,25 +8,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import com.sun.istack.Nullable; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.v2.runtime.XMLSerializer; +import org.glassfish.jaxb.runtime.v2.runtime.output.Pcdata; +import org.glassfish.jaxb.runtime.v2.runtime.output.UTF8XmlOutput; +import org.glassfish.jaxb.runtime.v2.util.ByteArrayOutputStreamEx; import jakarta.activation.DataHandler; import jakarta.activation.DataSource; -import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; - -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.runtime.XMLSerializer; -import com.sun.xml.bind.v2.runtime.output.Pcdata; -import com.sun.xml.bind.v2.runtime.output.UTF8XmlOutput; -import com.sun.xml.bind.v2.util.ByteArrayOutputStreamEx; -import com.sun.istack.Nullable; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; /** * Fed to unmarshaller when the 'text' data is actually diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ChildLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ChildLoader.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ChildLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ChildLoader.java index 4c7f9d599..09ffc90bc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ChildLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ChildLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; /** * Pair of {@link Loader} and {@link Receiver}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/DefaultIDResolver.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/DefaultIDResolver.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/DefaultIDResolver.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/DefaultIDResolver.java index 3c2e6decf..697385fd6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/DefaultIDResolver.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/DefaultIDResolver.java @@ -8,17 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import java.util.HashMap; -import java.util.concurrent.Callable; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import org.glassfish.jaxb.runtime.IDResolver; import jakarta.xml.bind.ValidationEventHandler; - -import com.sun.xml.bind.IDResolver; - import org.xml.sax.SAXException; +import java.util.HashMap; +import java.util.concurrent.Callable; + /** * Default implementation of {@link IDResolver}. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java index 3934d1f18..717fce738 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import org.xml.sax.SAXException; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Discarder.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Discarder.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Discarder.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Discarder.java index 3bf55af38..31d07181e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Discarder.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Discarder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/DomLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/DomLoader.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/DomLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/DomLoader.java index a09c03b50..19b5fe89c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/DomLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/DomLoader.java @@ -8,13 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; import jakarta.xml.bind.annotation.DomHandler; +import org.xml.sax.SAXException; + import javax.xml.transform.Result; import javax.xml.transform.sax.TransformerHandler; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import org.xml.sax.SAXException; /** * Loads a DOM. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/FastInfosetConnector.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/FastInfosetConnector.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/FastInfosetConnector.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/FastInfosetConnector.java index 9ab64e224..d1d01318c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/FastInfosetConnector.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/FastInfosetConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import javax.xml.stream.Location; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import com.sun.xml.bind.WhiteSpaceProcessor; import com.sun.xml.fastinfoset.stax.StAXDocumentParser; import org.jvnet.fastinfoset.EncodingAlgorithmIndexes; import org.xml.sax.SAXException; +import javax.xml.stream.Location; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; + /** * Reads from FastInfoset StAX parser and feeds into JAXB Unmarshaller. *

    diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/IntArrayData.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/IntArrayData.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/IntArrayData.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/IntArrayData.java index 28bfee089..cdff75dd4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/IntArrayData.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/IntArrayData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; -import java.io.IOException; +import org.glassfish.jaxb.runtime.v2.runtime.output.Pcdata; +import org.glassfish.jaxb.runtime.v2.runtime.output.UTF8XmlOutput; -import com.sun.xml.bind.v2.runtime.output.Pcdata; -import com.sun.xml.bind.v2.runtime.output.UTF8XmlOutput; +import java.io.IOException; /** * Typed {@link CharSequence} for int[]. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/IntData.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/IntData.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/IntData.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/IntData.java index 768a10e18..dad4e42e8 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/IntData.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/IntData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; -import java.io.IOException; +import org.glassfish.jaxb.runtime.v2.runtime.output.Pcdata; +import org.glassfish.jaxb.runtime.v2.runtime.output.UTF8XmlOutput; -import com.sun.xml.bind.v2.runtime.output.Pcdata; -import com.sun.xml.bind.v2.runtime.output.UTF8XmlOutput; +import java.io.IOException; /** * {@link Pcdata} that represents a single integer. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Intercepter.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Intercepter.java similarity index 75% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Intercepter.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Intercepter.java index db383f3b2..53a4486fa 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Intercepter.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Intercepter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import org.glassfish.jaxb.runtime.v2.runtime.ElementBeanInfoImpl; import org.xml.sax.SAXException; /** - * Used solely by {@link com.sun.xml.bind.v2.runtime.ElementBeanInfoImpl} to wrap + * Used solely by {@link ElementBeanInfoImpl} to wrap * the loaded value object into a JAXBElement object. * * UGLY HACK. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/InterningXmlVisitor.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/InterningXmlVisitor.java index 68f0bf305..a8a2fdad6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/InterningXmlVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import javax.xml.namespace.NamespaceContext; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import javax.xml.namespace.NamespaceContext; + /** * {@link XmlVisitor} decorator that interns all string tokens. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/LeafPropertyLoader.java similarity index 79% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/LeafPropertyLoader.java index 1ab53b2ae..85017c4f1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/LeafPropertyLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; import org.xml.sax.SAXException; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java index a5dd3af0f..787a042fc 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,22 +8,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; -import java.util.Collection; - -import javax.xml.namespace.QName; - -import com.sun.xml.bind.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.runtime.ClassBeanInfoImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; - +import org.glassfish.jaxb.runtime.v2.runtime.ClassBeanInfoImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import javax.xml.namespace.QName; +import java.util.Collection; + public final class LeafPropertyXsiLoader extends Loader { private final Loader defaultLoader; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Loader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Loader.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Loader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Loader.java index ac71cfacb..1913f7153 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Loader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Loader.java @@ -8,20 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import java.util.Collection; -import java.util.Collections; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; import jakarta.xml.bind.Unmarshaller; import jakarta.xml.bind.ValidationEvent; import jakarta.xml.bind.helpers.ValidationEventImpl; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; - import org.xml.sax.SAXException; +import javax.xml.namespace.QName; +import java.util.Collection; +import java.util.Collections; + /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LocatorExWrapper.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/LocatorExWrapper.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LocatorExWrapper.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/LocatorExWrapper.java index 7164b79e7..ff3da05d3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/LocatorExWrapper.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/LocatorExWrapper.java @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; import jakarta.xml.bind.ValidationEventLocator; import jakarta.xml.bind.helpers.ValidationEventLocatorImpl; - import org.xml.sax.Locator; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/MTOMDecorator.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/MTOMDecorator.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/MTOMDecorator.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/MTOMDecorator.java index 25d5fdcb6..13b20cbb1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/MTOMDecorator.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/MTOMDecorator.java @@ -8,16 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import com.sun.xml.bind.v2.WellKnownNamespace; +import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; import jakarta.activation.DataHandler; import jakarta.xml.bind.attachment.AttachmentUnmarshaller; -import javax.xml.namespace.NamespaceContext; - -import com.sun.xml.bind.v2.WellKnownNamespace; - import org.xml.sax.SAXException; +import javax.xml.namespace.NamespaceContext; + /** * Decorator of {@link XmlVisitor} that performs XOP processing. * Used to support MTOM. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages.java index 939076237..849c36fd1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Patcher.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Patcher.java similarity index 76% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Patcher.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Patcher.java index b2190fd77..e82109775 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Patcher.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Patcher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import org.xml.sax.SAXException; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ProxyLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ProxyLoader.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ProxyLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ProxyLoader.java index 15c0b8a7e..454bc4dd4 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ProxyLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ProxyLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import org.xml.sax.SAXException; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Receiver.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Receiver.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Receiver.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Receiver.java index 96e134f03..496e78c4f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Receiver.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Receiver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import org.xml.sax.SAXException; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/SAXConnector.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/SAXConnector.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/SAXConnector.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/SAXConnector.java index 1f6d6edff..0143e6e75 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/SAXConnector.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/SAXConnector.java @@ -8,20 +8,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import com.sun.xml.bind.Utils; +import com.sun.xml.bind.WhiteSpaceProcessor; +import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.UnmarshallerHandler; - -import com.sun.xml.bind.WhiteSpaceProcessor; -import java.util.logging.Level; -import java.util.logging.Logger; - import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * Receives SAX events and convert them to our internal events. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Scope.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Scope.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Scope.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Scope.java index 81baea31b..0ffc9dc20 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Scope.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Scope.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.Lister; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Lister; import org.xml.sax.SAXException; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/SecureLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/SecureLoader.java new file mode 100644 index 000000000..2f39940e0 --- /dev/null +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/SecureLoader.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0, which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; + +/** + * Class defined for safe calls of getClassLoader methods of any kind (context/system/class + * classloader. This MUST be package private and defined in every package which + * uses such invocations. + * @author snajper + */ +class SecureLoader { + + static ClassLoader getContextClassLoader() { + if (System.getSecurityManager() == null) { + return Thread.currentThread().getContextClassLoader(); + } else { + return (ClassLoader) java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public java.lang.Object run() { + return Thread.currentThread().getContextClassLoader(); + } + }); + } + } + + static ClassLoader getClassClassLoader(final Class c) { + if (System.getSecurityManager() == null) { + return c.getClassLoader(); + } else { + return (ClassLoader) java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public java.lang.Object run() { + return c.getClassLoader(); + } + }); + } + } + + static ClassLoader getSystemClassLoader() { + if (System.getSecurityManager() == null) { + return ClassLoader.getSystemClassLoader(); + } else { + return (ClassLoader) java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public java.lang.Object run() { + return ClassLoader.getSystemClassLoader(); + } + }); + } + } + +} diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXConnector.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXConnector.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXConnector.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXConnector.java index 52a97a795..017e90639 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXConnector.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXConnector.java @@ -8,16 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; import jakarta.xml.bind.ValidationEventLocator; import jakarta.xml.bind.helpers.ValidationEventLocatorImpl; +import org.xml.sax.SAXException; + import javax.xml.namespace.NamespaceContext; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; -import org.xml.sax.SAXException; - /** * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXEventConnector.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXEventConnector.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXEventConnector.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXEventConnector.java index e0f8d114f..628a6baeb 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXEventConnector.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXEventConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,25 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; -import java.util.Iterator; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; import javax.xml.namespace.QName; import javax.xml.stream.Location; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.Characters; -import javax.xml.stream.events.EndElement; -import javax.xml.stream.events.Namespace; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; - -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; +import javax.xml.stream.events.*; +import java.util.Iterator; /** * This is a simple utility class that adapts StAX events from an diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXExConnector.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXExConnector.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXExConnector.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXExConnector.java index 8f38f4a99..a1c958fed 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXExConnector.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXExConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,14 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import org.jvnet.staxex.XMLStreamReaderEx; import org.xml.sax.SAXException; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + /** * Reads XML from StAX {@link XMLStreamReader} and * feeds events to {@link XmlVisitor}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXStreamConnector.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXStreamConnector.java similarity index 99% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXStreamConnector.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXStreamConnector.java index 21cc65b16..d6591b986 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StAXStreamConnector.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StAXStreamConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,19 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; -import java.lang.reflect.Constructor; +import com.sun.xml.bind.WhiteSpaceProcessor; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; - -import com.sun.xml.bind.WhiteSpaceProcessor; - -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; +import java.lang.reflect.Constructor; /** * Reads XML from StAX {@link XMLStreamReader} and diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StructureLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StructureLoader.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StructureLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StructureLoader.java index 7c31e6d0a..bdab0a918 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/StructureLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/StructureLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,33 +8,31 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import com.sun.xml.bind.Utils; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.api.JAXBRIContext; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.api.JAXBRIContext; import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.runtime.ClassBeanInfoImpl; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.runtime.property.AttributeProperty; -import com.sun.xml.bind.v2.runtime.property.Property; -import com.sun.xml.bind.v2.runtime.property.StructureLoaderBuilder; -import com.sun.xml.bind.v2.runtime.property.UnmarshallerChain; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.v2.util.QNameMap; - -import java.util.Iterator; +import org.glassfish.jaxb.runtime.v2.runtime.ClassBeanInfoImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.glassfish.jaxb.runtime.v2.runtime.property.AttributeProperty; +import org.glassfish.jaxb.runtime.v2.runtime.property.Property; +import org.glassfish.jaxb.runtime.v2.runtime.property.StructureLoaderBuilder; +import org.glassfish.jaxb.runtime.v2.runtime.property.UnmarshallerChain; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; +import org.glassfish.jaxb.runtime.v2.util.QNameMap; import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import javax.xml.namespace.QName; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + /** * Loads children of an element. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/TagName.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/TagName.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/TagName.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/TagName.java index 2388e3b12..913e290ce 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/TagName.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/TagName.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,14 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import javax.xml.namespace.QName; - -import com.sun.xml.bind.v2.runtime.Name; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import org.glassfish.jaxb.runtime.v2.runtime.Name; import org.xml.sax.Attributes; +import javax.xml.namespace.QName; + /** * Represents an XML tag name (and attributes for start tags.) * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/TextLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/TextLoader.java similarity index 81% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/TextLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/TextLoader.java index 84a69a6a0..0dabbbab3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/TextLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/TextLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.v2.runtime.Transducer; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.Transducer; import org.xml.sax.SAXException; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java index 5df7943b8..00fb57871 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallerImpl.java @@ -8,23 +8,32 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; -import java.io.IOException; -import java.io.InputStream; - -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.PropertyException; -import jakarta.xml.bind.UnmarshalException; -import jakarta.xml.bind.Unmarshaller; -import jakarta.xml.bind.UnmarshallerHandler; -import jakarta.xml.bind.ValidationEvent; -import jakarta.xml.bind.ValidationEventHandler; +import org.glassfish.jaxb.runtime.IDResolver; +import org.glassfish.jaxb.runtime.api.ClassResolver; +import com.sun.xml.bind.unmarshaller.DOMScanner; +import com.sun.xml.bind.unmarshaller.InfosetScanner; +import com.sun.xml.bind.v2.ClassFactory; +import org.glassfish.jaxb.runtime.v2.runtime.AssociationMap; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import com.sun.xml.bind.v2.util.XmlFactory; +import jakarta.xml.bind.*; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import jakarta.xml.bind.attachment.AttachmentUnmarshaller; import jakarta.xml.bind.helpers.AbstractUnmarshallerImpl; +import org.glassfish.jaxb.runtime.unmarshaller.Messages; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.DefaultHandler; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParserFactory; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; @@ -35,28 +44,9 @@ import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; - -import com.sun.xml.bind.IDResolver; -import com.sun.xml.bind.api.ClassResolver; -import com.sun.xml.bind.unmarshaller.DOMScanner; -import com.sun.xml.bind.unmarshaller.InfosetScanner; -import com.sun.xml.bind.unmarshaller.Messages; -import com.sun.xml.bind.v2.ClassFactory; -import com.sun.xml.bind.v2.runtime.AssociationMap; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; -import com.sun.xml.bind.v2.util.XmlFactory; - import java.io.Closeable; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParserFactory; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.DefaultHandler; +import java.io.IOException; +import java.io.InputStream; /** * Default Unmarshaller implementation. @@ -417,7 +407,7 @@ private Object unmarshal0(XMLEventReader reader,JaxBeanInfo expectedType) throws if (!event.isStartElement() && !event.isStartDocument()) { // TODO: convert event into event name throw new IllegalStateException( - Messages.format( + Messages.format( Messages.ILLEGAL_READER_STATE,event.getEventType())); } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallingContext.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallingContext.java index 0e4a3726b..3d4b63cb7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/UnmarshallingContext.java @@ -8,50 +8,39 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.xml.XMLConstants; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.UnmarshalException; -import jakarta.xml.bind.Unmarshaller; -import jakarta.xml.bind.ValidationEvent; -import jakarta.xml.bind.ValidationEventHandler; -import jakarta.xml.bind.ValidationEventLocator; -import jakarta.xml.bind.helpers.ValidationEventImpl; -import javax.xml.namespace.NamespaceContext; -import javax.xml.namespace.QName; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import com.sun.istack.NotNull; import com.sun.istack.Nullable; import com.sun.istack.SAXParseException2; -import com.sun.xml.bind.IDResolver; -import com.sun.xml.bind.api.AccessorException; -import com.sun.xml.bind.api.ClassResolver; +import org.glassfish.jaxb.runtime.IDResolver; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.api.ClassResolver; import com.sun.xml.bind.unmarshaller.InfosetScanner; import com.sun.xml.bind.v2.ClassFactory; -import com.sun.xml.bind.v2.runtime.AssociationMap; -import com.sun.xml.bind.v2.runtime.Coordinator; -import com.sun.xml.bind.v2.runtime.JAXBContextImpl; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; - +import org.glassfish.jaxb.runtime.v2.runtime.AssociationMap; +import org.glassfish.jaxb.runtime.v2.runtime.Coordinator; +import org.glassfish.jaxb.runtime.v2.runtime.JAXBContextImpl; +import org.glassfish.jaxb.runtime.v2.runtime.ElementBeanInfoImpl; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; +import jakarta.xml.bind.*; +import jakarta.xml.bind.helpers.ValidationEventImpl; import org.xml.sax.ErrorHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; import org.xml.sax.helpers.LocatorImpl; +import javax.xml.XMLConstants; +import javax.xml.namespace.NamespaceContext; +import javax.xml.namespace.QName; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.*; +import java.util.concurrent.Callable; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * Center of the unmarshalling. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ValidatingUnmarshaller.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ValidatingUnmarshaller.java index c88a1df59..2c32d74a6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ValidatingUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,16 +8,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; + +import org.glassfish.jaxb.runtime.v2.util.FatalAdapter; +import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; +import org.xml.sax.SAXException; import javax.xml.namespace.NamespaceContext; import javax.xml.validation.Schema; import javax.xml.validation.ValidatorHandler; -import com.sun.xml.bind.v2.util.FatalAdapter; - -import org.xml.sax.SAXException; - /** * {@link XmlVisitor} decorator that validates the events by using JAXP validation API. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ValuePropertyLoader.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ValuePropertyLoader.java index f69070438..54e093e01 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/ValuePropertyLoader.java @@ -8,13 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import org.glassfish.jaxb.runtime.api.AccessorException; +import org.glassfish.jaxb.runtime.v2.runtime.reflect.TransducedAccessor; import jakarta.xml.bind.JAXBElement; - -import com.sun.xml.bind.v2.runtime.reflect.TransducedAccessor; -import com.sun.xml.bind.api.AccessorException; - import org.xml.sax.SAXException; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/WildcardLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/WildcardLoader.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/WildcardLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/WildcardLoader.java index 616ebb028..dbcf70832 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/WildcardLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/WildcardLoader.java @@ -8,12 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import jakarta.xml.bind.annotation.DomHandler; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; import com.sun.xml.bind.v2.model.core.WildcardMode; - +import jakarta.xml.bind.annotation.DomHandler; import org.xml.sax.SAXException; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XmlVisitor.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/XmlVisitor.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XmlVisitor.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/XmlVisitor.java index 195d7f237..4db041aa0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XmlVisitor.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/XmlVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; - -import javax.xml.namespace.NamespaceContext; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; +import com.sun.xml.bind.v2.runtime.unmarshaller.LocatorEx; import org.xml.sax.SAXException; +import javax.xml.namespace.NamespaceContext; + /** * Walks the XML document structure. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiNilLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/XsiNilLoader.java similarity index 92% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiNilLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/XsiNilLoader.java index af52ea97d..89f4d6401 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiNilLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/XsiNilLoader.java @@ -8,20 +8,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; -import java.util.Collection; - -import jakarta.xml.bind.JAXBElement; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.api.AccessorException; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import org.glassfish.jaxb.runtime.api.AccessorException; import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.runtime.reflect.Accessor; - +import org.glassfish.jaxb.runtime.v2.runtime.reflect.Accessor; +import jakarta.xml.bind.JAXBElement; import org.xml.sax.SAXException; +import javax.xml.namespace.QName; +import java.util.Collection; + /** * Looks for xsi:nil='true' and sets the target to null. * Otherwise delegate to another handler. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/XsiTypeLoader.java similarity index 94% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/XsiTypeLoader.java index 1450d5e69..6ae8590af 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/XsiTypeLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,20 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.runtime.unmarshaller; +package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; -import javax.xml.namespace.QName; - -import com.sun.xml.bind.DatatypeConverterImpl; -import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.runtime.JaxBeanInfo; import com.sun.istack.Nullable; +import org.glassfish.jaxb.runtime.DatatypeConverterImpl; +import com.sun.xml.bind.v2.WellKnownNamespace; +import org.glassfish.jaxb.runtime.v2.runtime.JaxBeanInfo; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import javax.xml.namespace.QName; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; /** * Looks at @xsi:type and forwards to the right {@link Loader}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/FoolProofResolver.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/FoolProofResolver.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/FoolProofResolver.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/FoolProofResolver.java index 105fc6b9d..0ffb4f63f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/FoolProofResolver.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/FoolProofResolver.java @@ -8,15 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen; - -import java.io.IOException; -import java.util.logging.Logger; +package org.glassfish.jaxb.runtime.v2.schemagen; +import com.sun.xml.bind.Utils; import jakarta.xml.bind.SchemaOutputResolver; -import javax.xml.transform.Result; -import com.sun.xml.bind.Utils; +import javax.xml.transform.Result; +import java.io.IOException; +import java.util.logging.Logger; /** * {@link SchemaOutputResolver} that wraps the user-specified resolver diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Form.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Form.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Form.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Form.java index 115d94b35..54e0408b0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Form.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Form.java @@ -8,15 +8,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen; +package org.glassfish.jaxb.runtime.v2.schemagen; +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.LocalAttribute; +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.LocalElement; +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Schema; +import com.sun.xml.txw2.TypedXmlWriter; import jakarta.xml.bind.annotation.XmlNsForm; -import javax.xml.namespace.QName; -import com.sun.xml.bind.v2.schemagen.xmlschema.LocalAttribute; -import com.sun.xml.bind.v2.schemagen.xmlschema.LocalElement; -import com.sun.xml.bind.v2.schemagen.xmlschema.Schema; -import com.sun.xml.txw2.TypedXmlWriter; +import javax.xml.namespace.QName; /** * Represents the form default value. @@ -25,7 +25,7 @@ */ enum Form { QUALIFIED(XmlNsForm.QUALIFIED,true) { - void declare(String attName,Schema schema) { + void declare(String attName, Schema schema) { schema._attribute(attName,"qualified"); } }, diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/GroupKind.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/GroupKind.java similarity index 72% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/GroupKind.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/GroupKind.java index 0048ac408..b69b566f2 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/GroupKind.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/GroupKind.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen; +package org.glassfish.jaxb.runtime.v2.schemagen; -import com.sun.xml.bind.v2.schemagen.xmlschema.Particle; -import com.sun.xml.bind.v2.schemagen.xmlschema.ContentModelContainer; +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ContentModelContainer; +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Particle; /** * Enum for model group type. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Messages.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Messages.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Messages.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Messages.java index 4102ec0b6..3b54672d6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Messages.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Messages.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen; +package org.glassfish.jaxb.runtime.v2.schemagen; -import java.util.ResourceBundle; import java.text.MessageFormat; +import java.util.ResourceBundle; /** * Message resources diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/MultiMap.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/MultiMap.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/MultiMap.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/MultiMap.java index c96ec3c5f..9bb91b863 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/MultiMap.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/MultiMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,10 +8,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen; +package org.glassfish.jaxb.runtime.v2.schemagen; -import java.util.TreeMap; import java.util.Map; +import java.util.TreeMap; /** * A special {@link Map} that 'conceptually' stores a set of values for each key. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Tree.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Tree.java similarity index 93% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Tree.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Tree.java index d6901dd8c..383abbbef 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Tree.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Tree.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,17 +8,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen; +package org.glassfish.jaxb.runtime.v2.schemagen; + +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.ContentModelContainer; +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Occurs; +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.Particle; +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.TypeDefParticle; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.sun.xml.bind.v2.schemagen.xmlschema.ContentModelContainer; -import com.sun.xml.bind.v2.schemagen.xmlschema.Particle; -import com.sun.xml.bind.v2.schemagen.xmlschema.TypeDefParticle; -import com.sun.xml.bind.v2.schemagen.xmlschema.Occurs; - /** * Normalized representation of the content model. * diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Util.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Util.java similarity index 96% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Util.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Util.java index 2a2584f2b..89143383b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/Util.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/Util.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen; +package org.glassfish.jaxb.runtime.v2.schemagen; /** diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/XmlSchemaGenerator.java similarity index 95% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/XmlSchemaGenerator.java index b51f3cae4..4f503c31c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/XmlSchemaGenerator.java @@ -8,96 +8,50 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen; +package org.glassfish.jaxb.runtime.v2.schemagen; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; -import java.io.File; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.ArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; - -import jakarta.activation.MimeType; -import jakarta.xml.bind.SchemaOutputResolver; -import jakarta.xml.bind.annotation.XmlElement; -import javax.xml.namespace.QName; -import javax.xml.transform.Result; -import javax.xml.transform.stream.StreamResult; - -import com.sun.istack.Nullable; import com.sun.istack.NotNull; +import com.sun.istack.Nullable; import com.sun.xml.bind.Utils; -import com.sun.xml.bind.api.CompositeStructure; import com.sun.xml.bind.api.ErrorListener; +import org.glassfish.jaxb.runtime.api.CompositeStructure; import com.sun.xml.bind.v2.TODO; import com.sun.xml.bind.v2.WellKnownNamespace; -import com.sun.xml.bind.v2.util.CollisionCheckStack; -import com.sun.xml.bind.v2.util.StackRecorder; -import static com.sun.xml.bind.v2.WellKnownNamespace.XML_SCHEMA; -import com.sun.xml.bind.v2.model.core.Adapter; -import com.sun.xml.bind.v2.model.core.ArrayInfo; -import com.sun.xml.bind.v2.model.core.AttributePropertyInfo; -import com.sun.xml.bind.v2.model.core.ClassInfo; +import com.sun.xml.bind.v2.model.core.*; +import org.glassfish.jaxb.runtime.v2.model.impl.ClassInfoImpl; import com.sun.xml.bind.v2.model.core.Element; -import com.sun.xml.bind.v2.model.core.ElementInfo; -import com.sun.xml.bind.v2.model.core.ElementPropertyInfo; -import com.sun.xml.bind.v2.model.core.EnumConstant; -import com.sun.xml.bind.v2.model.core.EnumLeafInfo; -import com.sun.xml.bind.v2.model.core.MapPropertyInfo; -import com.sun.xml.bind.v2.model.core.MaybeElement; -import com.sun.xml.bind.v2.model.core.NonElement; -import com.sun.xml.bind.v2.model.core.NonElementRef; -import com.sun.xml.bind.v2.model.core.PropertyInfo; -import com.sun.xml.bind.v2.model.core.ReferencePropertyInfo; -import com.sun.xml.bind.v2.model.core.TypeInfo; -import com.sun.xml.bind.v2.model.core.TypeInfoSet; -import com.sun.xml.bind.v2.model.core.TypeRef; -import com.sun.xml.bind.v2.model.core.ValuePropertyInfo; -import com.sun.xml.bind.v2.model.core.WildcardMode; -import com.sun.xml.bind.v2.model.impl.ClassInfoImpl; import com.sun.xml.bind.v2.model.nav.Navigator; -import com.sun.xml.bind.v2.runtime.SwaRefAdapter; -import static com.sun.xml.bind.v2.schemagen.Util.*; -import com.sun.xml.bind.v2.schemagen.xmlschema.Any; -import com.sun.xml.bind.v2.schemagen.xmlschema.AttrDecls; -import com.sun.xml.bind.v2.schemagen.xmlschema.ComplexExtension; -import com.sun.xml.bind.v2.schemagen.xmlschema.ComplexType; -import com.sun.xml.bind.v2.schemagen.xmlschema.ComplexTypeHost; -import com.sun.xml.bind.v2.schemagen.xmlschema.ExplicitGroup; -import com.sun.xml.bind.v2.schemagen.xmlschema.Import; -import com.sun.xml.bind.v2.schemagen.xmlschema.List; -import com.sun.xml.bind.v2.schemagen.xmlschema.LocalAttribute; -import com.sun.xml.bind.v2.schemagen.xmlschema.LocalElement; -import com.sun.xml.bind.v2.schemagen.xmlschema.Schema; -import com.sun.xml.bind.v2.schemagen.xmlschema.SimpleExtension; -import com.sun.xml.bind.v2.schemagen.xmlschema.SimpleRestrictionModel; -import com.sun.xml.bind.v2.schemagen.xmlschema.SimpleType; -import com.sun.xml.bind.v2.schemagen.xmlschema.SimpleTypeHost; -import com.sun.xml.bind.v2.schemagen.xmlschema.TopLevelAttribute; -import com.sun.xml.bind.v2.schemagen.xmlschema.TopLevelElement; -import com.sun.xml.bind.v2.schemagen.xmlschema.TypeHost; -import com.sun.xml.bind.v2.schemagen.xmlschema.ContentModelContainer; -import com.sun.xml.bind.v2.schemagen.xmlschema.TypeDefParticle; -import com.sun.xml.bind.v2.schemagen.xmlschema.AttributeType; +import org.glassfish.jaxb.runtime.v2.runtime.SwaRefAdapter; import com.sun.xml.bind.v2.schemagen.episode.Bindings; +import org.glassfish.jaxb.runtime.v2.util.CollisionCheckStack; +import org.glassfish.jaxb.runtime.v2.util.StackRecorder; import com.sun.xml.txw2.TXW; import com.sun.xml.txw2.TxwException; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.output.ResultFactory; import com.sun.xml.txw2.output.XmlSerializer; -import java.util.Collection; -import java.util.HashSet; +import jakarta.activation.MimeType; +import jakarta.xml.bind.SchemaOutputResolver; +import jakarta.xml.bind.annotation.XmlElement; +import org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.*; import org.xml.sax.SAXParseException; +import javax.xml.namespace.QName; +import javax.xml.transform.Result; +import javax.xml.transform.stream.StreamResult; +import java.io.File; +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static com.sun.xml.bind.v2.WellKnownNamespace.XML_SCHEMA; +import static org.glassfish.jaxb.runtime.v2.schemagen.Util.*; + /** * Generates a set of W3C XML Schema documents from a set of Java classes. * @@ -1043,7 +997,7 @@ protected void write(ContentModelContainer parent, boolean isOptional, boolean r e.block(); // we will write occurs later QName tn = t.getTagName(); e.name(tn.getLocalPart()); - List lst = e.simpleType().list(); + org.glassfish.jaxb.runtime.v2.schemagen.xmlschema.List lst = e.simpleType().list(); writeTypeRef(lst,t, "itemType"); elementFormDefault.writeForm(e,tn); writeOccurs(e,isOptional||!ep.isRequired(),repeated); diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/package-info.java similarity index 63% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/package-info.java index 9c3ce490f..6ecadb09a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -12,8 +12,7 @@ * Schema generator. * * This package hosts the code that generates schemas from - * {@link TypeInfoSet} (without the user interface.) + * {@link com.sun.xml.bind.v2.model.core.TypeInfoSet} (without the user interface.) */ -package com.sun.xml.bind.v2.schemagen; +package org.glassfish.jaxb.runtime.v2.schemagen; -import com.sun.xml.bind.v2.model.core.TypeInfoSet; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Annotated.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Annotated.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Annotated.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Annotated.java index cfb38e036..96fae6e73 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Annotated.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Annotated.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Annotation.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Annotation.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Annotation.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Annotation.java index 72e00ac1c..76b8f719a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Annotation.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Annotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Any.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Any.java similarity index 80% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Any.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Any.java index a9c7049e9..3975c99eb 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Any.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Any.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Appinfo.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Appinfo.java similarity index 83% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Appinfo.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Appinfo.java index abbff6aba..131f51712 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Appinfo.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Appinfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/AttrDecls.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/AttrDecls.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/AttrDecls.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/AttrDecls.java index e6e587683..e3a348aa0 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/AttrDecls.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/AttrDecls.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/AttributeType.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/AttributeType.java similarity index 83% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/AttributeType.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/AttributeType.java index 451414ddb..635e211b3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/AttributeType.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/AttributeType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexContent.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexContent.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexContent.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexContent.java index 4f66fd395..11189f35a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexContent.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexContent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexExtension.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexExtension.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexExtension.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexExtension.java index c872732ef..3bb794f9e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexExtension.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexRestriction.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexRestriction.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexRestriction.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexRestriction.java index dfe52ad64..0082baff5 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexRestriction.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexRestriction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; import com.sun.xml.txw2.annotation.XmlElement; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexType.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexType.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexType.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexType.java index 368d937b4..cce26be93 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexType.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexTypeHost.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexTypeHost.java similarity index 81% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexTypeHost.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexTypeHost.java index adb097d47..238f925c3 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexTypeHost.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexTypeHost.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexTypeModel.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexTypeModel.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexTypeModel.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexTypeModel.java index 848c2adff..e0bd485cd 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ComplexTypeModel.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ComplexTypeModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ContentModelContainer.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ContentModelContainer.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ContentModelContainer.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ContentModelContainer.java index 6e1f9e9cb..5ac81ef64 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ContentModelContainer.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ContentModelContainer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Documentation.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Documentation.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Documentation.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Documentation.java index e10e55da6..7d9744fe7 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Documentation.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Documentation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Element.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Element.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Element.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Element.java index 971a0d949..b3b883aa5 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Element.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Element.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ExplicitGroup.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ExplicitGroup.java similarity index 79% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ExplicitGroup.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ExplicitGroup.java index 0d47cd51e..813bc76b8 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ExplicitGroup.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ExplicitGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ExtensionType.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ExtensionType.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ExtensionType.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ExtensionType.java index 94138bb17..83d649067 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/ExtensionType.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/ExtensionType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,12 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/FixedOrDefault.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/FixedOrDefault.java similarity index 83% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/FixedOrDefault.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/FixedOrDefault.java index 4d52dc8d3..8081c4f85 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/FixedOrDefault.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/FixedOrDefault.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Import.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Import.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Import.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Import.java index 9e7699a37..34a585700 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Import.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Import.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/List.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/List.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/List.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/List.java index c12f47b50..b52f4bdba 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/List.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/List.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; import com.sun.xml.txw2.annotation.XmlElement; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/LocalAttribute.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/LocalAttribute.java similarity index 87% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/LocalAttribute.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/LocalAttribute.java index 2354eb042..5a5d5cc3c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/LocalAttribute.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/LocalAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; import com.sun.xml.txw2.annotation.XmlElement; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/LocalElement.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/LocalElement.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/LocalElement.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/LocalElement.java index 591ee2bb4..8bbeabe6f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/LocalElement.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/LocalElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; import com.sun.xml.txw2.annotation.XmlElement; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/NestedParticle.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/NestedParticle.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/NestedParticle.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/NestedParticle.java index 8fe29d27c..c7c607780 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/NestedParticle.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/NestedParticle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/NoFixedFacet.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/NoFixedFacet.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/NoFixedFacet.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/NoFixedFacet.java index eb8a45b2b..b37e88d3b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/NoFixedFacet.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/NoFixedFacet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Occurs.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Occurs.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Occurs.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Occurs.java index 03272d1b5..ac05be455 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Occurs.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Occurs.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Particle.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Particle.java similarity index 75% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Particle.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Particle.java index 94acd6da0..0678414fe 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Particle.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Particle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; /** * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Redefinable.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Redefinable.java similarity index 79% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Redefinable.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Redefinable.java index 61a7e5068..b2d3e0d26 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Redefinable.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Redefinable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Schema.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Schema.java similarity index 91% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Schema.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Schema.java index 32c40b67d..331258897 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Schema.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Schema.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SchemaTop.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SchemaTop.java similarity index 83% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SchemaTop.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SchemaTop.java index 76cc68887..789f0dbb1 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SchemaTop.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SchemaTop.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleContent.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleContent.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleContent.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleContent.java index b823cf810..e181ec443 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleContent.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleContent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleDerivation.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleDerivation.java similarity index 83% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleDerivation.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleDerivation.java index 62bda421b..c3259a74f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleDerivation.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleDerivation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleExtension.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleExtension.java similarity index 81% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleExtension.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleExtension.java index 447a82ca1..988fd4bc6 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleExtension.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleRestriction.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleRestriction.java similarity index 82% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleRestriction.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleRestriction.java index e398e8d8d..ab332053e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleRestriction.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleRestriction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleRestrictionModel.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleRestrictionModel.java index 2db54cb05..d1b47e51a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleRestrictionModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; import com.sun.xml.txw2.annotation.XmlElement; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleType.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleType.java similarity index 86% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleType.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleType.java index 8e2b7fa67..33f8e1233 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleType.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleTypeHost.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleTypeHost.java similarity index 81% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleTypeHost.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleTypeHost.java index 9c15d82a2..df2b1286f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/SimpleTypeHost.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/SimpleTypeHost.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TopLevelAttribute.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TopLevelAttribute.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TopLevelAttribute.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TopLevelAttribute.java index 0f34a2260..c12b5652d 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TopLevelAttribute.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TopLevelAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TopLevelElement.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TopLevelElement.java similarity index 88% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TopLevelElement.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TopLevelElement.java index d5fe4701c..f97ad3e7a 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TopLevelElement.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TopLevelElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; import com.sun.xml.txw2.annotation.XmlElement; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TypeDefParticle.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TypeDefParticle.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TypeDefParticle.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TypeDefParticle.java index d5a62d428..04097bfa9 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TypeDefParticle.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TypeDefParticle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlElement; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TypeHost.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TypeHost.java similarity index 78% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TypeHost.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TypeHost.java index 0b4e399ae..0aaa45c12 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/TypeHost.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/TypeHost.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Union.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Union.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Union.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Union.java index 655b1fd1d..d63fdec9c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Union.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Union.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; -import javax.xml.namespace.QName; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; import com.sun.xml.txw2.annotation.XmlElement; +import javax.xml.namespace.QName; + /** *

    * Auto-generated, do not edit. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Wildcard.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Wildcard.java similarity index 85% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Wildcard.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Wildcard.java index 836c13bca..8d7bf187c 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/Wildcard.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/Wildcard.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; import com.sun.xml.txw2.TypedXmlWriter; import com.sun.xml.txw2.annotation.XmlAttribute; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/package-info.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/package-info.java similarity index 76% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/package-info.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/package-info.java index a62ff66b1..4483c766b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/xmlschema/package-info.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -12,4 +12,4 @@ * XML Schema writer generated by TXW. */ @com.sun.xml.txw2.annotation.XmlNamespace("http://www.w3.org/2001/XMLSchema") -package com.sun.xml.bind.v2.schemagen.xmlschema; +package org.glassfish.jaxb.runtime.v2.schemagen.xmlschema; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/ByteArrayOutputStreamEx.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/ByteArrayOutputStreamEx.java similarity index 84% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/ByteArrayOutputStreamEx.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/ByteArrayOutputStreamEx.java index c063e0644..e0156c735 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/ByteArrayOutputStreamEx.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/ByteArrayOutputStreamEx.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,13 +8,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.util; +package org.glassfish.jaxb.runtime.v2.util; + +import org.glassfish.jaxb.runtime.v2.runtime.unmarshaller.Base64Data; import java.io.ByteArrayOutputStream; -import java.io.InputStream; import java.io.IOException; - -import com.sun.xml.bind.v2.runtime.unmarshaller.Base64Data; +import java.io.InputStream; /** * {@link ByteArrayOutputStream} with access to its raw buffer. @@ -27,7 +27,7 @@ public ByteArrayOutputStreamEx(int size) { super(size); } - public void set(Base64Data dt,String mimeType) { + public void set(Base64Data dt, String mimeType) { dt.set(buf,count,mimeType); } diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/CollisionCheckStack.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/CollisionCheckStack.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/CollisionCheckStack.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/CollisionCheckStack.java index cfca900cb..c54479592 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/CollisionCheckStack.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/CollisionCheckStack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.util; +package org.glassfish.jaxb.runtime.v2.util; import java.util.AbstractList; import java.util.Arrays; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/DataSourceSource.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/DataSourceSource.java similarity index 98% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/DataSourceSource.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/DataSourceSource.java index d8d5b50f3..1b05838ac 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/DataSourceSource.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/DataSourceSource.java @@ -8,19 +8,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.util; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; +package org.glassfish.jaxb.runtime.v2.util; import jakarta.activation.DataHandler; import jakarta.activation.DataSource; import jakarta.activation.MimeType; import jakarta.activation.MimeTypeParseException; + import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; /** * {@link Source} implementation backed by {@link DataHandler}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/FatalAdapter.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/FatalAdapter.java similarity index 90% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/FatalAdapter.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/FatalAdapter.java index f8732dba7..34c4bee46 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/FatalAdapter.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/FatalAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,11 +8,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.util; +package org.glassfish.jaxb.runtime.v2.util; import org.xml.sax.ErrorHandler; -import org.xml.sax.SAXParseException; import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; /** * Maps an error to a fatal error. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/QNameMap.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/QNameMap.java similarity index 97% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/QNameMap.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/QNameMap.java index f6b96afce..25ba0c185 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/QNameMap.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/QNameMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,18 +8,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.util; -import java.util.AbstractSet; -import java.util.Iterator; -import java.util.NoSuchElementException; -import java.util.Set; -import java.util.Map; -import java.util.Collection; -import java.util.HashSet; +package org.glassfish.jaxb.runtime.v2.util; -import javax.xml.namespace.QName; +import org.glassfish.jaxb.runtime.v2.runtime.Name; -import com.sun.xml.bind.v2.runtime.Name; +import javax.xml.namespace.QName; +import java.util.*; /** * Map keyed by {@link QName}. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/StackRecorder.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/StackRecorder.java similarity index 79% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/StackRecorder.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/StackRecorder.java index 3e75139e0..09fc23d65 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/StackRecorder.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/StackRecorder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.util; +package org.glassfish.jaxb.runtime.v2.util; /** * Created to record the caller stack trace in logging. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/TypeCast.java b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/TypeCast.java similarity index 89% rename from jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/TypeCast.java rename to jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/TypeCast.java index 67a08894b..5aa160408 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/TypeCast.java +++ b/jaxb-ri/runtime/impl/src/main/java/org/glassfish/jaxb/runtime/v2/util/TypeCast.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,7 +8,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -package com.sun.xml.bind.v2.util; +package org.glassfish.jaxb.runtime.v2.util; import java.util.Map; diff --git a/jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/j2s_architecture.gif b/jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/j2s_architecture.gif similarity index 100% rename from jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/j2s_architecture.gif rename to jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/j2s_architecture.gif diff --git a/jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/j2s_architecture.sxd b/jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/j2s_architecture.sxd similarity index 100% rename from jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/j2s_architecture.sxd rename to jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/j2s_architecture.sxd diff --git a/jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/packages.png b/jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/packages.png similarity index 100% rename from jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/packages.png rename to jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/packages.png diff --git a/jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/packages.vsd b/jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/packages.vsd similarity index 100% rename from jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/packages.vsd rename to jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/packages.vsd diff --git a/jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/readme.txt b/jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/readme.txt similarity index 100% rename from jaxb-ri/runtime/impl/src/main/javadoc/com/sun/xml/bind/v2/doc-files/readme.txt rename to jaxb-ri/runtime/impl/src/main/javadoc/org/glassfish/jaxb/runtime/v2/doc-files/readme.txt diff --git a/jaxb-ri/runtime/impl/src/main/resources/META-INF/services/jakarta.xml.bind.JAXBContext b/jaxb-ri/runtime/impl/src/main/resources/META-INF/services/jakarta.xml.bind.JAXBContext index b80a5f021..239c6b2d3 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/META-INF/services/jakarta.xml.bind.JAXBContext +++ b/jaxb-ri/runtime/impl/src/main/resources/META-INF/services/jakarta.xml.bind.JAXBContext @@ -1 +1 @@ -com.sun.xml.bind.v2.ContextFactory +org.glassfish.jaxb.runtime.v2.ContextFactory diff --git a/jaxb-ri/runtime/impl/src/main/resources/META-INF/services/jakarta.xml.bind.JAXBContextFactory b/jaxb-ri/runtime/impl/src/main/resources/META-INF/services/jakarta.xml.bind.JAXBContextFactory index 5a0661561..27c7ad534 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/META-INF/services/jakarta.xml.bind.JAXBContextFactory +++ b/jaxb-ri/runtime/impl/src/main/resources/META-INF/services/jakarta.xml.bind.JAXBContextFactory @@ -1 +1 @@ -com.sun.xml.bind.v2.JAXBContextFactory +org.glassfish.jaxb.runtime.v2.JAXBContextFactory diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages.properties similarity index 84% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages.properties index ebaedd096..4f154b63a 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,5 +8,6 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = \ Failed to initialize JAXP 1.3 DatatypeFactory class. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_de.properties similarity index 85% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_de.properties index 20b86c355..5fed91976 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = JAXP 1.3 DatatypeFactory-Klasse konnte nicht initialisiert werden. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_es.properties similarity index 84% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_es.properties index 3a0f3f8b9..ea874d70c 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = Fallo al inicializar la clase DatatypeFactory de JAXP 1.3. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_fr.properties similarity index 84% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_fr.properties index 2808a4221..ecc1d7366 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = Echec de l'initialisation de la classe JAXP 1.3 DatatypeFactory. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_it.properties similarity index 85% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_it.properties index 3a8727588..96c868f34 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = Inizializzazione della classe DatatypeFactory di JAXP 1.3 non riuscita. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_ja.properties similarity index 86% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_ja.properties index 9d3e95043..3cf321c88 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = JAXP 1.3 DatatypeFactory\u30AF\u30E9\u30B9\u306E\u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_ko.properties similarity index 86% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_ko.properties index 460f6f0ec..3149f14ec 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,5 +8,6 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = JAXP 1.3 DatatypeFactory \uD074\uB798\uC2A4 \uCD08\uAE30\uD654\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_pt_BR.properties similarity index 84% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_pt_BR.properties index efc0f3fa4..bc6d0f243 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = Falha ao inicializar a classe DatatypeFactory de JAXP 1.3. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_zh_CN.properties similarity index 85% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_zh_CN.properties index 99a3ba450..440fb090b 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = \u65E0\u6CD5\u521D\u59CB\u5316 JAXP 1.3 DatatypeFactory \u7C7B\u3002 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_zh_TW.properties similarity index 84% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_zh_TW.properties index 3c0909c51..384c599ab 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + FAILED_TO_INITIALE_DATATYPE_FACTORY = \u7121\u6CD5\u8D77\u59CB JAXP 1.3 DatatypeFactory \u985E\u5225. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages.properties similarity index 83% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages.properties index 7c46c7ae9..13d2df9fa 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,5 +8,6 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = \ Argument(s) "{0}" can''t be null. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_de.properties similarity index 83% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_de.properties index fe95cc878..fb2e007ff 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = Argumente "{0}" m\u00FCssen angegeben werden. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_es.properties similarity index 83% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_es.properties index 8a7c70141..d6981eaaa 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = Los argumentos"{0}" no pueden ser nulos. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_fr.properties similarity index 83% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_fr.properties index 4a5229535..b19f8d848 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = Les arguments "{0}" ne peuvent pas \u00EAtre NULL. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_it.properties similarity index 84% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_it.properties index fff0aeb6a..4579a6509 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = L''argomento o gli argomenti {0} non possono essere nulli. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_ja.properties similarity index 84% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_ja.properties index c24c04739..1d57b5edf 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = \u5F15\u6570"{0}"\u306Fnull\u306B\u3067\u304D\u307E\u305B\u3093\u3002 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_ko.properties similarity index 84% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_ko.properties index be17c5243..24c62fc67 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = "{0}" \uC778\uC218\uB294 \uB110\uC77C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_pt_BR.properties similarity index 83% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_pt_BR.properties index 725dcac30..eb90716c2 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = Argumento(s) "{0}" n\u00E3o pode(m) ser nulo(s). diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_zh_CN.properties similarity index 84% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_zh_CN.properties index ccb3176be..8b5e86617 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = \u53C2\u6570 "{0}" \u4E0D\u80FD\u4E3A\u7A7A\u503C\u3002 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_zh_TW.properties similarity index 83% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_zh_TW.properties index 1e525b66c..7755adf0b 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/api/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/api/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ARGUMENT_CANT_BE_NULL = \u5F15\u6578 "{0}" \u4E0D\u53EF\u70BA\u7A7A\u503C. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages.properties index c84009cb2..5ae3f7bcf 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_de.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_de.properties index 8e57eb03d..1bea6d339 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -9,6 +9,7 @@ # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_es.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_es.properties index e2c70864b..ad2791b31 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -9,6 +9,7 @@ # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_fr.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_fr.properties index 124e63f42..44a9a3aac 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -9,6 +9,7 @@ # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_it.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_it.properties index 1e01911f8..2bfd3311b 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -9,6 +9,7 @@ # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_ja.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_ja.properties index c1b231e52..c524ab13f 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -9,6 +9,7 @@ # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_ko.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_ko.properties index 3b831c1ed..7722439bc 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -9,6 +9,7 @@ # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_pt_BR.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_pt_BR.properties index 912404d5d..50aa8b93c 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -9,6 +9,7 @@ # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_zh_CN.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_zh_CN.properties index 9e5836503..889f68079 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -9,6 +9,7 @@ # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_zh_TW.properties similarity index 97% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_zh_TW.properties index 3d288012b..ee2ddb18f 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/unmarshaller/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/unmarshaller/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2019 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -9,6 +9,7 @@ # + # # don't modify nor delete anything for backward compatibility # diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages.properties similarity index 88% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages.properties index d594c5e16..1edca0d9e 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = \ Annotation "{0}" is present on both "{1}" and "{2}" diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_de.properties similarity index 89% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_de.properties index 23ed8ffff..ae6b8c162 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = Annotation "{0}" ist sowohl f\u00FCr "{1}" als auch f\u00FCr "{2}" vorhanden CLASS_NOT_FOUND = \nFehler beim Aufruf von Reflektion auf Zielklassen. Stellen Sie sicher, dass alle referenzierten Klassen im Classpath vorhanden sind: {0} \nAusnahme: {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_es.properties similarity index 89% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_es.properties index 284c366f9..b3963ea55 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = La anotaci\u00F3n "{0}" se encuentra en "{1}" y en "{2}" CLASS_NOT_FOUND = \nSe ha producido un error al llamar a la reflexi\u00F3n en las clases de destino. Aseg\u00FArese de que todas las clases a las que se hace referencia se encuentran en la classpath: {0} \nExcepci\u00F3n: {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_fr.properties similarity index 89% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_fr.properties index 9338eae7c..8974c0121 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = L''annotation "{0}" figure \u00E0 la fois sur "{1}" et "{2}" CLASS_NOT_FOUND = \nUne erreur s''est produite lors de l''appel de Reflection sur les classes cible. Assurez-vous que toutes les classes r\u00E9f\u00E9renc\u00E9es figurent sur le classpath {0} \nException : {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_it.properties similarity index 89% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_it.properties index 633fe84ac..d9519017d 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = L''annotazione "{0}" \u00E8 presente su "{1}" e su "{2}" CLASS_NOT_FOUND = \nSi \u00E8 verificato un errore durante il richiamo della riflessione sulle classi di destinazione. Assicurarsi che tutte le classi di riferimento si trovino sul classpath: {0} \nEccezione: {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_ja.properties similarity index 92% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_ja.properties index 6b90e5b3e..50888296e 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = \u6CE8\u91C8"{0}"\u306F"{1}"\u3068"{2}"\u306E\u4E21\u65B9\u306B\u5B58\u5728\u3057\u307E\u3059 CLASS_NOT_FOUND = \n\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30AF\u30E9\u30B9\u3067\u306E\u30EA\u30D5\u30EC\u30AF\u30B7\u30E7\u30F3\u306E\u547C\u51FA\u3057\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u53C2\u7167\u3055\u308C\u308B\u3059\u3079\u3066\u306E\u30AF\u30E9\u30B9\u304C\u30AF\u30E9\u30B9\u30D1\u30B9\u306B\u5B58\u5728\u3057\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044: {0}\n\u4F8B\u5916: {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_ko.properties similarity index 92% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_ko.properties index be38299cd..d9e9dfa8b 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = "{0}" \uC8FC\uC11D\uC774 "{1}"\uACFC(\uC640) "{2}", \uB450 \uC704\uCE58\uC5D0 \uC788\uC2B5\uB2C8\uB2E4. CLASS_NOT_FOUND = \n\uB300\uC0C1 \uD074\uB798\uC2A4\uC5D0\uC11C \uB9AC\uD50C\uB809\uC158\uC744 \uD638\uCD9C\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uCC38\uC870\uB41C \uBAA8\uB4E0 \uD074\uB798\uC2A4\uAC00 \uD074\uB798\uC2A4 \uACBD\uB85C {0}\uC5D0 \uC788\uB294\uC9C0 \uD655\uC778\uD558\uC2ED\uC2DC\uC624. \n\uC608\uC678 \uC0AC\uD56D: {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_pt_BR.properties similarity index 89% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_pt_BR.properties index f57207d41..cb0a91c29 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = A anota\u00E7\u00E3o "{0}" est\u00E1 presente em "{1}" e "{2}" CLASS_NOT_FOUND = \nOcorreu um erro ao chamar a reflex\u00E3o nas classes do alvo. Certifique-se de que todas as classes mencionadas estejam no classpath: {0} \nExce\u00E7\u00E3o: {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_zh_CN.properties similarity index 89% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_zh_CN.properties index c73d6a9b6..2079409d0 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = "{1}" \u548C "{2}" \u4E0A\u90FD\u5B58\u5728\u6CE8\u91CA "{0}" CLASS_NOT_FOUND = \n\u5728\u76EE\u6807\u7C7B\u4E0A\u8C03\u7528\u53CD\u5C04\u65F6\u51FA\u9519\u3002\u8BF7\u786E\u4FDD\u6240\u6709\u5F15\u7528\u7684\u7C7B\u90FD\u4F4D\u4E8E\u7C7B\u8DEF\u5F84\u4E0A: {0} \n\u5F02\u5E38\u9519\u8BEF: {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_zh_TW.properties similarity index 90% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_zh_TW.properties index 7744e5b3d..ca0c02b8b 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/annotation/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/annotation/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + DUPLICATE_ANNOTATIONS = "{1}" \u8207 "{2}"\u90FD\u6709\u8A3B\u89E3 "{0}" CLASS_NOT_FOUND = \n\u5728\u76EE\u6A19\u985E\u5225\u4E0A\u547C\u53EB\u53CD\u6620\u6642\u767C\u751F\u932F\u8AA4. \u8ACB\u78BA\u5B9A\u6240\u6709\u53C3\u7167\u7684\u985E\u5225\u5747\u4F4D\u65BC\u985E\u5225\u8DEF\u5F91: {0} \n\u7570\u5E38\u72C0\u6CC1: {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages.properties index d29cb70de..e974b9d8b 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages.properties @@ -157,11 +157,11 @@ RUNNING_WITH_1_0_RUNTIME = \ UNMATCHABLE_ADAPTER = \ Adapter {0} is not applicable to the field type {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = \ Unable to create instance of AccessorFactory, {0} for class {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = \ Unable to access instance of AccessorFactory, {0} for class {1}. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_de.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_de.properties index 5212c057c..2b2c874ca 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_de.properties @@ -108,10 +108,10 @@ RUNNING_WITH_1_0_RUNTIME = Sie versuchen, JAXB 2.0 Runtime (aus {1}) auszuf\u00F UNMATCHABLE_ADAPTER = Adapter {0} ist f\u00FCr den Feldtyp {1} nicht anwendbar. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = Instanz von AccessorFactory {0} f\u00FCr Klasse {1} kann nicht erstellt werden. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = Auf Instanz von AccessorFactory, {0}, f\u00FCr Klasse {1} kann nicht zugegriffen werden. CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = Benutzerdefinierte AccessorFactory, {0}, meldet einen Fehler beim Zugriff auf eine Eigenschaft. {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_es.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_es.properties index 79dd786e0..41f31b1cf 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_es.properties @@ -108,10 +108,10 @@ RUNNING_WITH_1_0_RUNTIME = Est\u00E1 intentando ejecutar JAXB 2.0 en tiempo de e UNMATCHABLE_ADAPTER = El adaptador {0} no es aplicable al tipo de campo {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = No se ha podido crear la instancia de AccessorFactory, {0} para la clase {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = No se ha podido acceder a la instancia de AccessorFactory, {0} para la clase {1}. CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = El elemento AccessorFactory personalizado, {0}, est\u00E1 informando de un error al acceder a una propiedad. {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_fr.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_fr.properties index ef20d8220..f50fd4c95 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_fr.properties @@ -108,10 +108,10 @@ RUNNING_WITH_1_0_RUNTIME = Vous essayez d''ex\u00E9cuter le runtime JAXB 2.0 (\u UNMATCHABLE_ADAPTER = L''adaptateur {0} n''est pas applicable au type de champ {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = Impossible de cr\u00E9er une instance d''AccessorFactory {0} pour la classe {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = Impossible d''acc\u00E9der \u00E0 l''instance d''AccessorFactory {0} pour la classe {1}. CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = L''instance AccessorFactory personnalis\u00E9e, {0}, signale une erreur lors de l''acc\u00E8s \u00E0 une propri\u00E9t\u00E9. {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_it.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_it.properties index 56c16fd74..521704c17 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_it.properties @@ -108,10 +108,10 @@ RUNNING_WITH_1_0_RUNTIME = Si sta tentando di eseguire il runtime JAXB 2.0 (da { UNMATCHABLE_ADAPTER = L''adattatore {0} non \u00E8 applicabile al tipo di campo {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = Impossibile creare l''istanza di AccessorFactory, {0} per la classe {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = Impossibile accedere all''istanza di AccessorFactory, {0} per la classe {1}. CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = AccessorFactory personalizzato, {0}, riporta un errore durante l''accesso a una propriet\u00E0. {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_ja.properties similarity index 99% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_ja.properties index d20929cce..186b0aae5 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_ja.properties @@ -108,10 +108,10 @@ RUNNING_WITH_1_0_RUNTIME = ({1}\u304B\u3089)JAXB 2.0\u30E9\u30F3\u30BF\u30A4\u30 UNMATCHABLE_ADAPTER = \u30A2\u30C0\u30D7\u30BF{0}\u3092\u30D5\u30A3\u30FC\u30EB\u30C9\u30FB\u30BF\u30A4\u30D7{1}\u306B\u9069\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002 -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = \u30AF\u30E9\u30B9{1}\u306EAccessorFactory {0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002 -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = \u30AF\u30E9\u30B9{1}\u306EAccessorFactory {0}\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002 CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = \u30AB\u30B9\u30BF\u30E0AccessorFactory {0}\u306F\u3001\u30D7\u30ED\u30D1\u30C6\u30A3\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u4E2D\u306B\u767A\u751F\u3057\u305F\u30A8\u30E9\u30FC\u3092\u30EC\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u3059\u3002{1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_ko.properties similarity index 99% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_ko.properties index 84892d09f..ab7a3054e 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_ko.properties @@ -108,10 +108,10 @@ RUNNING_WITH_1_0_RUNTIME = {1}\uC5D0\uC11C JAXB 2.0 \uB7F0\uD0C0\uC784\uC744 \uC UNMATCHABLE_ADAPTER = {0} \uC5B4\uB311\uD130\uB294 \uD544\uB4DC \uC720\uD615 {1}\uC5D0 \uC801\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = {1} \uD074\uB798\uC2A4\uC5D0 \uB300\uD55C AccessorFactory {0}\uC758 \uC778\uC2A4\uD134\uC2A4\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = {1} \uD074\uB798\uC2A4\uC5D0 \uB300\uD55C AccessorFactory {0}\uC758 \uC778\uC2A4\uD134\uC2A4\uC5D0 \uC561\uC138\uC2A4\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = \uC0AC\uC6A9\uC790 \uC815\uC758 AccessorFactory {0}\uC774(\uAC00) \uC18D\uC131 \uC561\uC138\uC2A4 \uC624\uB958\uB97C \uBCF4\uACE0\uD558\uACE0 \uC788\uC2B5\uB2C8\uB2E4. {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_pt_BR.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_pt_BR.properties index 92bf34679..b04d554c2 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_pt_BR.properties @@ -108,10 +108,10 @@ RUNNING_WITH_1_0_RUNTIME = Voc\u00EA est\u00E1 tentando executar o runtime do JA UNMATCHABLE_ADAPTER = O adaptador {0} n\u00E3o \u00E9 aplic\u00E1vel ao tipo de campo {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = N\u00E3o \u00E9 poss\u00EDvel criar a inst\u00E2ncia de AccessorFactory {0} para a classe {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = N\u00E3o \u00E9 poss\u00EDvel acessar a inst\u00E2ncia de AccessorFactory {0} para a classe {1}. CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = A AccessorFactory {0} personalizada est\u00E1 reportando um erro ao acessar a propriedade. {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_zh_CN.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_zh_CN.properties index ea6572ee5..1daff2a17 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_zh_CN.properties @@ -108,10 +108,10 @@ RUNNING_WITH_1_0_RUNTIME = \u60A8\u6B63\u5728\u5C1D\u8BD5\u8FD0\u884C JAXB 2.0 \ UNMATCHABLE_ADAPTER = \u9002\u914D\u5668{0}\u4E0D\u9002\u7528\u4E8E\u5B57\u6BB5\u7C7B\u578B{1}\u3002 -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = \u65E0\u6CD5\u4E3A\u7C7B{1}\u521B\u5EFA AccessorFactory {0}\u7684\u5B9E\u4F8B\u3002 -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = \u65E0\u6CD5\u8BBF\u95EE\u7C7B{1}\u7684 AccessorFactory {0}\u7684\u5B9E\u4F8B\u3002 CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = \u8BBF\u95EE\u5C5E\u6027\u65F6\u5B9A\u5236 AccessorFactory {0}\u62A5\u544A\u9519\u8BEF\u3002{1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_zh_TW.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_zh_TW.properties index 2e6f00030..c1e6cb75b 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/model/impl/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/model/impl/Messages_zh_TW.properties @@ -108,10 +108,10 @@ RUNNING_WITH_1_0_RUNTIME = \u60A8\u6B63\u5728\u5617\u8A66\u57F7\u884C JAXB 2.0 \ UNMATCHABLE_ADAPTER = \u8F49\u63A5\u5668 {0} \u4E0D\u9069\u7528\u65BC\u6B04\u4F4D\u985E\u578B {1}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_INSTANTIATION_EXCEPTION = \u7121\u6CD5\u5EFA\u7ACB\u985E\u5225 {1} \u4E4B AccessorFactory \u7684\u57F7\u884C\u8655\u7406 {0}. -# {0} - com.sun.xml.bind.XmlAccessorFactory, {1} - class name +# {0} - XmlAccessorFactory, {1} - class name ACCESSORFACTORY_ACCESS_EXCEPTION = \u7121\u6CD5\u5B58\u53D6\u985E\u5225 {1} \u4E4B AccessorFactory \u7684\u57F7\u884C\u8655\u7406 {0}. CUSTOM_ACCESSORFACTORY_PROPERTY_ERROR = \u81EA\u8A02\u7684 AccessorFactory {0} \u6B63\u5728\u56DE\u5831\u5B58\u53D6\u7279\u6027\u7684\u932F\u8AA4. {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages.properties index ac34352e4..c5d1b6505 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = \ the object parameter to marshal() is not marshallable diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_de.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_de.properties index b7919b642..f31c0e408 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = die Methode marshal() kann nicht mit Objektparameter verwendet werden diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_es.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_es.properties index b13e4aab0..d4beb3151 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = No es posible utilizar el m\u00E9todo marshal() con el par\u00E1metro de objeto. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_fr.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_fr.properties index 7256f3fb2..006782356 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = Il n'est pas possible d'utiliser la m\u00E9thode marshal() avec le param\u00E8tre d'objet diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_it.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_it.properties index 32d1323d6..404d7a00c 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = impossibile eseguire il marshalling del parametro dell'oggetto di cui eseguire il marshalling () diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ja.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ja.properties index 6bbeb307f..cac3e056f 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = marshal()\u306Eobject\u30D1\u30E9\u30E1\u30FC\u30BF\u304C\u30DE\u30FC\u30B7\u30E3\u30EA\u30F3\u30B0\u53EF\u80FD\u3067\u306F\u3042\u308A\u307E\u305B\u3093 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ko.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ko.properties index e711bebec..10920b84c 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = \uAC1D\uCCB4 \uB9E4\uAC1C\uBCC0\uC218\uC5D0 \uB300\uD574\uC11C\uB294 marshal() \uBA54\uC18C\uB4DC\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_pt_BR.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_pt_BR.properties index eaa088ab2..67e2ae111 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = o par\u00E2metro do objeto para fazer marshal() n\u00E3o pode ser submetido a marshal diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_CN.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_CN.properties index 6281cd0c1..800125bc6 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = \u65E0\u6CD5\u4F7F\u7528\u5E26\u6709\u5BF9\u8C61\u53C2\u6570\u7684 marshal() diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_TW.properties similarity index 98% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_TW.properties index 6f74fb8ed..e23bad800 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Wrapped into an Exception. Not concatenated with any other string. NOT_MARSHALLABLE = marshal() \u7684\u7269\u4EF6\u53C3\u6578\u7121\u6CD5\u5C01\u9001\u8655\u7406 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages.properties similarity index 88% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages.properties index b44b51e45..3c342cc5d 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = \ type {0} is mapped to {1} but it cannot substitute {2} here diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_de.properties similarity index 88% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_de.properties index d58992488..0e3153dd4 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = Typ {0} ist {1} zugeordnet, kann jedoch {2} hier nicht ersetzen diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_es.properties similarity index 88% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_es.properties index f047ab1b1..0e7d39710 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = el tipo {0} est\u00E1 asignado a {1}, pero no puede sustituir a {2} aqu\u00ED diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_fr.properties similarity index 89% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_fr.properties index ec11aeec1..7be39e0e7 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = le type {0} est mapp\u00E9 avec {1} mais il ne peut pas remplacer {2} ici diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_it.properties similarity index 88% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_it.properties index dcc95c77b..d475834c4 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = il tipo {0} \u00E8 mappato a {1} ma qui non pu\u00F2 sostituire {2} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_ja.properties similarity index 92% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_ja.properties index 7d605e02b..9822ccf8b 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = \u30BF\u30A4\u30D7{0}\u304C{1}\u306B\u30DE\u30C3\u30D7\u3055\u308C\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u3053\u3067{2}\u3092\u4EE3\u7528\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_ko.properties similarity index 91% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_ko.properties index 970821852..81af91922 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = {0} \uC720\uD615\uC774 {1}\uC5D0 \uB9E4\uD551\uB418\uC5C8\uC9C0\uB9CC \uC5EC\uAE30\uC11C {2}\uC744(\uB97C) \uB300\uCCB4\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_pt_BR.properties similarity index 88% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_pt_BR.properties index d52691fd1..67a7986aa 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = o tipo {0} foi mapeado para {1}, mas n\u00E3o pode substituir {2} aqui diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_zh_CN.properties similarity index 89% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_zh_CN.properties index 9175bff44..f07a05644 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = \u7C7B\u578B{0}\u6620\u5C04\u5230{1}, \u4F46\u5B83\u4E0D\u80FD\u66FF\u4EE3\u6B64\u5904\u7684{2} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_zh_TW.properties similarity index 89% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_zh_TW.properties index 55ac776e3..b4b5b5dc2 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/property/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/property/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + # Not in use anymore - commented. UNSUBSTITUTABLE_TYPE = \u985E\u578B {0} \u5C0D\u61C9\u81F3 {1}, \u4F46\u5176\u7121\u6CD5\u53D6\u4EE3\u6B64\u8655\u7684 {2} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages.properties similarity index 93% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages.properties index f738fee56..2916473ed 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = \ Unable to make {0}.{1} accessible. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_de.properties similarity index 93% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_de.properties index 57fa06b59..210266912 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = {0}.{1} kann nicht zug\u00E4nglich gemacht werden. UNASSIGNABLE_TYPE = Der Typ des Feldes ist {0}, der Typ des Objekts ist jedoch {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_es.properties similarity index 92% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_es.properties index 01f18fda9..a02a710f1 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = No se ha podido permitir el acceso a {0}.{1}. UNASSIGNABLE_TYPE = El tipo del campo es {0}, pero el tipo del objeto es {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_fr.properties similarity index 93% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_fr.properties index 34b833066..ccfd5e53f 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = Impossible de rendre {0}.{1} accessible. UNASSIGNABLE_TYPE = Le type du champ est {0}, mais le type de l''objet est {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_it.properties similarity index 93% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_it.properties index 337940508..3412428c3 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = Impossibile rendere accessibile {0}.{1}. UNASSIGNABLE_TYPE = Il tipo del campo \u00E8 {0} mentre quello dell''oggetto \u00E8 {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_ja.properties similarity index 95% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_ja.properties index aa486855f..537c3dc36 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = {0}.{1}\u3092\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306B\u3067\u304D\u307E\u305B\u3093\u3002 UNASSIGNABLE_TYPE = \u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30BF\u30A4\u30D7\u306F{0}\u3067\u3059\u304C\u3001\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306E\u30BF\u30A4\u30D7\u306F{1}\u3067\u3059 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_ko.properties similarity index 95% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_ko.properties index 00ef8cb23..524c7ddcd 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = {0}.{1}\uC744(\uB97C) \uC561\uC138\uC2A4 \uAC00\uB2A5\uD55C \uC0C1\uD0DC\uB85C \uC124\uC815\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. UNASSIGNABLE_TYPE = \uD544\uB4DC\uC758 \uC720\uD615\uC740 {0}, \uAC1D\uCCB4\uC758 \uC720\uD615\uC740 {1}\uC785\uB2C8\uB2E4. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_pt_BR.properties similarity index 92% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_pt_BR.properties index 902d4cbb8..d5721d7ea 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = N\u00E3o \u00E9 poss\u00EDvel tornar {0}.{1} acess\u00EDvel. UNASSIGNABLE_TYPE = O tipo de campo \u00E9 {0}, mas o tipo de objeto \u00E9 {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_zh_CN.properties similarity index 93% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_zh_CN.properties index 517848334..997b59638 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = \u65E0\u6CD5\u4F7F{0}.{1}\u6210\u4E3A\u53EF\u8BBF\u95EE\u7684\u3002 UNASSIGNABLE_TYPE = \u5B57\u6BB5\u7684\u7C7B\u578B\u4E3A{0}, \u800C\u5BF9\u8C61\u7684\u7C7B\u578B\u4E3A{1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_zh_TW.properties similarity index 94% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_zh_TW.properties index 23d3d0321..1cfe60062 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/reflect/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/reflect/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + UNABLE_TO_ACCESS_NON_PUBLIC_FIELD = \u7121\u6CD5\u5C07 {0}.{1} \u8A2D\u70BA\u53EF\u5B58\u53D6. UNASSIGNABLE_TYPE = \u6B04\u4F4D\u7684\u985E\u578B\u70BA {0}, \u4F46\u7269\u4EF6\u7684\u985E\u578B\u70BA {1} diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages.properties similarity index 95% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages.properties index 1aa3b01b6..65876d30e 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = \ {0} is not a valid QName diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_de.properties similarity index 94% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_de.properties index 7129a140a..d087f85f8 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = {0} ist kein g\u00FCltiger QName # Not concatenated with any other string. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_es.properties similarity index 94% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_es.properties index 12a75389d..d6bb55412 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = {0} no es un QName v\u00E1lido # Not concatenated with any other string. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_fr.properties similarity index 94% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_fr.properties index 8a9fe2237..78d8428e4 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = {0} n''est pas un QName valide # Not concatenated with any other string. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_it.properties similarity index 94% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_it.properties index d80e0b37c..fddcd445e 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = {0} non \u00E8 un QName valido # Not concatenated with any other string. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_ja.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_ja.properties index 60cc225df..bf78c69ca 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = {0}\u306F\u6709\u52B9\u306AQName\u3067\u306F\u3042\u308A\u307E\u305B\u3093 # Not concatenated with any other string. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_ko.properties similarity index 96% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_ko.properties index 7129748cd..da7c31428 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = {0}\uC740(\uB294) \uC801\uD569\uD55C QName\uC774 \uC544\uB2D9\uB2C8\uB2E4. # Not concatenated with any other string. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_pt_BR.properties similarity index 94% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_pt_BR.properties index 55e80bd6d..bf4e0082f 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = {0} n\u00E3o \u00E9 um QName v\u00E1lido # Not concatenated with any other string. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_zh_CN.properties similarity index 95% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_zh_CN.properties index 42ab6bfcb..4b7cbcae3 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = {0}\u4E0D\u662F\u6709\u6548\u7684 QName # Not concatenated with any other string. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_zh_TW.properties similarity index 95% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_zh_TW.properties index 6956a8154..254b7738f 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/runtime/unmarshaller/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/runtime/unmarshaller/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + NOT_A_QNAME = {0} \u4E0D\u662F\u6709\u6548\u7684 QName # Not concatenated with any other string. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages.properties similarity index 91% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages.properties index 88ad15cb4..407a50287 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,6 +8,7 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= Error occured during schema generation, however the schema could be generated. \ There is a circular dependency on an element in your schema: {0} \ This element \ diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_de.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_de.properties similarity index 91% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_de.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_de.properties index e66d6bfef..1bdbee256 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_de.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_de.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= Bei der Schemagenerierung ist ein Fehler aufgetreten, das Schema konnte jedoch generiert werden. Es ist eine zyklische Abh\u00E4ngigkeit von einem Element in Ihrem Schema vorhanden: {0} Dieses Element ist nicht als globales Element definiert, somit wurden keine Referenzen generiert und der Typ wurde wenn m\u00F6glich eingebettet. Um Referenzen f\u00FCr den Typ zuzulassen, f\u00FCgen Sie eine XmlRootElement-Annotation der Typdefinitionsklasse hinzu. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_es.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_es.properties similarity index 91% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_es.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_es.properties index 4e16c6037..f005693c2 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_es.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_es.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= Se ha producido un error durante la generaci\u00F3n del esquema, aunque el esquema se ha podido generar. Existe una dependencia circular en un elemento del esquema: {0} Este elemento no est\u00E1 definido como un elemento global y, por lo tanto, no se han generado referencias y el tipo se ha puesto en l\u00EDnea cuando ha sido posible. Para permitir referencias para el tipo, agregue la anotaci\u00F3n XmlRootElement a la clase de definici\u00F3n de tipos. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_fr.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_fr.properties similarity index 93% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_fr.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_fr.properties index 903e3e9e4..01214309a 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_fr.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_fr.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= Une erreur s''est produite lors de la g\u00E9n\u00E9ration du sch\u00E9ma, mais ce dernier a pu \u00EAtre g\u00E9n\u00E9r\u00E9. Il existe une d\u00E9pendance circulaire sur un \u00E9l\u00E9ment du sch\u00E9ma : {0}. Cet \u00E9l\u00E9ment n''est pas d\u00E9fini en tant qu''\u00E9l\u00E9ment global, les r\u00E9f\u00E9rences n''ont donc pas \u00E9t\u00E9 g\u00E9n\u00E9r\u00E9es et le type a \u00E9t\u00E9 incorpor\u00E9 l\u00E0 o\u00F9 cela \u00E9tait possible. Pour autoriser les r\u00E9f\u00E9rences pour le type, ajoutez l''annotation XmlRootElement \u00E0 la classe de d\u00E9finition du type. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_it.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_it.properties similarity index 92% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_it.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_it.properties index 4031a5850..ec0b5942f 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_it.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_it.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= Si \u00E8 verificato un errore durante la generazione dello schema, tuttavia \u00E8 stato possibile generare quest''ultimo. Esiste una dipendenza circolare su un elemento nello schema: {0} Questo elemento non \u00E8 definito come elemento globale e pertanto non sono stati generati riferimenti e il tipo \u00E8 inserito in linea dove possibile. Per consentire i riferimenti per il tipo, aggiungere l''annotazione XmlRootElement alla classe di definizione del tipo in uso. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_ja.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_ja.properties similarity index 94% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_ja.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_ja.properties index 9305726f5..2f935602b 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_ja.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_ja.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= \u30B9\u30AD\u30FC\u30DE\u751F\u6210\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u304C\u3001\u30B9\u30AD\u30FC\u30DE\u3092\u751F\u6210\u3067\u304D\u307E\u3057\u305F\u3002\u30B9\u30AD\u30FC\u30DE\u5185\u306E\u8981\u7D20\u306B\u5FAA\u74B0\u4F9D\u5B58\u95A2\u4FC2\u304C\u3042\u308A\u307E\u3059: {0}\u3002\u3053\u306E\u8981\u7D20\u306F\u30B0\u30ED\u30FC\u30D0\u30EB\u8981\u7D20\u3068\u3057\u3066\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u53C2\u7167\u306F\u751F\u6210\u3055\u308C\u305A\u3001\u30BF\u30A4\u30D7\u306F\u4F7F\u7528\u53EF\u80FD\u306A\u5834\u6240\u3067\u30A4\u30F3\u30E9\u30A4\u30F3\u5316\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30BF\u30A4\u30D7\u306E\u53C2\u7167\u3092\u8A31\u53EF\u3059\u308B\u306B\u306F\u3001\u30BF\u30A4\u30D7\u5B9A\u7FA9\u30AF\u30E9\u30B9\u306BXmlRootElement\u6CE8\u91C8\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_ko.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_ko.properties similarity index 94% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_ko.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_ko.properties index 0a11939ae..a9a286819 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_ko.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_ko.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= \uC2A4\uD0A4\uB9C8 \uC0DD\uC131 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC9C0\uB9CC \uC2A4\uD0A4\uB9C8\uB97C \uC0DD\uC131\uD560 \uC218 \uC788\uC5C8\uC2B5\uB2C8\uB2E4. \uC2A4\uD0A4\uB9C8\uC758 \uC694\uC18C\uC5D0 \uC21C\uD658 \uC885\uC18D\uC131\uC774 \uC788\uC74C: {0}. \uC774 \uC694\uC18C\uB294 \uC804\uC5ED \uC694\uC18C\uB85C \uC815\uC758\uB418\uC9C0 \uC54A\uC544 \uCC38\uC870\uAC00 \uC0DD\uC131\uB418\uC9C0 \uC54A\uC558\uC73C\uBA70 \uAC00\uB2A5\uD55C \uACBD\uC6B0 \uC720\uD615\uC774 \uC778\uB77C\uC778\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uC720\uD615\uC5D0 \uB300\uD55C \uCC38\uC870\uB97C \uD5C8\uC6A9\uD558\uB824\uBA74 \uC720\uD615 \uC815\uC758 \uD074\uB798\uC2A4\uC5D0 XmlRootElement \uC8FC\uC11D\uC744 \uCD94\uAC00\uD558\uC2ED\uC2DC\uC624. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_pt_BR.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_pt_BR.properties similarity index 92% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_pt_BR.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_pt_BR.properties index 875d4ce97..2ccddeac0 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_pt_BR.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_pt_BR.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= Ocorreu um erro durante a gera\u00E7\u00E3o do esquema, no entanto, foi poss\u00EDvel ger\u00E1-lo. H\u00E1 uma depend\u00EAncia circular ou um elemento em seu esquema: {0} Este elemento n\u00E3o foi definido como elemento global e, por isso, as refer\u00EAncias n\u00E3o foram geradas e o tipo foi alinhado, quando poss\u00EDvel. Para permitir refer\u00EAncias ao tipo, adicione a anota\u00E7\u00E3o XmlRootElement \u00E0 classe de defini\u00E7\u00E3o do tipo. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_zh_CN.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_zh_CN.properties similarity index 92% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_zh_CN.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_zh_CN.properties index 24a182973..55695836d 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_zh_CN.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_zh_CN.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= \u6A21\u5F0F\u751F\u6210\u671F\u95F4\u51FA\u9519, \u4F46\u53EF\u4EE5\u751F\u6210\u6A21\u5F0F\u3002\u6A21\u5F0F\u4E2D\u7684\u67D0\u4E00\u5143\u7D20\u5B58\u5728\u5FAA\u73AF\u76F8\u5173\u6027: {0}\u3002\u6B64\u5143\u7D20\u672A\u5B9A\u4E49\u4E3A\u5168\u5C40\u5143\u7D20, \u56E0\u6B64\u672A\u751F\u6210\u5F15\u7528\u5E76\u5DF2\u5C3D\u53EF\u80FD\u5730\u5C06\u7C7B\u578B\u5185\u5D4C\u3002\u8981\u5141\u8BB8\u7C7B\u578B\u7684\u5F15\u7528, \u8BF7\u5411\u7C7B\u578B\u5B9A\u4E49\u7C7B\u6DFB\u52A0 XmlRootElement \u6CE8\u91CA\u3002 diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_zh_TW.properties b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_zh_TW.properties similarity index 92% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_zh_TW.properties rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_zh_TW.properties index 1ba52dc3f..160c3f2fc 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/Messages_zh_TW.properties +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/Messages_zh_TW.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -8,4 +8,5 @@ # SPDX-License-Identifier: BSD-3-Clause # + ANONYMOUS_TYPE_CYCLE= \u7DB1\u8981\u7522\u751F\u671F\u9593\u767C\u751F\u932F\u8AA4, \u4F46\u53EF\u4EE5\u7522\u751F\u7DB1\u8981. \u60A8\u7DB1\u8981\u4E2D\u7684\u67D0\u500B\u5143\u7D20\u6709\u5FAA\u74B0\u76F8\u4F9D\u6027: {0}. \u6B64\u5143\u7D20\u672A\u5B9A\u7FA9\u70BA\u5168\u57DF\u5143\u7D20, \u56E0\u6B64\u672A\u7522\u751F\u53C3\u7167, \u4E26\u4E14\u5DF2\u76E1\u53EF\u80FD\u5167\u7F6E\u8A72\u985E\u578B. \u82E5\u8981\u5141\u8A31\u8A72\u985E\u578B\u7684\u53C3\u7167, \u8ACB\u65B0\u589E XmlRootElement \u8A3B\u89E3\u81F3\u60A8\u7684\u985E\u578B\u5B9A\u7FA9\u985E\u5225. diff --git a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng similarity index 99% rename from jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng rename to jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng index c082ccd4f..efa1cb910 100644 --- a/jaxb-ri/runtime/impl/src/main/resources/com/sun/xml/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng +++ b/jaxb-ri/runtime/impl/src/main/resources/org/glassfish/jaxb/runtime/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng @@ -1,7 +1,7 @@