From c73d51534c9802169c2380345d0447af8609857a Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 22 Dec 2024 00:57:37 +0100 Subject: [PATCH] Removed XML package slug from o2o module --- .../nostr/model/NoStrIdentityPrivateKey.java | 2 +- .../nostr/model/NoStrIdentityPublicKey.java | 2 +- .../no2all/nostr/model/event/NoStrEventId.java | 2 +- .../nostr/model/event/NoStrEventSignature.java | 2 +- .../nostr/model/share/NoStrShareB32LinkTLV.java | 4 ++-- .../model/share/NoStrShareBitChainTapeDeck.java | 8 ++++---- .../share/NoStrShareBitChainTapeStudio.java | 6 +++--- .../share/NoStrShareLinkEventReference.java | 2 +- .../nostr/model/share/NoStrShareLinkRelay.java | 2 +- .../no2all/nostr/nip/NoStrImplBinHexAdapter.java | 2 +- .../nx01/no2all/nostr/nip/NoStrImplShareTLV.java | 2 +- .../model/event/NoStrEventSignatureTest.java | 2 +- .../model/share/NoStrShareLinkProfileTest.java | 2 +- .../metamodel/doc/DocModelWriterTable.java | 2 +- .../warp/manifestor/WarpManifestorDriver.java | 4 ++-- .../warp/manifestor/manifest/WarpManifest4.java | 2 +- .../manifest/WarpManifest4HeaderField.java | 2 +- .../manifest/WarpManifest4Section.java | 2 +- .../manifest/WarpManifestTheVersion.java | 4 ++-- .../scopic/ioini/ScopicIniContentReader.java | 2 +- .../scopic/iomf/ScopicManifestConstants.java | 4 ++-- .../scopic/iomf/ScopicManifestContentReader.java | 2 +- .../iomf3/ScopicManifest3ContentReader.java | 4 ++-- .../iomf3/ScopicManifest3ContentWriter.java | 4 ++-- .../scopic/iomf3/ScopicManifest3FrameTLV.java | 2 +- .../iomf4/ScopicManifest4ContentHandler.java | 2 +- .../iomf4/ScopicManifest4ContentReader.java | 6 +++--- .../iomf4/ScopicManifest4ContentWriter.java | 6 +++--- .../scopic/iomf4/ScopicManifest4FrameTLV.java | 8 ++++---- .../manifest/WarpManifestNameDupTest.java | 2 +- .../manifest/WarpManifestNameEmptyTest.java | 2 +- .../WarpManifestSectionNameEmptyTest.java | 2 +- .../org/x4o/xml/eld/xsd/EldXsdLanguageTask.java | 2 +- .../java/org/x4o/xml/eld/xsd/EldXsdWriter.java | 8 ++++---- .../org/x4o/xml/eld/xsd/EldXsdWriterElement.java | 10 +++++----- .../org/x4o/xml/io/AbstractX4OConnection.java | 2 +- .../x4o/xml/io/AbstractX4OConnectionDebug.java | 4 ++-- .../org/x4o/xml/io/AbstractX4OWriterSession.java | 2 +- .../java/org/x4o/xml/io/DefaultX4OReader.java | 8 ++++---- .../java/org/x4o/xml/io/DefaultX4OWriter.java | 12 ++++++------ .../java/org/x4o/xml/io/X4OContentHandler.java | 4 ++-- .../java/org/x4o/xml/io/X4OContentParser.java | 2 +- .../main/java/org/x4o/xml/io/X4ODebugWriter.java | 6 +++--- .../java/org/x4o/xml/io/X4OEntityResolver.java | 2 +- .../java/org/x4o/xml/io/X4OErrorHandler.java | 2 +- .../xml/lang/task/AbstractX4OLanguageTask.java | 4 ++-- .../org/x4o/xml/lang/task/X4OLanguageTask.java | 2 +- .../xml/lang/task/X4OLanguageTaskException.java | 2 +- .../x4o/xml/lang/task/X4OStaticLanguageTask.java | 2 +- .../org/x4o/xml/lang/task/X4OStaticWriter.java | 4 ++-- .../xml/lang/task/run/X4OTaskCommandLine.java | 2 +- .../org/x4o/xml/lang/task/run/X4OTaskRunner.java | 2 +- .../org/x4o/xml/core/X4OEntityResolverTest.java | 2 +- .../x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java | 4 ++-- .../test/element/InlinePropertiesElement.java | 2 +- .../org/x4o/xml/eld/doc/EldDocLanguageTask.java | 2 +- .../java/org/x4o/xml/eld/doc/EldDocWriter.java | 6 +++--- .../xml/eld/doc/EldDocWriterElementClass.java | 2 +- .../x4o/xml/eld/doc/EldDocXTreePageWriter.java | 2 +- .../x4o/xml/eld/doc/api/ApiDocContentWriter.java | 2 +- .../org/x4o/xml/eld/doc/api/ApiDocGenerator.java | 8 ++++---- .../org/x4o/xml/eld/doc/api/ApiDocWriter.java | 6 +++--- .../xml/eld/doc/api/DefaultPageWriterHelp.java | 2 +- .../eld/doc/api/DefaultPageWriterIndexAll.java | 2 +- .../xml/eld/doc/api/DefaultPageWriterTree.java | 2 +- .../eld/doc/X4OWriteLanguageDocExecutorTest.java | 2 +- .../org/x4o/{xml => }/o2o/PropertyConfig.java | 2 +- .../x4o/{xml => }/o2o/io/ContentWriterHtml.java | 10 +++++----- .../x4o/{xml => }/o2o/io/ContentWriterXsd.java | 10 +++++----- .../org/x4o/{xml => }/o2o/io/package-info.java | 2 +- .../o2o/io/sax3/AbstractContentWriter.java | 4 ++-- .../io/sax3/AbstractContentWriterHandler.java | 12 ++++++------ .../io/sax3/AbstractContentWriterLexical.java | 6 +++--- .../x4o/{xml => }/o2o/io/sax3/AttributeMap.java | 2 +- .../x4o/{xml => }/o2o/io/sax3/ContentWriter.java | 2 +- .../{xml => }/o2o/io/sax3/ContentWriterTag.java | 2 +- .../o2o/io/sax3/ContentWriterTagWrapper.java | 2 +- .../{xml => }/o2o/io/sax3/ContentWriterXml.java | 2 +- .../x4o/{xml => }/o2o/io/sax3/XMLConstants.java | 2 +- .../x4o/{xml => }/o2o/io/sax3/package-info.java | 2 +- .../o2o/io/sax3/xdbx/AbstractXDBXWriter.java | 6 +++--- .../io/sax3/xdbx/AbstractXDBXWriterHandler.java | 14 +++++++------- .../io/sax3/xdbx/AbstractXDBXWriterLexical.java | 8 ++++---- .../o2o/io/sax3/xdbx/XDBXConstants.java | 2 +- .../o2o/io/sax3/xdbx/XDBXContentTag.java | 2 +- .../o2o/io/sax3/xdbx/XDBXReaderXml.java | 4 ++-- .../o2o/io/sax3/xdbx/XDBXWriterXml.java | 2 +- .../{xml => }/o2o/io/sax3/xdbx/package-info.java | 2 +- .../o2o/io/tlv/AbstractTLVChainAtom.java | 2 +- .../x4o/{xml => }/o2o/io/tlv/TLVChainAtom.java | 2 +- .../{xml => }/o2o/io/tlv/TLVChainAtomFrame.java | 2 +- .../o2o/io/tlv/TLVChainAtomFrameType.java | 2 +- .../o2o/io/tlv/TLVChainAtomSerializable.java | 2 +- .../{xml => }/o2o/io/tlv/TLVChainOctalSex.java | 12 ++++++------ .../o2o/io/tlv/TLVChainOctalSexFrame.java | 8 ++++---- .../o2o/io/tlv/TLVChainOctalSexFrameType.java | 4 ++-- .../{xml => }/o2o/io/tlv/TLVChainOctoBit.java | 4 ++-- .../o2o/io/tlv/TLVChainOctoBitFrame.java | 4 ++-- .../o2o/io/tlv/TLVChainOctoBitFrameType.java | 2 +- .../{xml => }/o2o/io/tlv/TLVChainSexTeenBit.java | 2 +- .../o2o/io/tlv/TLVChainSexTeenBitFrame.java | 2 +- .../o2o/io/tlv/TLVChainSexTeenBitFrameType.java | 2 +- .../x4o/{xml => }/o2o/io/tlv/package-info.java | 2 +- .../x4o/{xml => }/o2o/octal/PrimordialOctal.java | 2 +- .../o2o/octal/PrimordialOctalConsumer.java | 2 +- .../o2o/octal/PrimordialOctalIterator.java | 2 +- .../o2o/octal/PrimordialOctalOrangeHinari.java | 2 +- .../o2o/octal/PrimordialOctalOrangeJuice.java | 2 +- .../octal/PrimordialOctalOrangeJuiceAtoms.java | 2 +- .../o2o/octal/PrimordialOctalOrangeSexWord.java | 2 +- .../o2o/octal/PrimordialOctalOrangeString.java | 2 +- .../o2o/octal/PrimordialOctalSkullBait.java | 2 +- .../octal/PrimordialOctalSkullBaitIterable.java | 2 +- .../x4o/{xml => }/o2o/octal/package-info.java | 2 +- .../x4o/{xml => }/o2o/octo/OctoBitConverter.java | 2 +- .../x4o/{xml => }/o2o/octo/OctoBitFormat.java | 16 ++++++++-------- .../o2o/octo/conv/OctoConvSIntBigIndian.java | 4 ++-- .../o2o/octo/conv/OctoConvSLongBigIndian.java | 4 ++-- .../o2o/octo/conv/OctoConvStringCharset.java | 4 ++-- .../o2o/octo/conv/OctoConvStringHex.java | 4 ++-- .../o2o/octo/conv/OctoConvStringHexUtf8.java | 4 ++-- .../o2o/octo/conv/OctoConvStringIDN.java | 4 ++-- .../o2o/octo/conv/OctoConvUIntBigIndian.java | 4 ++-- .../{xml => }/o2o/octo/conv/package-info.java | 2 +- .../org/x4o/{xml => }/o2o/octo/package-info.java | 2 +- .../java/org/x4o/{xml => }/o2o/package-info.java | 2 +- .../io/sax3/ContentWriterXmlAttributeTest.java | 2 +- .../o2o/io/sax3/ContentWriterXmlCDataTest.java | 2 +- .../o2o/io/sax3/ContentWriterXmlTest.java | 2 +- .../o2o/io/sax3/xdbx/XDBXReaderXmlTest.java | 4 ++-- .../o2o/io/sax3/xdbx/XDBXWriterXmlTest.java | 4 ++-- .../octal/PrimordialOctalOrangeSexWordTest.java | 2 +- .../web/WarpCorePlasmaInspectorServlet.java | 10 +++++----- 133 files changed, 239 insertions(+), 239 deletions(-) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/PropertyConfig.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/ContentWriterHtml.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/ContentWriterXsd.java (93%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/package-info.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/AbstractContentWriter.java (92%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/AbstractContentWriterHandler.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/AbstractContentWriterLexical.java (94%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/AttributeMap.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/ContentWriter.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/ContentWriterTag.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/ContentWriterTagWrapper.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/ContentWriterXml.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/XMLConstants.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/package-info.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/AbstractXDBXWriter.java (90%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java (92%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/XDBXConstants.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/XDBXContentTag.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/XDBXReaderXml.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/XDBXWriterXml.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/package-info.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/AbstractTLVChainAtom.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainAtom.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainAtomFrame.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainAtomFrameType.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainAtomSerializable.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainOctalSex.java (93%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainOctalSexFrame.java (92%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainOctalSexFrameType.java (95%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainOctoBit.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainOctoBitFrame.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainOctoBitFrameType.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainSexTeenBit.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainSexTeenBitFrame.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/TLVChainSexTeenBitFrameType.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/io/tlv/package-info.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctal.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalConsumer.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalIterator.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalOrangeHinari.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalOrangeJuice.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalOrangeJuiceAtoms.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalOrangeSexWord.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalOrangeString.java (99%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalSkullBait.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalSkullBaitIterable.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octal/package-info.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/OctoBitConverter.java (98%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/OctoBitFormat.java (90%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/conv/OctoConvSIntBigIndian.java (96%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/conv/OctoConvSLongBigIndian.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/conv/OctoConvStringCharset.java (96%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/conv/OctoConvStringHex.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/conv/OctoConvStringHexUtf8.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/conv/OctoConvStringIDN.java (96%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/conv/OctoConvUIntBigIndian.java (96%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/conv/package-info.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/octo/package-info.java (97%) rename nx01-x4o-o2o/src/main/java/org/x4o/{xml => }/o2o/package-info.java (98%) rename nx01-x4o-o2o/src/test/java/org/x4o/{xml => }/o2o/io/sax3/ContentWriterXmlAttributeTest.java (99%) rename nx01-x4o-o2o/src/test/java/org/x4o/{xml => }/o2o/io/sax3/ContentWriterXmlCDataTest.java (99%) rename nx01-x4o-o2o/src/test/java/org/x4o/{xml => }/o2o/io/sax3/ContentWriterXmlTest.java (99%) rename nx01-x4o-o2o/src/test/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java (97%) rename nx01-x4o-o2o/src/test/java/org/x4o/{xml => }/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java (99%) rename nx01-x4o-o2o/src/test/java/org/x4o/{xml => }/o2o/octal/PrimordialOctalOrangeSexWordTest.java (98%) diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPrivateKey.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPrivateKey.java index 196fe83..1f8aaf7 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPrivateKey.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPrivateKey.java @@ -27,7 +27,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter; import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrust; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPublicKey.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPublicKey.java index a0170c9..f3535a4 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPublicKey.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/NoStrIdentityPublicKey.java @@ -27,7 +27,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter; import love.distributedrebirth.nx01.no2all.nostr.trust.OctoTrust; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventId.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventId.java index f6c4672..fe4ff6e 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventId.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventId.java @@ -27,7 +27,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.event; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplBinHexAdapter; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignature.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignature.java index 79fd320..5baf5df 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignature.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignature.java @@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.event; import java.io.StringWriter; import java.nio.charset.StandardCharsets; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.octo.OctoBitFormat; import jakarta.json.Json; import jakarta.json.JsonArray; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkTLV.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkTLV.java index ebc64cf..eab5554 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkTLV.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareB32LinkTLV.java @@ -30,8 +30,8 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; import java.util.Optional; import java.util.function.Consumer; -import org.x4o.xml.o2o.io.tlv.TLVChainOctoBit; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.io.tlv.TLVChainOctoBit; +import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareTLV; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeDeck.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeDeck.java index f469295..ea0c054 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeDeck.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeDeck.java @@ -33,10 +33,10 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import org.x4o.xml.o2o.io.tlv.TLVChainOctoBit; -import org.x4o.xml.o2o.io.tlv.TLVChainOctoBitFrame; -import org.x4o.xml.o2o.octo.OctoBitConverter; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.io.tlv.TLVChainOctoBit; +import org.x4o.o2o.io.tlv.TLVChainOctoBitFrame; +import org.x4o.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeStudio.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeStudio.java index 0cdf9b3..b2f72e6 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeStudio.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareBitChainTapeStudio.java @@ -31,9 +31,9 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import org.x4o.xml.o2o.io.tlv.TLVChainOctoBit; -import org.x4o.xml.o2o.octo.OctoBitConverter; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.io.tlv.TLVChainOctoBit; +import org.x4o.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEventReference.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEventReference.java index 7ca9fce..5f5c057 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEventReference.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkEventReference.java @@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; import java.util.List; import java.util.Objects; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.model.event.NoStrEventKind; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkRelay.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkRelay.java index 9dafd89..285963b 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkRelay.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkRelay.java @@ -27,7 +27,7 @@ package love.distributedrebirth.nx01.no2all.nostr.model.share; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.nip.NoStrImplShareLink; import love.distributedrebirth.nx01.no2all.nostr.trust.OctoBech32String; diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplBinHexAdapter.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplBinHexAdapter.java index 578e2a5..b20ebbd 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplBinHexAdapter.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplBinHexAdapter.java @@ -29,7 +29,7 @@ package love.distributedrebirth.nx01.no2all.nostr.nip; import java.util.Objects; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.octo.OctoBitFormat; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareTLV.java b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareTLV.java index e68deac..b675108 100644 --- a/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareTLV.java +++ b/nx01-no2all-nostr/src/main/java/love/distributedrebirth/nx01/no2all/nostr/nip/NoStrImplShareTLV.java @@ -27,7 +27,7 @@ package love.distributedrebirth.nx01.no2all.nostr.nip; -import org.x4o.xml.o2o.io.tlv.TLVChainOctoBitFrameType; +import org.x4o.o2o.io.tlv.TLVChainOctoBitFrameType; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignatureTest.java b/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignatureTest.java index 70ad55b..49f6ed4 100644 --- a/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignatureTest.java +++ b/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/event/NoStrEventSignatureTest.java @@ -36,7 +36,7 @@ import java.util.Optional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.octo.OctoBitFormat; import jakarta.json.Json; import jakarta.json.JsonReader; diff --git a/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfileTest.java b/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfileTest.java index 1c124be..c5d405e 100644 --- a/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfileTest.java +++ b/nx01-no2all-nostr/src/test/java/love/distributedrebirth/nx01/no2all/nostr/model/share/NoStrShareLinkProfileTest.java @@ -32,7 +32,7 @@ import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.o2o.octo.OctoBitFormat; +import org.x4o.o2o.octo.OctoBitFormat; import love.distributedrebirth.nx01.no2all.nostr.model.NoStrIdentityPublicKey; import love.distributedrebirth.nx01.no2all.nostr.model.share.NoStrShareLinkProfile; diff --git a/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterTable.java b/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterTable.java index 0fe1077..6e304d1 100644 --- a/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterTable.java +++ b/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterTable.java @@ -43,6 +43,7 @@ import org.apache.metamodel.schema.Column; import org.apache.metamodel.schema.Relationship; import org.apache.metamodel.schema.Table; import org.apache.metamodel.schema.TableType; +import org.x4o.o2o.io.ContentWriterHtml.Tag; import org.x4o.xml.eld.doc.api.ApiDocContentCss; import org.x4o.xml.eld.doc.api.ApiDocContentWriter; import org.x4o.xml.eld.doc.api.ApiDocNodeWriterMethod; @@ -50,7 +51,6 @@ import org.x4o.xml.eld.doc.api.dom.ApiDocIndexItem; import org.x4o.xml.eld.doc.api.dom.ApiDocNode; import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; -import org.x4o.xml.o2o.io.ContentWriterHtml.Tag; import org.xml.sax.SAXException; public class DocModelWriterTable { diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/WarpManifestorDriver.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/WarpManifestorDriver.java index 1ad2c67..953cbcf 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/WarpManifestorDriver.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/WarpManifestorDriver.java @@ -41,8 +41,8 @@ import java.util.Objects; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import org.x4o.xml.o2o.io.tlv.TLVChainOctalSex; -import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBit; +import org.x4o.o2o.io.tlv.TLVChainOctalSex; +import org.x4o.o2o.io.tlv.TLVChainSexTeenBit; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest2; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest2HeaderField; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4.java index 0bae59a..4c81ba5 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4.java @@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest; import java.util.ArrayList; import java.util.List; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; /// Warp manifest4 model. /// diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4HeaderField.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4HeaderField.java index a6de215..add7ca0 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4HeaderField.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4HeaderField.java @@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest; import java.util.ArrayList; import java.util.List; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; /// Warp manifest4 name value pair entry. /// diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4Section.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4Section.java index 5db343c..577bb7d 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4Section.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifest4Section.java @@ -30,7 +30,7 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest; import java.util.ArrayList; import java.util.List; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; /// Warp manifest4 section. /// diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheVersion.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheVersion.java index 1dd098f..8274708 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheVersion.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestTheVersion.java @@ -30,8 +30,8 @@ package love.distributedrebirth.nx01.warp.manifestor.manifest; import java.util.Arrays; import java.util.Optional; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeString; /// Warp manifest schema of the version. /// diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/ioini/ScopicIniContentReader.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/ioini/ScopicIniContentReader.java index 8c83750..e8e606a 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/ioini/ScopicIniContentReader.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/ioini/ScopicIniContentReader.java @@ -34,7 +34,7 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.PrimitiveIterator; -import org.x4o.xml.o2o.io.sax3.XMLConstants; +import org.x4o.o2o.io.sax3.XMLConstants; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestException; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java index 22ee83b..51c8648 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java @@ -29,8 +29,8 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf; import java.util.PrimitiveIterator; -import org.x4o.xml.o2o.io.sax3.XMLConstants; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.io.sax3.XMLConstants; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; /// Stroboscopic manifest 1 and 2 constants. /// diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestContentReader.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestContentReader.java index 04bbec4..3a23b1c 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestContentReader.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestContentReader.java @@ -35,7 +35,7 @@ import java.nio.charset.StandardCharsets; import java.util.Optional; import java.util.PrimitiveIterator; -import org.x4o.xml.o2o.io.sax3.XMLConstants; +import org.x4o.o2o.io.sax3.XMLConstants; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest3HeaderField; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestTheVersion; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentReader.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentReader.java index 5fda493..0da0e63 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentReader.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentReader.java @@ -31,8 +31,8 @@ import java.util.Iterator; import java.util.Objects; import java.util.Optional; -import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBit; -import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBitFrame; +import org.x4o.o2o.io.tlv.TLVChainSexTeenBit; +import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrame; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestTheVersion; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentWriter.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentWriter.java index b34547c..0692267 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentWriter.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3ContentWriter.java @@ -27,8 +27,8 @@ w * Copyright ©Δ∞ 仙上主天 package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf3; -import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBit; -import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBitFrameType; +import org.x4o.o2o.io.tlv.TLVChainSexTeenBit; +import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrameType; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestDuplicateDetector; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3FrameTLV.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3FrameTLV.java index 17b0cb3..bd04abe 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3FrameTLV.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf3/ScopicManifest3FrameTLV.java @@ -27,7 +27,7 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf3; -import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBitFrameType; +import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrameType; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentHandler.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentHandler.java index 0957bef..b896c9a 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentHandler.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentHandler.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest4; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest4Section; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentReader.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentReader.java index 0a27d19..10e4408 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentReader.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentReader.java @@ -30,9 +30,9 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4; import java.util.Iterator; import java.util.Objects; -import org.x4o.xml.o2o.io.tlv.TLVChainOctalSex; -import org.x4o.xml.o2o.io.tlv.TLVChainOctalSexFrame; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.io.tlv.TLVChainOctalSex; +import org.x4o.o2o.io.tlv.TLVChainOctalSexFrame; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestTheVersion; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java index 052b939..f07b034 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4ContentWriter.java @@ -27,9 +27,9 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4; -import org.x4o.xml.o2o.io.tlv.TLVChainOctalSex; -import org.x4o.xml.o2o.io.tlv.TLVChainOctalSexFrameType; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.io.tlv.TLVChainOctalSex; +import org.x4o.o2o.io.tlv.TLVChainOctalSexFrameType; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestContent; import love.distributedrebirth.nx01.warp.manifestor.scopic.ScopicManifestDuplicateDetector; diff --git a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4FrameTLV.java b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4FrameTLV.java index ca9e5c5..bc458f6 100644 --- a/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4FrameTLV.java +++ b/nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf4/ScopicManifest4FrameTLV.java @@ -27,10 +27,10 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf4; -import org.x4o.xml.o2o.io.tlv.TLVChainOctalSexFrameType; -import org.x4o.xml.o2o.io.tlv.TLVChainSexTeenBitFrameType; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuice; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeSexWord; +import org.x4o.o2o.io.tlv.TLVChainOctalSexFrameType; +import org.x4o.o2o.io.tlv.TLVChainSexTeenBitFrameType; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuice; +import org.x4o.o2o.octal.PrimordialOctalOrangeSexWord; import love.distributedrebirth.nx01.warp.manifestor.scopic.iomf3.ScopicManifest3FrameTLV; diff --git a/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameDupTest.java b/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameDupTest.java index 436dcb2..749ef27 100644 --- a/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameDupTest.java +++ b/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameDupTest.java @@ -31,7 +31,7 @@ import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString; +import org.x4o.o2o.octal.PrimordialOctalOrangeString; import love.distributedrebirth.nx01.warp.manifestor.WarpManifestorDriver; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest3; diff --git a/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameEmptyTest.java b/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameEmptyTest.java index e65be81..a0cf6bc 100644 --- a/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameEmptyTest.java +++ b/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestNameEmptyTest.java @@ -31,7 +31,7 @@ import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString; +import org.x4o.o2o.octal.PrimordialOctalOrangeString; import love.distributedrebirth.nx01.warp.manifestor.WarpManifestorDriver; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest3; diff --git a/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestSectionNameEmptyTest.java b/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestSectionNameEmptyTest.java index bb63d06..1ed8337 100644 --- a/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestSectionNameEmptyTest.java +++ b/nx01-warp-manifestor/src/test/java/love/distributedrebirth/nx01/warp/manifestor/manifest/WarpManifestSectionNameEmptyTest.java @@ -31,7 +31,7 @@ import java.util.Arrays; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString; +import org.x4o.o2o.octal.PrimordialOctalOrangeString; import love.distributedrebirth.nx01.warp.manifestor.WarpManifestorDriver; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest3; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java index a784ea1..fa41a3b 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java @@ -24,11 +24,11 @@ package org.x4o.xml.eld.xsd; import java.io.IOException; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.task.AbstractX4OLanguageTask; import org.x4o.xml.lang.task.X4OLanguageTaskException; import org.x4o.xml.lang.task.X4OLanguageTaskExecutor; -import org.x4o.xml.o2o.PropertyConfig; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java index 6ef0ebb..236dc08 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java @@ -28,13 +28,13 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig.PropertyConfigItem; +import org.x4o.o2o.io.ContentWriterXsd; +import org.x4o.o2o.io.sax3.ContentWriterXml; import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.lang.X4OLanguageModule; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem; -import org.x4o.xml.o2o.io.ContentWriterXsd; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; import org.x4o.xml.lang.X4OLanguage; import org.xml.sax.SAXException; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java index 1c7910d..f9f92ff 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java @@ -32,6 +32,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.io.ContentWriterXsd; +import org.x4o.o2o.io.ContentWriterXsd.Tag; +import org.x4o.o2o.io.sax3.ContentWriterXml; +import org.x4o.o2o.io.sax3.XMLConstants; import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementClassAttribute; @@ -40,11 +45,6 @@ import org.x4o.xml.element.ElementMetaBase; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.element.ElementNamespaceAttribute; import org.x4o.xml.lang.X4OLanguageModule; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.io.ContentWriterXsd; -import org.x4o.xml.o2o.io.ContentWriterXsd.Tag; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; -import org.x4o.xml.o2o.io.sax3.XMLConstants; import org.x4o.xml.lang.X4OLanguage; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java index 9f72eb3..c277644 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.lang.X4OLanguage; -import org.x4o.xml.o2o.PropertyConfig; /** * AbstractX4OConnection is the read/write interface for the classes. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java index b70ab55..a0ad56b 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java @@ -28,14 +28,14 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.io.UnsupportedEncodingException; +import org.x4o.o2o.io.sax3.ContentWriter; +import org.x4o.o2o.io.sax3.ContentWriterXml; import org.x4o.xml.lang.X4OLanguageSession; import org.x4o.xml.lang.X4OLanguageSessionLocal; import org.x4o.xml.lang.phase.X4OPhase; import org.x4o.xml.lang.phase.X4OPhaseException; import org.x4o.xml.lang.phase.X4OPhaseLanguageRead; import org.x4o.xml.lang.phase.X4OPhaseLanguageWrite; -import org.x4o.xml.o2o.io.sax3.ContentWriter; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OWriterSession.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OWriterSession.java index 57f6c61..6cabc4a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OWriterSession.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OWriterSession.java @@ -28,9 +28,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import org.x4o.o2o.io.sax3.ContentWriterXml; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.X4OLanguageSession; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java index 844611f..d4ea619 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java @@ -31,15 +31,15 @@ import java.net.URL; import javax.el.ValueExpression; import javax.xml.parsers.ParserConfigurationException; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig.PropertyConfigItem; +import org.x4o.o2o.io.sax3.ContentWriter; +import org.x4o.o2o.io.sax3.XMLConstants; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.X4OLanguageSession; import org.x4o.xml.lang.X4OLanguageSessionLocal; import org.x4o.xml.lang.phase.X4OPhaseException; import org.x4o.xml.lang.phase.X4OPhaseType; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem; -import org.x4o.xml.o2o.io.sax3.ContentWriter; -import org.x4o.xml.o2o.io.sax3.XMLConstants; import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java index 9db881b..63f762a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java @@ -33,6 +33,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig.PropertyConfigItem; +import org.x4o.o2o.io.sax3.ContentWriter; +import org.x4o.o2o.io.sax3.ContentWriterXml; +import org.x4o.o2o.io.sax3.XMLConstants; +import org.x4o.o2o.io.sax3.xdbx.XDBXWriterXml; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementClassAttribute; @@ -45,12 +51,6 @@ import org.x4o.xml.lang.X4OLanguageModule; import org.x4o.xml.lang.phase.X4OPhaseException; import org.x4o.xml.lang.phase.X4OPhaseLanguageWrite; import org.x4o.xml.lang.phase.X4OPhaseType; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem; -import org.x4o.xml.o2o.io.sax3.ContentWriter; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; -import org.x4o.xml.o2o.io.sax3.XMLConstants; -import org.x4o.xml.o2o.io.sax3.xdbx.XDBXWriterXml; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java index 124da38..6317aa7 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java @@ -22,14 +22,14 @@ */ package org.x4o.xml.io; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.io.sax3.AttributeMap; import org.x4o.xml.element.Element; import org.x4o.xml.element.Element.ElementType; import org.x4o.xml.element.ElementException; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.element.ElementNamespaceInstanceProvider; import org.x4o.xml.lang.X4OLanguageSession; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.io.sax3.AttributeMap; import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java index 15a5b7f..6b17fee 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java @@ -22,10 +22,10 @@ */ package org.x4o.xml.io; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.eld.EldDriver; import org.x4o.xml.element.ElementException; import org.x4o.xml.lang.X4OLanguageSession; -import org.x4o.xml.o2o.PropertyConfig; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java index f112807..dd4312a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java @@ -28,6 +28,9 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import org.x4o.o2o.io.sax3.ContentWriter; +import org.x4o.o2o.io.sax3.ContentWriterTagWrapper; +import org.x4o.o2o.io.sax3.XMLConstants; import org.x4o.xml.conv.ObjectConverter; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementNamespaceAttribute; @@ -48,9 +51,6 @@ import org.x4o.xml.lang.X4OLanguageConfiguration; import org.x4o.xml.lang.phase.X4OPhase; import org.x4o.xml.lang.phase.X4OPhaseException; import org.x4o.xml.lang.phase.X4OPhaseListener; -import org.x4o.xml.o2o.io.sax3.ContentWriter; -import org.x4o.xml.o2o.io.sax3.ContentWriterTagWrapper; -import org.x4o.xml.o2o.io.sax3.XMLConstants; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java index 47fe92a..c37ed3b 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java @@ -30,10 +30,10 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.lang.X4OLanguageModule; import org.x4o.xml.lang.X4OLanguageSession; -import org.x4o.xml.o2o.PropertyConfig; import org.x4o.xml.lang.X4OLanguageClassLoader; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java index 2cfe46b..011052a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java @@ -22,9 +22,9 @@ */ package org.x4o.xml.io; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.element.ElementException; import org.x4o.xml.lang.X4OLanguageSession; -import org.x4o.xml.o2o.PropertyConfig; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java index 9f40422..c2066eb 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java @@ -24,7 +24,7 @@ package org.x4o.xml.lang.task; import java.util.List; -import org.x4o.xml.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig; /** * AbstractX4OLanguageTask holds the language task meta info. @@ -53,7 +53,7 @@ public abstract class AbstractX4OLanguageTask implements X4OLanguageTask { protected abstract X4OLanguageTaskExecutor createTaskExecutorChecked(PropertyConfig config); /** - * @see org.x4o.xml.lang.task.X4OLanguageTask#createTaskExecutor(org.x4o.xml.o2o.PropertyConfig) + * @see org.x4o.xml.lang.task.X4OLanguageTask#createTaskExecutor(org.x4o.o2o.PropertyConfig) */ public X4OLanguageTaskExecutor createTaskExecutor(PropertyConfig config) { return createTaskExecutorChecked(checkConfig(config)); diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTask.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTask.java index dffd071..06df9f1 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTask.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTask.java @@ -22,7 +22,7 @@ */ package org.x4o.xml.lang.task; -import org.x4o.xml.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig; /** * X4OLanguageTask runs a task for a language. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTaskException.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTaskException.java index 2ea33e8..c150ea8 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTaskException.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTaskException.java @@ -22,7 +22,7 @@ */ package org.x4o.xml.lang.task; -import org.x4o.xml.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig; /** * X4OLanguageTaskException addes the property config to the exception. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java index 8004511..80a6725 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java @@ -24,8 +24,8 @@ package org.x4o.xml.lang.task; import java.io.IOException; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.lang.X4OLanguage; -import org.x4o.xml.o2o.PropertyConfig; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java index 09fe75e..a38881b 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java @@ -28,9 +28,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig.PropertyConfigItem; import org.x4o.xml.lang.X4OLanguageClassLoader; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskCommandLine.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskCommandLine.java index f8e0905..ccd667a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskCommandLine.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskCommandLine.java @@ -32,13 +32,13 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.task.X4OLanguageTask; import org.x4o.xml.lang.task.X4OLanguageTaskException; import org.x4o.xml.lang.task.X4OLanguageTaskExecutor; -import org.x4o.xml.o2o.PropertyConfig; /** * X4OLanguageTaskCommandLine runs a language task from the command line. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java index 0255e02..06adf9b 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java @@ -24,13 +24,13 @@ package org.x4o.xml.lang.task.run; import java.util.List; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.task.X4OLanguageTask; import org.x4o.xml.lang.task.X4OLanguageTaskException; import org.x4o.xml.lang.task.X4OLanguageTaskExecutor; -import org.x4o.xml.o2o.PropertyConfig; /** * X4OTaskRunner finds all x4o objects and configs and then run the x4o langauge task. diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java index c02c50b..52acb3f 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java @@ -26,12 +26,12 @@ import java.io.IOException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.X4ODriver; import org.x4o.xml.eld.CelDriver; import org.x4o.xml.io.DefaultX4OReader; import org.x4o.xml.io.X4OEntityResolver; import org.x4o.xml.lang.X4OLanguageSession; -import org.x4o.xml.o2o.PropertyConfig; import org.x4o.xml.test.TestDriver; import org.x4o.xml.test.models.TestObjectRoot; import org.xml.sax.EntityResolver; diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java index 1b32c69..66e8070 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java @@ -28,6 +28,8 @@ import java.util.Map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.io.sax3.ContentWriterXml; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; import org.x4o.xml.eld.CelDriver; @@ -35,8 +37,6 @@ import org.x4o.xml.eld.EldDriver; import org.x4o.xml.eld.EldModuleLoaderCore; import org.x4o.xml.io.X4OWriterTest; import org.x4o.xml.lang.task.X4OLanguageTask; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; import org.x4o.xml.test.swixml.SwiXmlDriver; /** diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/test/element/InlinePropertiesElement.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/test/element/InlinePropertiesElement.java index 39e802e..0028b32 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/test/element/InlinePropertiesElement.java +++ b/nx01-x4o-driver/src/test/java/org/x4o/xml/test/element/InlinePropertiesElement.java @@ -24,9 +24,9 @@ package org.x4o.xml.test.element; import java.io.StringWriter; +import org.x4o.o2o.io.sax3.ContentWriterXml; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; /** * InlinePropertiesElement to test diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java index c909679..8c5dc9e 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java @@ -22,12 +22,12 @@ */ package org.x4o.xml.eld.doc; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.element.ElementException; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.task.AbstractX4OLanguageTask; import org.x4o.xml.lang.task.X4OLanguageTaskException; import org.x4o.xml.lang.task.X4OLanguageTaskExecutor; -import org.x4o.xml.o2o.PropertyConfig; /** * X4OWriteLanguageDoc is support class to write html documentation from the eld. diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java index 98c31d9..cf94ad0 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java @@ -29,6 +29,9 @@ import java.util.Calendar; import java.util.List; import java.util.Map; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig.PropertyConfigItem; +import org.x4o.o2o.io.sax3.ContentWriterXml; import org.x4o.xml.eld.doc.api.ApiDocGenerator; import org.x4o.xml.eld.doc.api.DefaultPageWriterHelp; import org.x4o.xml.eld.doc.api.DefaultPageWriterIndexAll; @@ -49,9 +52,6 @@ import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.X4OLanguageModule; import org.x4o.xml.lang.X4OLanguageSession; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java index 7f99192..63a6c9b 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java @@ -24,6 +24,7 @@ package org.x4o.xml.eld.doc; import java.util.List; +import org.x4o.o2o.io.ContentWriterHtml.Tag; import org.x4o.xml.eld.doc.EldDocXTreePageWriter.TreeNode; import org.x4o.xml.eld.doc.api.ApiDocContentPrinter; import org.x4o.xml.eld.doc.api.ApiDocContentWriter; @@ -40,7 +41,6 @@ import org.x4o.xml.element.ElementConfigurator; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.X4OLanguageModule; -import org.x4o.xml.o2o.io.ContentWriterHtml.Tag; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java index 80ad8ed..3c077d1 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import org.x4o.o2o.io.ContentWriterHtml.Tag; import org.x4o.xml.eld.doc.api.ApiDocContentWriter; import org.x4o.xml.eld.doc.api.DefaultPageWriterTree; import org.x4o.xml.eld.doc.api.dom.ApiDoc; @@ -40,7 +41,6 @@ import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.X4OLanguageModule; -import org.x4o.xml.o2o.io.ContentWriterHtml.Tag; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentWriter.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentWriter.java index dc20017..3dbec1d 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentWriter.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentWriter.java @@ -26,7 +26,7 @@ import java.io.Writer; import java.util.Date; import java.util.List; -import org.x4o.xml.o2o.io.ContentWriterHtml; +import org.x4o.o2o.io.ContentWriterHtml; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java index 183f5ee..8bb96a6 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java @@ -40,6 +40,10 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; +import org.x4o.o2o.io.ContentWriterHtml.DocType; +import org.x4o.o2o.io.ContentWriterHtml.Tag; +import org.x4o.o2o.io.sax3.ContentWriterXml; +import org.x4o.o2o.io.sax3.XMLConstants; import org.x4o.xml.eld.doc.api.dom.ApiDoc; import org.x4o.xml.eld.doc.api.dom.ApiDocConcept; import org.x4o.xml.eld.doc.api.dom.ApiDocNavLink; @@ -52,10 +56,6 @@ import org.x4o.xml.eld.doc.api.dom.ApiDocNodeWriter; import org.x4o.xml.eld.doc.api.dom.ApiDocPage; import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter; import org.x4o.xml.lang.X4OLanguageClassLoader; -import org.x4o.xml.o2o.io.ContentWriterHtml.DocType; -import org.x4o.xml.o2o.io.ContentWriterHtml.Tag; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; -import org.x4o.xml.o2o.io.sax3.XMLConstants; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocWriter.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocWriter.java index 70bf60b..fcface6 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocWriter.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocWriter.java @@ -29,6 +29,9 @@ import java.util.Calendar; import java.util.List; import java.util.Map; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig.PropertyConfigItem; +import org.x4o.o2o.io.sax3.ContentWriterXml; import org.x4o.xml.eld.doc.api.ApiDocGenerator; import org.x4o.xml.eld.doc.api.DefaultPageWriterHelp; import org.x4o.xml.eld.doc.api.DefaultPageWriterIndexAll; @@ -49,9 +52,6 @@ import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.X4OLanguageModule; import org.x4o.xml.lang.X4OLanguageSession; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterHelp.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterHelp.java index 6d255bc..bb10edb 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterHelp.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterHelp.java @@ -22,12 +22,12 @@ */ package org.x4o.xml.eld.doc.api; +import org.x4o.o2o.io.ContentWriterHtml.Tag; import org.x4o.xml.eld.doc.api.dom.ApiDoc; import org.x4o.xml.eld.doc.api.dom.ApiDocConcept; import org.x4o.xml.eld.doc.api.dom.ApiDocPage; import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter; import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; -import org.x4o.xml.o2o.io.ContentWriterHtml.Tag; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterIndexAll.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterIndexAll.java index cc0d669..19c7a17 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterIndexAll.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterIndexAll.java @@ -22,10 +22,10 @@ */ package org.x4o.xml.eld.doc.api; +import org.x4o.o2o.io.ContentWriterHtml.Tag; import org.x4o.xml.eld.doc.api.dom.ApiDocPage; import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter; import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; -import org.x4o.xml.o2o.io.ContentWriterHtml.Tag; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterTree.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterTree.java index 9160fbb..a44600a 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterTree.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterTree.java @@ -22,12 +22,12 @@ */ package org.x4o.xml.eld.doc.api; +import org.x4o.o2o.io.ContentWriterHtml.Tag; import org.x4o.xml.eld.doc.api.dom.ApiDoc; import org.x4o.xml.eld.doc.api.dom.ApiDocNode; import org.x4o.xml.eld.doc.api.dom.ApiDocPage; import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter; import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; -import org.x4o.xml.o2o.io.ContentWriterHtml.Tag; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java b/nx01-x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java index b1f1245..37d818e 100644 --- a/nx01-x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java +++ b/nx01-x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java @@ -26,12 +26,12 @@ import java.io.File; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.x4o.o2o.PropertyConfig; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; import org.x4o.xml.eld.CelDriver; import org.x4o.xml.eld.EldDriver; import org.x4o.xml.lang.task.X4OLanguageTask; -import org.x4o.xml.o2o.PropertyConfig; import org.x4o.xml.test.TestDriver; /** diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/PropertyConfig.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/PropertyConfig.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/PropertyConfig.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/PropertyConfig.java index 6a06167..d639916 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/PropertyConfig.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/PropertyConfig.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o; +package org.x4o.o2o; import java.io.File; import java.util.ArrayList; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterHtml.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/ContentWriterHtml.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterHtml.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/ContentWriterHtml.java index 486a5f8..abdd50a 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterHtml.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/ContentWriterHtml.java @@ -20,15 +20,15 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io; +package org.x4o.o2o.io; import java.io.Writer; import java.util.Calendar; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.io.sax3.ContentWriterTagWrapper; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; -import org.x4o.xml.o2o.io.sax3.XMLConstants; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.io.sax3.ContentWriterTagWrapper; +import org.x4o.o2o.io.sax3.ContentWriterXml; +import org.x4o.o2o.io.sax3.XMLConstants; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterXsd.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/ContentWriterXsd.java similarity index 93% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterXsd.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/ContentWriterXsd.java index 99468d9..3b87363 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterXsd.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/ContentWriterXsd.java @@ -20,14 +20,14 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io; +package org.x4o.o2o.io; import java.io.Writer; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.io.sax3.ContentWriterTagWrapper; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; -import org.x4o.xml.o2o.io.sax3.XMLConstants; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.io.sax3.ContentWriterTagWrapper; +import org.x4o.o2o.io.sax3.ContentWriterXml; +import org.x4o.o2o.io.sax3.XMLConstants; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/package-info.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/package-info.java index 7a07686..9ad5a77 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/package-info.java @@ -27,4 +27,4 @@ * * @since 1.0 */ -package org.x4o.xml.o2o.io; +package org.x4o.o2o.io; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriter.java similarity index 92% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriter.java index b262171..c7e7dc3 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriter.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import java.io.Writer; @@ -45,7 +45,7 @@ public abstract class AbstractContentWriter extends AbstractContentWriterLexical /** * Starts and end then element. - * @see org.x4o.xml.o2o.io.sax3.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) + * @see org.x4o.o2o.io.sax3.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) */ public void startElementEnd(String uri, String localName, String name, Attributes atts) throws SAXException { startElement(uri,localName,name, atts); diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterHandler.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterHandler.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterHandler.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterHandler.java index ff5638c..96981b5 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterHandler.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterHandler.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import java.io.BufferedReader; import java.io.File; @@ -39,8 +39,8 @@ import java.util.PrimitiveIterator; import java.util.Set; import java.util.Stack; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig.PropertyConfigItem; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; @@ -516,7 +516,7 @@ public class AbstractContentWriterHandler implements ContentHandler { * Escape and prints xml characters. * @param text The text to write. * @throws SAXException When IOException has happend while printing. - * @see org.x4o.xml.o2o.io.sax3.ContentWriter#characters(java.lang.String) + * @see org.x4o.o2o.io.sax3.ContentWriter#characters(java.lang.String) */ public void characters(String text) throws SAXException { if (text==null) { @@ -557,7 +557,7 @@ public class AbstractContentWriterHandler implements ContentHandler { * * @param text The text to print. * @throws SAXException When IOException has happend while printing. - * @see org.x4o.xml.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String) + * @see org.x4o.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String) */ public void ignorableWhitespace(String text) throws SAXException { if (text==null) { @@ -644,7 +644,7 @@ public class AbstractContentWriterHandler implements ContentHandler { * * @param text The text to write. * @throws SAXException When IOException has happend while printing. - * @see org.x4o.xml.o2o.io.sax3.ContentWriter#comment(java.lang.String) + * @see org.x4o.o2o.io.sax3.ContentWriter#comment(java.lang.String) */ public void comment(String text) throws SAXException { if (text==null) { diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterLexical.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterLexical.java similarity index 94% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterLexical.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterLexical.java index 8512cc3..b0cb260 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterLexical.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AbstractContentWriterLexical.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import java.io.Writer; @@ -101,7 +101,7 @@ public abstract class AbstractContentWriterLexical extends AbstractContentWriter } /** - * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(char[], int, int) + * @see org.x4o.o2o.io.sax3.AbstractContentWriterHandler#characters(char[], int, int) */ @Override public void characters(char[] ch, int start, int length) throws SAXException { @@ -109,7 +109,7 @@ public abstract class AbstractContentWriterLexical extends AbstractContentWriter } /** - * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String) + * @see org.x4o.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String) */ @Override public void characters(String text) throws SAXException { diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AttributeMap.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AttributeMap.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AttributeMap.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AttributeMap.java index 36e383a..ac20270 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AttributeMap.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/AttributeMap.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import org.xml.sax.Attributes; import java.util.ArrayList; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriter.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriter.java index 683a024..feb21ef 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriter.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTag.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterTag.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTag.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterTag.java index 4861fef..9ef4a4c 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTag.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterTag.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTagWrapper.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterTagWrapper.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTagWrapper.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterTagWrapper.java index b8b3051..918d786 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTagWrapper.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterTagWrapper.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterXml.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterXml.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterXml.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterXml.java index 4ebe704..43369e1 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterXml.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/ContentWriterXml.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import java.io.OutputStream; import java.io.OutputStreamWriter; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/XMLConstants.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/XMLConstants.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/XMLConstants.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/XMLConstants.java index 2f3c648..46fea78 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/XMLConstants.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/XMLConstants.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import java.util.PrimitiveIterator; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/package-info.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/package-info.java index 9196824..009c061 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/package-info.java @@ -26,4 +26,4 @@ * @since 1.0 */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriter.java similarity index 90% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriter.java index 400dbc9..eca7cb9 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriter.java @@ -20,11 +20,11 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; import java.io.OutputStream; -import org.x4o.xml.o2o.io.sax3.ContentWriter; +import org.x4o.o2o.io.sax3.ContentWriter; import org.xml.sax.Attributes; import org.xml.sax.SAXException; @@ -46,7 +46,7 @@ public abstract class AbstractXDBXWriter extends AbstractXDBXWriterLexical imple /** * Starts and end then element. - * @see org.x4o.xml.o2o.io.sax3.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) + * @see org.x4o.o2o.io.sax3.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) */ public void startElementEnd(String uri, String localName, String name, Attributes atts) throws SAXException { startElement(uri,localName,name, atts); diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java index 307f1f9..ee54535 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; import java.io.BufferedReader; import java.io.File; @@ -40,9 +40,9 @@ import java.util.PrimitiveIterator; import java.util.Set; import java.util.Stack; -import org.x4o.xml.o2o.PropertyConfig; -import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem; -import org.x4o.xml.o2o.io.sax3.XMLConstants; +import org.x4o.o2o.PropertyConfig; +import org.x4o.o2o.PropertyConfig.PropertyConfigItem; +import org.x4o.o2o.io.sax3.XMLConstants; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; @@ -494,7 +494,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler { * Escape and prints xml characters. * @param text The text to write. * @throws SAXException When IOException has happend while printing. - * @see org.x4o.xml.o2o.io.sax3.ContentWriter#characters(java.lang.String) + * @see org.x4o.o2o.io.sax3.ContentWriter#characters(java.lang.String) */ public void characters(String text) throws SAXException { if (text==null) { @@ -533,7 +533,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler { * * @param text The text to print. * @throws SAXException When IOException has happend while printing. - * @see org.x4o.xml.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String) + * @see org.x4o.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String) */ public void ignorableWhitespace(String text) throws SAXException { if (text==null) { @@ -621,7 +621,7 @@ public class AbstractXDBXWriterHandler implements ContentHandler { * * @param text The text to write. * @throws SAXException When IOException has happend while printing. - * @see org.x4o.xml.o2o.io.sax3.ContentWriter#comment(java.lang.String) + * @see org.x4o.o2o.io.sax3.ContentWriter#comment(java.lang.String) */ public void comment(String text) throws SAXException { if (text==null) { diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java similarity index 92% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java index 611d46e..723181f 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java @@ -20,11 +20,11 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; import java.io.OutputStream; -import org.x4o.xml.o2o.io.sax3.XMLConstants; +import org.x4o.o2o.io.sax3.XMLConstants; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; @@ -86,7 +86,7 @@ public abstract class AbstractXDBXWriterLexical extends AbstractXDBXWriterHandle } /** - * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(char[], int, int) + * @see org.x4o.o2o.io.sax3.AbstractContentWriterHandler#characters(char[], int, int) */ @Override public void characters(char[] ch, int start, int length) throws SAXException { @@ -94,7 +94,7 @@ public abstract class AbstractXDBXWriterLexical extends AbstractXDBXWriterHandle } /** - * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String) + * @see org.x4o.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String) */ @Override public void characters(String text) throws SAXException { diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXConstants.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXConstants.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXConstants.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXConstants.java index 6cfd430..3b872f2 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXConstants.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXConstants.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; /** * XDBXConstants for writing binary XML. diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXContentTag.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXContentTag.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXContentTag.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXContentTag.java index b248979..e5f496c 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXContentTag.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXContentTag.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; /** * XDBXContentTag indicate the binary tag of the XDBX stream. diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXml.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXReaderXml.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXml.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXReaderXml.java index c4a089f..5b0d92f 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXml.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXReaderXml.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; import java.io.IOException; import java.io.InputStream; @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Stack; -import org.x4o.xml.o2o.io.sax3.ContentWriter; +import org.x4o.o2o.io.sax3.ContentWriter; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXml.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXWriterXml.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXml.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXWriterXml.java index de03bea..cb59d2e 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXml.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/XDBXWriterXml.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; import java.io.OutputStream; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/package-info.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/package-info.java index 04a6745..50f1ec8 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/sax3/xdbx/package-info.java @@ -26,4 +26,4 @@ * @since 1.0 */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/AbstractTLVChainAtom.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/AbstractTLVChainAtom.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/AbstractTLVChainAtom.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/AbstractTLVChainAtom.java index 8289935..5fc7420 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/AbstractTLVChainAtom.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/AbstractTLVChainAtom.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; import java.util.ArrayList; import java.util.Iterator; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtom.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtom.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtom.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtom.java index 0fdaf81..5eb8704 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtom.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtom.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; import java.util.ArrayList; import java.util.Iterator; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtomFrame.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrame.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtomFrame.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrame.java index 96dc36b..2ba707a 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtomFrame.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrame.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtomFrameType.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrameType.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtomFrameType.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrameType.java index 9166199..a2ea578 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtomFrameType.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomFrameType.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtomSerializable.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomSerializable.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtomSerializable.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomSerializable.java index e57488f..43f6ecb 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainAtomSerializable.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainAtomSerializable.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctalSex.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java similarity index 93% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctalSex.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java index 503cc30..5dbcab8 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctalSex.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSex.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; import java.io.IOException; import java.io.InputStream; @@ -33,11 +33,11 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import org.x4o.xml.o2o.octal.PrimordialOctal; -import org.x4o.xml.o2o.octal.PrimordialOctalIterator; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuice; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeSexWord; +import org.x4o.o2o.octal.PrimordialOctal; +import org.x4o.o2o.octal.PrimordialOctalIterator; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuice; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeSexWord; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctalSexFrame.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java similarity index 92% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctalSexFrame.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java index a0c0e6a..08e339d 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctalSexFrame.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrame.java @@ -25,13 +25,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; import java.util.Objects; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuice; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuiceAtoms; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeString; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuice; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuiceAtoms; +import org.x4o.o2o.octal.PrimordialOctalOrangeString; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctalSexFrameType.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrameType.java similarity index 95% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctalSexFrameType.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrameType.java index b015b5a..17fd229 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctalSexFrameType.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctalSexFrameType.java @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; -import org.x4o.xml.o2o.octal.PrimordialOctalOrangeJuice; +import org.x4o.o2o.octal.PrimordialOctalOrangeJuice; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctoBit.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBit.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctoBit.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBit.java index ac410b2..e95f420 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctoBit.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBit.java @@ -25,14 +25,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; -import org.x4o.xml.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctoBitFrame.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrame.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctoBitFrame.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrame.java index 0272c0e..4f40970 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctoBitFrame.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrame.java @@ -25,12 +25,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; import java.util.Arrays; import java.util.Objects; -import org.x4o.xml.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctoBitFrameType.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrameType.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctoBitFrameType.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrameType.java index 5c814c9..4cef711 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainOctoBitFrameType.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainOctoBitFrameType.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainSexTeenBit.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBit.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainSexTeenBit.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBit.java index 6efcd9e..0af9552 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainSexTeenBit.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBit.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; import java.io.IOException; import java.io.InputStream; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainSexTeenBitFrame.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrame.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainSexTeenBitFrame.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrame.java index cc16962..092e94d 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainSexTeenBitFrame.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrame.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; import java.util.Arrays; import java.util.Objects; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainSexTeenBitFrameType.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrameType.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainSexTeenBitFrameType.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrameType.java index 21364a3..0b89969 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/TLVChainSexTeenBitFrameType.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/TLVChainSexTeenBitFrameType.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/package-info.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/package-info.java index d11e1d7..bc253d7 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/io/tlv/package-info.java @@ -27,4 +27,4 @@ * * @since 1.0 */ -package org.x4o.xml.o2o.io.tlv; +package org.x4o.o2o.io.tlv; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctal.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctal.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctal.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctal.java index 94ac998..286d52e 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctal.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctal.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; import java.io.IOException; import java.io.InputStream; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalConsumer.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalConsumer.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalConsumer.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalConsumer.java index eaddf2c..705c053 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalConsumer.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalConsumer.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; /// Bait based octal consumer. /// diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalIterator.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalIterator.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalIterator.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalIterator.java index 40426fd..18d73c0 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalIterator.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalIterator.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; import java.util.ArrayList; import java.util.Collection; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeHinari.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeHinari.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeHinari.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeHinari.java index 7f3b6af..fc49874 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeHinari.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeHinari.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; import java.util.ArrayList; import java.util.Iterator; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeJuice.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeJuice.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeJuice.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeJuice.java index 0e3e578..0478cba 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeJuice.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeJuice.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; /// Primordial octal skulls to speak juicy hinari. /// diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeJuiceAtoms.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeJuiceAtoms.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeJuiceAtoms.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeJuiceAtoms.java index f6e62ed..95eed4b 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeJuiceAtoms.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeJuiceAtoms.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; /// Primordial octal string of juice atoms. /// diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeSexWord.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeSexWord.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeSexWord.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeSexWord.java index 4977050..d36647f 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeSexWord.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeSexWord.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; import java.io.IOException; import java.io.InputStream; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeString.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeString.java similarity index 99% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeString.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeString.java index ddefb62..6f12fb7 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeString.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalOrangeString.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; import java.util.Arrays; import java.util.List; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalSkullBait.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalSkullBait.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalSkullBait.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalSkullBait.java index ae2af2f..8998866 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalSkullBait.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalSkullBait.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; /// Bait based octal skull. /// diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalSkullBaitIterable.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalSkullBaitIterable.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalSkullBaitIterable.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalSkullBaitIterable.java index d362381..96eba50 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/PrimordialOctalSkullBaitIterable.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/PrimordialOctalSkullBaitIterable.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; import java.util.Spliterator; import java.util.Spliterators; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/package-info.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/package-info.java index 1a5fd57..c25e393 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octal/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octal/package-info.java @@ -27,4 +27,4 @@ * @since 1.0 */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/OctoBitConverter.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitConverter.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/OctoBitConverter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitConverter.java index 802aec4..a112440 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/OctoBitConverter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitConverter.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octo; +package org.x4o.o2o.octo; /// October bit converter. /// diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/OctoBitFormat.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitFormat.java similarity index 90% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/OctoBitFormat.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitFormat.java index e913bc7..579d6a5 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/OctoBitFormat.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/OctoBitFormat.java @@ -25,17 +25,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octo; +package org.x4o.o2o.octo; import java.nio.charset.StandardCharsets; -import org.x4o.xml.o2o.octo.conv.OctoConvSIntBigIndian; -import org.x4o.xml.o2o.octo.conv.OctoConvSLongBigIndian; -import org.x4o.xml.o2o.octo.conv.OctoConvStringCharset; -import org.x4o.xml.o2o.octo.conv.OctoConvStringHex; -import org.x4o.xml.o2o.octo.conv.OctoConvStringHexUtf8; -import org.x4o.xml.o2o.octo.conv.OctoConvStringIDN; -import org.x4o.xml.o2o.octo.conv.OctoConvUIntBigIndian; +import org.x4o.o2o.octo.conv.OctoConvSIntBigIndian; +import org.x4o.o2o.octo.conv.OctoConvSLongBigIndian; +import org.x4o.o2o.octo.conv.OctoConvStringCharset; +import org.x4o.o2o.octo.conv.OctoConvStringHex; +import org.x4o.o2o.octo.conv.OctoConvStringHexUtf8; +import org.x4o.o2o.octo.conv.OctoConvStringIDN; +import org.x4o.o2o.octo.conv.OctoConvUIntBigIndian; /// October bits codec converters. /// diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvSIntBigIndian.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSIntBigIndian.java similarity index 96% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvSIntBigIndian.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSIntBigIndian.java index 5b9eaa2..33c4496 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvSIntBigIndian.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSIntBigIndian.java @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octo.conv; +package org.x4o.o2o.octo.conv; -import org.x4o.xml.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvSLongBigIndian.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSLongBigIndian.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvSLongBigIndian.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSLongBigIndian.java index 9fa49fd..c4cfbd9 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvSLongBigIndian.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvSLongBigIndian.java @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octo.conv; +package org.x4o.o2o.octo.conv; -import org.x4o.xml.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringCharset.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringCharset.java similarity index 96% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringCharset.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringCharset.java index b20f68a..2275a17 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringCharset.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringCharset.java @@ -25,12 +25,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octo.conv; +package org.x4o.o2o.octo.conv; import java.nio.charset.Charset; import java.util.Objects; -import org.x4o.xml.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringHex.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHex.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringHex.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHex.java index abe5696..079abbb 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringHex.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHex.java @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octo.conv; +package org.x4o.o2o.octo.conv; -import org.x4o.xml.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringHexUtf8.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHexUtf8.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringHexUtf8.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHexUtf8.java index eb2573e..b52728c 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringHexUtf8.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringHexUtf8.java @@ -25,14 +25,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octo.conv; +package org.x4o.o2o.octo.conv; import java.io.ByteArrayOutputStream; import java.util.HashMap; import java.util.Map; import java.util.PrimitiveIterator.OfInt; -import org.x4o.xml.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringIDN.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringIDN.java similarity index 96% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringIDN.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringIDN.java index 7d7de7d..37c4432 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvStringIDN.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvStringIDN.java @@ -25,12 +25,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octo.conv; +package org.x4o.o2o.octo.conv; import java.net.IDN; import java.nio.charset.StandardCharsets; -import org.x4o.xml.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvUIntBigIndian.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvUIntBigIndian.java similarity index 96% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvUIntBigIndian.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvUIntBigIndian.java index ea677ba..2201023 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/OctoConvUIntBigIndian.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/OctoConvUIntBigIndian.java @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octo.conv; +package org.x4o.o2o.octo.conv; -import org.x4o.xml.o2o.octo.OctoBitConverter; +import org.x4o.o2o.octo.OctoBitConverter; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/package-info.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/package-info.java index 71633aa..933913b 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/conv/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/conv/package-info.java @@ -27,4 +27,4 @@ * @since 1.0 */ -package org.x4o.xml.o2o.octo.conv; +package org.x4o.o2o.octo.conv; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/package-info.java similarity index 97% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/package-info.java index 0179765..ca6b1cc 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/octo/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/octo/package-info.java @@ -27,4 +27,4 @@ * @since 1.0 */ -package org.x4o.xml.o2o.octo; +package org.x4o.o2o.octo; diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/package-info.java similarity index 98% rename from nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/package-info.java index e0cac33..f099614 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/package-info.java @@ -27,4 +27,4 @@ * * @since 1.0 */ -package org.x4o.xml.o2o; +package org.x4o.o2o; diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlAttributeTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/ContentWriterXmlAttributeTest.java similarity index 99% rename from nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlAttributeTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/ContentWriterXmlAttributeTest.java index 6f41225..28e4db5 100644 --- a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlAttributeTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/ContentWriterXmlAttributeTest.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import java.io.ByteArrayInputStream; import java.io.StringWriter; diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlCDataTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/ContentWriterXmlCDataTest.java similarity index 99% rename from nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlCDataTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/ContentWriterXmlCDataTest.java index 4e7a4b8..5495167 100644 --- a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlCDataTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/ContentWriterXmlCDataTest.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import java.io.StringWriter; diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/ContentWriterXmlTest.java similarity index 99% rename from nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/ContentWriterXmlTest.java index a8f109d..c833778 100644 --- a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/ContentWriterXmlTest.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3; +package org.x4o.o2o.io.sax3; import java.io.StringWriter; diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java similarity index 97% rename from nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java index 7b96d21..67bad9a 100644 --- a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -33,7 +33,7 @@ import javax.xml.parsers.SAXParserFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; +import org.x4o.o2o.io.sax3.ContentWriterXml; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java similarity index 99% rename from nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java index 707a7e6..892d2bb 100644 --- a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.io.sax3.xdbx; +package org.x4o.o2o.io.sax3.xdbx; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,7 +28,7 @@ import java.io.StringWriter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; +import org.x4o.o2o.io.sax3.ContentWriterXml; import org.xml.sax.helpers.AttributesImpl; /** diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeSexWordTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/octal/PrimordialOctalOrangeSexWordTest.java similarity index 98% rename from nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeSexWordTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/o2o/octal/PrimordialOctalOrangeSexWordTest.java index 7271a81..bed98d2 100644 --- a/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/octal/PrimordialOctalOrangeSexWordTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/octal/PrimordialOctalOrangeSexWordTest.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.o2o.octal; +package org.x4o.o2o.octal; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/web/WarpCorePlasmaInspectorServlet.java b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/web/WarpCorePlasmaInspectorServlet.java index 63c87c1..3ba446d 100644 --- a/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/web/WarpCorePlasmaInspectorServlet.java +++ b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/web/WarpCorePlasmaInspectorServlet.java @@ -31,11 +31,11 @@ import java.io.BufferedWriter; import java.io.IOException; import java.util.List; -import org.x4o.xml.o2o.io.sax3.ContentWriter; -import org.x4o.xml.o2o.io.sax3.ContentWriterTagWrapper; -import org.x4o.xml.o2o.io.sax3.ContentWriterXml; -import org.x4o.xml.o2o.io.sax3.XMLConstants; -import org.x4o.xml.o2o.io.sax3.xdbx.XDBXWriterXml; +import org.x4o.o2o.io.sax3.ContentWriter; +import org.x4o.o2o.io.sax3.ContentWriterTagWrapper; +import org.x4o.o2o.io.sax3.ContentWriterXml; +import org.x4o.o2o.io.sax3.XMLConstants; +import org.x4o.o2o.io.sax3.xdbx.XDBXWriterXml; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl;