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 8097b4d..8c83750 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.io.XMLConstants; +import org.x4o.xml.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 b1a0c22..22ee83b 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,7 +29,7 @@ package love.distributedrebirth.nx01.warp.manifestor.scopic.iomf; import java.util.PrimitiveIterator; -import org.x4o.xml.io.XMLConstants; +import org.x4o.xml.o2o.io.sax3.XMLConstants; import org.x4o.xml.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 b6cfddc..04bbec4 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.io.XMLConstants; +import org.x4o.xml.o2o.io.sax3.XMLConstants; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifest3HeaderField; import love.distributedrebirth.nx01.warp.manifestor.manifest.WarpManifestTheVersion; 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 7c81f4c..a784ea1 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.xml.io.sax.ext.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 df9ff3c..c248faa 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 @@ -30,11 +30,11 @@ import java.io.Writer; import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementNamespace; -import org.x4o.xml.io.sax.ext.ContentWriterXml; -import org.x4o.xml.io.sax.ext.ContentWriterXsd; -import org.x4o.xml.io.sax.ext.PropertyConfig; -import org.x4o.xml.io.sax.ext.PropertyConfig.PropertyConfigItem; 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 6c13e76..1c7910d 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 @@ -39,12 +39,12 @@ import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementMetaBase; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.element.ElementNamespaceAttribute; -import org.x4o.xml.io.XMLConstants; -import org.x4o.xml.io.sax.ext.ContentWriterXml; -import org.x4o.xml.io.sax.ext.ContentWriterXsd; -import org.x4o.xml.io.sax.ext.ContentWriterXsd.Tag; -import org.x4o.xml.io.sax.ext.PropertyConfig; 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 d3c3361..9f72eb3 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.xml.io.sax.ext.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 d31c5d9..b70ab55 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,15 +28,14 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.io.UnsupportedEncodingException; -import org.x4o.xml.io.sax.X4ODebugWriter; -import org.x4o.xml.io.sax.ext.ContentWriter; -import org.x4o.xml.io.sax.ext.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 5ebcf8a..57f6c61 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.xml.io.sax.ext.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 df3fea6..6eec66e 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.xml.io.sax.X4OContentParser; -import org.x4o.xml.io.sax.ext.ContentWriter; -import org.x4o.xml.io.sax.ext.PropertyConfig; -import org.x4o.xml.io.sax.ext.PropertyConfig.PropertyConfigItem; 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 895ec77..c94a998 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 @@ -39,17 +39,18 @@ import org.x4o.xml.element.ElementClassAttribute; import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.element.ElementObjectPropertyValueException; -import org.x4o.xml.io.sax.ext.ContentWriter; -import org.x4o.xml.io.sax.ext.PropertyConfig; -import org.x4o.xml.io.sax.ext.ContentWriterXml; -import org.x4o.xml.io.sax.ext.PropertyConfig.PropertyConfigItem; -import org.x4o.xml.io.sax.xdbx.XDBXWriterXml; import org.x4o.xml.lang.X4OLanguage; import org.x4o.xml.lang.X4OLanguageSession; 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/sax/X4OContentHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java similarity index 98% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OContentHandler.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java index 5730e36..124da38 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OContentHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java @@ -20,17 +20,16 @@ * 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.io.sax; +package org.x4o.xml.io; 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.io.DefaultX4OReader; -import org.x4o.xml.io.sax.ext.AttributeMap; -import org.x4o.xml.io.sax.ext.PropertyConfig; 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/sax/X4OContentParser.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java similarity index 99% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OContentParser.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java index fddc3c8..15a5b7f 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OContentParser.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java @@ -20,13 +20,12 @@ * 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.io.sax; +package org.x4o.xml.io; import org.x4o.xml.eld.EldDriver; import org.x4o.xml.element.ElementException; -import org.x4o.xml.io.DefaultX4OReader; -import org.x4o.xml.io.sax.ext.PropertyConfig; 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/sax/X4ODebugWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java similarity index 99% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4ODebugWriter.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java index 7bf5dc3..f112807 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4ODebugWriter.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.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.io.sax; +package org.x4o.xml.io; import java.lang.reflect.Method; import java.util.ArrayList; @@ -41,10 +41,6 @@ import org.x4o.xml.element.ElementException; import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.element.ElementNamespaceInstanceProvider; -import org.x4o.xml.io.X4OConnection; -import org.x4o.xml.io.XMLConstants; -import org.x4o.xml.io.sax.ext.ContentWriter; -import org.x4o.xml.io.sax.ext.ContentWriterTagWrapper; import org.x4o.xml.lang.X4OLanguageModule; import org.x4o.xml.lang.X4OLanguageModuleLoaderResult; import org.x4o.xml.lang.X4OLanguageSession; @@ -52,6 +48,9 @@ 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/sax/X4OEntityResolver.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java similarity index 98% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OEntityResolver.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java index b64806a..47fe92a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OEntityResolver.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.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.io.sax; +package org.x4o.xml.io; import java.io.File; import java.io.FileInputStream; @@ -31,10 +31,9 @@ import java.util.Map; import java.util.logging.Logger; import org.x4o.xml.element.ElementNamespace; -import org.x4o.xml.io.DefaultX4OReader; -import org.x4o.xml.io.sax.ext.PropertyConfig; 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/sax/X4OErrorHandler.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java similarity index 97% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OErrorHandler.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java index 16a1e1c..2cfe46b 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OErrorHandler.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java @@ -20,12 +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.io.sax; +package org.x4o.xml.io; import org.x4o.xml.element.ElementException; -import org.x4o.xml.io.DefaultX4OReader; -import org.x4o.xml.io.sax.ext.PropertyConfig; 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/io/sax/package-info.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/package-info.java deleted file mode 100644 index 0a4670d..0000000 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/package-info.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2004-2014, Willem Cazander - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are permitted provided - * that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this list of conditions and the - * following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and - * the following disclaimer in the documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * 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. - */ -/** - * The SAX based classes and interfaces. - * - * @since 1.0 - */ - -package org.x4o.xml.io.sax; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java index 4587937..fb44ab3 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java @@ -32,7 +32,7 @@ import javax.el.ExpressionFactory; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementAttributeValueParser; import org.x4o.xml.element.ElementObjectPropertyValue; -import org.x4o.xml.io.sax.X4ODebugWriter; +import org.x4o.xml.io.X4ODebugWriter; import org.x4o.xml.lang.phase.X4OPhase; /** @@ -191,7 +191,7 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo } /** - * @see org.x4o.xml.lang.X4OLanguageSessionLocal#setX4ODebugWriter(org.x4o.xml.io.sax.X4ODebugWriter) + * @see org.x4o.xml.lang.X4OLanguageSessionLocal#setX4ODebugWriter(org.x4o.xml.io.X4ODebugWriter) */ public void setX4ODebugWriter(X4ODebugWriter debugWriter) { this.debugWriter=debugWriter; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java index 0cd6de6..802f63e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java @@ -30,7 +30,7 @@ import javax.el.ExpressionFactory; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementAttributeValueParser; import org.x4o.xml.element.ElementObjectPropertyValue; -import org.x4o.xml.io.sax.X4ODebugWriter; +import org.x4o.xml.io.X4ODebugWriter; import org.x4o.xml.lang.phase.X4OPhase; /** diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java index 106ffe6..e55592c 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java @@ -27,7 +27,7 @@ import javax.el.ExpressionFactory; import org.x4o.xml.element.ElementAttributeValueParser; import org.x4o.xml.element.ElementObjectPropertyValue; -import org.x4o.xml.io.sax.X4ODebugWriter; +import org.x4o.xml.io.X4ODebugWriter; import org.x4o.xml.lang.phase.X4OPhase; /** diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java index d5432b1..70907f0 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java +++ b/nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java @@ -32,6 +32,7 @@ import java.util.logging.Logger; import org.x4o.xml.conv.ObjectConverterException; import org.x4o.xml.element.Element; import org.x4o.xml.element.ElementNamespaceAttribute; +import org.x4o.xml.io.X4ODebugWriter; import org.x4o.xml.element.ElementAttributeValueParser; import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementClassAttribute; @@ -40,7 +41,6 @@ import org.x4o.xml.element.ElementConfiguratorGlobal; import org.x4o.xml.element.ElementException; import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementNamespace; -import org.x4o.xml.io.sax.X4ODebugWriter; import org.x4o.xml.lang.X4OLanguageModule; import org.x4o.xml.lang.X4OLanguageSession; import org.x4o.xml.lang.X4OLanguageClassLoader; 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 0e2d69c..9f40422 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.io.sax.ext.PropertyConfig; +import org.x4o.xml.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.io.sax.ext.PropertyConfig) + * @see org.x4o.xml.lang.task.X4OLanguageTask#createTaskExecutor(org.x4o.xml.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 d637546..dffd071 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.io.sax.ext.PropertyConfig; +import org.x4o.xml.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 56e2776..2ea33e8 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.io.sax.ext.PropertyConfig; +import org.x4o.xml.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 b9252ed..8004511 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.xml.io.sax.ext.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 1f59d53..c13ed63 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.xml.io.sax.ext.PropertyConfig; -import org.x4o.xml.io.sax.ext.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 1a14403..f8e0905 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 @@ -34,11 +34,11 @@ import java.util.Properties; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; -import org.x4o.xml.io.sax.ext.PropertyConfig; 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 3693620..0255e02 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 @@ -26,11 +26,11 @@ import java.util.List; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; -import org.x4o.xml.io.sax.ext.PropertyConfig; 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 3a2669e..305bf46 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 @@ -29,9 +29,9 @@ import org.junit.jupiter.api.Test; import org.x4o.xml.X4ODriver; import org.x4o.xml.eld.CelDriver; import org.x4o.xml.io.DefaultX4OReader; -import org.x4o.xml.io.sax.X4OEntityResolver; -import org.x4o.xml.io.sax.ext.PropertyConfig; +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 593a629..1b32c69 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 @@ -34,9 +34,9 @@ import org.x4o.xml.eld.CelDriver; import org.x4o.xml.eld.EldDriver; import org.x4o.xml.eld.EldModuleLoaderCore; import org.x4o.xml.io.X4OWriterTest; -import org.x4o.xml.io.sax.ext.ContentWriterXml; -import org.x4o.xml.io.sax.ext.PropertyConfig; 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 e69a428..39e802e 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 @@ -26,7 +26,7 @@ import java.io.StringWriter; import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.ElementException; -import org.x4o.xml.io.sax.ext.ContentWriterXml; +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 8875314..c909679 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 @@ -23,11 +23,11 @@ package org.x4o.xml.eld.doc; import org.x4o.xml.element.ElementException; -import org.x4o.xml.io.sax.ext.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; /** * 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 d9f7bb9..88f4818 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 @@ -46,12 +46,12 @@ import org.x4o.xml.element.ElementConfiguratorGlobal; import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementException; import org.x4o.xml.element.ElementNamespace; -import org.x4o.xml.io.sax.ext.ContentWriterXml; -import org.x4o.xml.io.sax.ext.PropertyConfig; -import org.x4o.xml.io.sax.ext.PropertyConfig.PropertyConfigItem; 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/ApiDocGenerator.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java index 6f44c22..61f78ee 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 @@ -53,9 +53,9 @@ import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; 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.io.XMLConstants; -import org.x4o.xml.io.sax.ext.ContentWriterXml; import org.x4o.xml.lang.X4OLanguageClassLoader; +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 756d6a5..0a7abcc 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 @@ -46,12 +46,12 @@ import org.x4o.xml.element.ElementConfiguratorGlobal; import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementException; import org.x4o.xml.element.ElementNamespace; -import org.x4o.xml.io.sax.ext.ContentWriterXml; -import org.x4o.xml.io.sax.ext.PropertyConfig; -import org.x4o.xml.io.sax.ext.PropertyConfig.PropertyConfigItem; 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/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 fcc471e..b1f1245 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 @@ -30,8 +30,8 @@ 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.io.sax.ext.PropertyConfig; import org.x4o.xml.lang.task.X4OLanguageTask; +import org.x4o.xml.o2o.PropertyConfig; import org.x4o.xml.test.TestDriver; /** diff --git a/nx01-x4o-html/src/main/java/org/x4o/html/ContentWriterHtml.java b/nx01-x4o-html/src/main/java/org/x4o/html/ContentWriterHtml.java index 79ad146..a640985 100644 --- a/nx01-x4o-html/src/main/java/org/x4o/html/ContentWriterHtml.java +++ b/nx01-x4o-html/src/main/java/org/x4o/html/ContentWriterHtml.java @@ -25,10 +25,10 @@ package org.x4o.html; import java.io.Writer; import java.util.Calendar; -import org.x4o.xml.io.XMLConstants; -import org.x4o.xml.io.sax.ext.ContentWriterTagWrapper; -import org.x4o.xml.io.sax.ext.ContentWriterXml; -import org.x4o.xml.io.sax.ext.PropertyConfig; +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.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/PropertyConfig.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/PropertyConfig.java similarity index 99% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/PropertyConfig.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/PropertyConfig.java index e7e9fc5..ce0e852 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/PropertyConfig.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.ext; +package org.x4o.xml.o2o; import java.io.File; import java.util.ArrayList; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterXsd.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterXsd.java similarity index 93% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterXsd.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterXsd.java index 66c3512..99468d9 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterXsd.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterXsd.java @@ -20,11 +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.io.sax.ext; +package org.x4o.xml.o2o.io; import java.io.Writer; -import org.x4o.xml.io.XMLConstants; +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.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/xml/o2o/io/package-info.java index ffd33c4..7a07686 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/xml/o2o/io/package-info.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. */ + /** - * October bits input and output interfaces. + * Object two object input output structure support. * * * @since 1.0 */ - package org.x4o.xml.o2o.io; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriter.java similarity index 92% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriter.java index a5c78f6..b262171 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.ext; +package org.x4o.xml.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.io.sax.ext.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) + * @see org.x4o.xml.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-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriterHandler.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterHandler.java similarity index 97% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriterHandler.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterHandler.java index 53e9576..f7359f2 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriterHandler.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.ext; +package org.x4o.xml.o2o.io.sax3; import java.io.BufferedReader; import java.io.File; @@ -39,9 +39,8 @@ import java.util.PrimitiveIterator; import java.util.Set; import java.util.Stack; -import org.x4o.xml.io.XMLConstants; -import org.x4o.xml.io.sax.ext.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.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; @@ -158,7 +157,11 @@ public class AbstractContentWriterHandler implements ContentHandler { String licenceEncoding = propertyConfig.getPropertyString(PROLOG_LICENCE_ENCODING); String licenceResource = propertyConfig.getPropertyString(PROLOG_LICENCE_RESOURCE); if (licenceResource!=null) { - licenceInput = X4OLanguageClassLoader.getResourceAsStream(licenceResource); + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + if (cl == null) { + cl = this.getClass().getClassLoader(); + } + licenceInput = cl.getResourceAsStream(licenceResource); if (licenceInput==null) { throw new NullPointerException("Could not load licence resource from: "+licenceResource); } @@ -513,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.io.sax.ext.ContentWriter#characters(java.lang.String) + * @see org.x4o.xml.o2o.io.sax3.ContentWriter#characters(java.lang.String) */ public void characters(String text) throws SAXException { if (text==null) { @@ -554,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.io.sax.ext.ContentWriter#ignorableWhitespace(java.lang.String) + * @see org.x4o.xml.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String) */ public void ignorableWhitespace(String text) throws SAXException { if (text==null) { @@ -641,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.io.sax.ext.ContentWriter#comment(java.lang.String) + * @see org.x4o.xml.o2o.io.sax3.ContentWriter#comment(java.lang.String) */ public void comment(String text) throws SAXException { if (text==null) { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriterLexical.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterLexical.java similarity index 93% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriterLexical.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterLexical.java index 0d7d446..8512cc3 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriterLexical.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterLexical.java @@ -20,11 +20,10 @@ * 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.io.sax.ext; +package org.x4o.xml.o2o.io.sax3; import java.io.Writer; -import org.x4o.xml.io.XMLConstants; import org.xml.sax.SAXException; import org.xml.sax.ext.LexicalHandler; @@ -102,7 +101,7 @@ public abstract class AbstractContentWriterLexical extends AbstractContentWriter } /** - * @see org.x4o.xml.io.sax.ext.AbstractContentWriterHandler#characters(char[], int, int) + * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(char[], int, int) */ @Override public void characters(char[] ch, int start, int length) throws SAXException { @@ -110,7 +109,7 @@ public abstract class AbstractContentWriterLexical extends AbstractContentWriter } /** - * @see org.x4o.xml.io.sax.ext.AbstractContentWriterHandler#characters(java.lang.String) + * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String) */ @Override public void characters(String text) throws SAXException { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AttributeMap.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AttributeMap.java similarity index 99% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AttributeMap.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AttributeMap.java index 04c28b1..36e383a 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AttributeMap.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.ext; +package org.x4o.xml.o2o.io.sax3; import org.xml.sax.Attributes; import java.util.ArrayList; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriter.java similarity index 98% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriter.java index 15673a3..683a024 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.ext; +package org.x4o.xml.o2o.io.sax3; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterTag.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTag.java similarity index 98% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterTag.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTag.java index ba30275..4861fef 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterTag.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.ext; +package org.x4o.xml.o2o.io.sax3; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterTagWrapper.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTagWrapper.java similarity index 99% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterTagWrapper.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTagWrapper.java index 2dc8cfc..b8b3051 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterTagWrapper.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.ext; +package org.x4o.xml.o2o.io.sax3; import org.xml.sax.Attributes; import org.xml.sax.SAXException; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterXml.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterXml.java similarity index 97% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterXml.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterXml.java index 4f2d9f5..4ebe704 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterXml.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterXml.java @@ -20,15 +20,13 @@ * 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.io.sax.ext; +package org.x4o.xml.o2o.io.sax3; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; import java.io.Writer; -import org.x4o.xml.io.XMLConstants; - /** * ContentWriterXml writes SAX content handler events to XML. * diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/XMLConstants.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/XMLConstants.java similarity index 99% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/XMLConstants.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/XMLConstants.java index 2f655d0..2f3c648 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/XMLConstants.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io; +package org.x4o.xml.o2o.io.sax3; import java.util.PrimitiveIterator; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/package-info.java similarity index 97% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/package-info.java index 7572c56..9196824 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/package-info.java @@ -26,4 +26,4 @@ * @since 1.0 */ -package org.x4o.xml.io.sax.ext; +package org.x4o.xml.o2o.io.sax3; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriter.java similarity index 90% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriter.java index 93e41d4..400dbc9 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.xdbx; +package org.x4o.xml.o2o.io.sax3.xdbx; import java.io.OutputStream; -import org.x4o.xml.io.sax.ext.ContentWriter; +import org.x4o.xml.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.io.sax.ext.ContentWriter#startElementEnd(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes) + * @see org.x4o.xml.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-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriterHandler.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java similarity index 97% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriterHandler.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java index adff586..716919e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriterHandler.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.xdbx; +package org.x4o.xml.o2o.io.sax3.xdbx; import java.io.BufferedReader; import java.io.File; @@ -40,10 +40,9 @@ import java.util.PrimitiveIterator; import java.util.Set; import java.util.Stack; -import org.x4o.xml.io.XMLConstants; -import org.x4o.xml.io.sax.ext.PropertyConfig; -import org.x4o.xml.io.sax.ext.PropertyConfig.PropertyConfigItem; -import org.x4o.xml.lang.X4OLanguageClassLoader; +import org.x4o.xml.o2o.PropertyConfig; +import org.x4o.xml.o2o.PropertyConfig.PropertyConfigItem; +import org.x4o.xml.o2o.io.sax3.XMLConstants; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.Locator; @@ -175,7 +174,11 @@ public class AbstractXDBXWriterHandler implements ContentHandler { String licenceEncoding = propertyConfig.getPropertyString(PROLOG_LICENCE_ENCODING); String licenceResource = propertyConfig.getPropertyString(PROLOG_LICENCE_RESOURCE); if (licenceResource!=null) { - licenceInput = X4OLanguageClassLoader.getResourceAsStream(licenceResource); + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + if (cl == null) { + cl = this.getClass().getClassLoader(); + } + licenceInput = cl.getResourceAsStream(licenceResource); if (licenceInput==null) { throw new NullPointerException("Could not load licence resource from: "+licenceResource); } @@ -491,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.io.sax.ext.ContentWriter#characters(java.lang.String) + * @see org.x4o.xml.o2o.io.sax3.ContentWriter#characters(java.lang.String) */ public void characters(String text) throws SAXException { if (text==null) { @@ -530,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.io.sax.ext.ContentWriter#ignorableWhitespace(java.lang.String) + * @see org.x4o.xml.o2o.io.sax3.ContentWriter#ignorableWhitespace(java.lang.String) */ public void ignorableWhitespace(String text) throws SAXException { if (text==null) { @@ -618,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.io.sax.ext.ContentWriter#comment(java.lang.String) + * @see org.x4o.xml.o2o.io.sax3.ContentWriter#comment(java.lang.String) */ public void comment(String text) throws SAXException { if (text==null) { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriterLexical.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java similarity index 92% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriterLexical.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java index 726c3d1..611d46e 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriterLexical.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.xdbx; +package org.x4o.xml.o2o.io.sax3.xdbx; import java.io.OutputStream; -import org.x4o.xml.io.XMLConstants; +import org.x4o.xml.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.io.sax.ext.AbstractContentWriterHandler#characters(char[], int, int) + * @see org.x4o.xml.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.io.sax.ext.AbstractContentWriterHandler#characters(java.lang.String) + * @see org.x4o.xml.o2o.io.sax3.AbstractContentWriterHandler#characters(java.lang.String) */ @Override public void characters(String text) throws SAXException { diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXConstants.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXConstants.java similarity index 98% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXConstants.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXConstants.java index b183677..6cfd430 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXConstants.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.xdbx; +package org.x4o.xml.o2o.io.sax3.xdbx; /** * XDBXConstants for writing binary XML. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXContentTag.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXContentTag.java similarity index 98% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXContentTag.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXContentTag.java index 9064680..b248979 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXContentTag.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.xdbx; +package org.x4o.xml.o2o.io.sax3.xdbx; /** * XDBXContentTag indicate the binary tag of the XDBX stream. diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXReaderXml.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXml.java similarity index 99% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXReaderXml.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXml.java index 60b9c7c..c4a089f 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXReaderXml.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.xdbx; +package org.x4o.xml.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.io.sax.ext.ContentWriter; +import org.x4o.xml.o2o.io.sax3.ContentWriter; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXWriterXml.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXml.java similarity index 97% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXWriterXml.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXml.java index 9811f24..de03bea 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXWriterXml.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/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.io.sax.xdbx; +package org.x4o.xml.o2o.io.sax3.xdbx; import java.io.OutputStream; diff --git a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/package-info.java similarity index 97% rename from nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/package-info.java index c6248e8..04a6745 100644 --- a/nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/package-info.java @@ -26,4 +26,4 @@ * @since 1.0 */ -package org.x4o.xml.io.sax.xdbx; +package org.x4o.xml.o2o.io.sax3.xdbx; 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/xml/o2o/io/tlv/package-info.java index c74aad2..d11e1d7 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/xml/o2o/io/tlv/package-info.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. */ + /** * October bits TLV chain. * * * @since 1.0 */ - package org.x4o.xml.o2o.io.tlv; 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/xml/o2o/package-info.java index c5d8579..e0cac33 100644 --- a/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/package-info.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. */ + /** - * The octa four octal binary support for X4O. + * Object two object SAX and binary and octal support classes. * * * @since 1.0 */ - package org.x4o.xml.o2o; diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlAttributeTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlAttributeTest.java similarity index 99% rename from nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlAttributeTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlAttributeTest.java index 3b04290..bbf8ca3 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlAttributeTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/xml/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.io.sax; +package org.x4o.xml.o2o.io.sax3; import java.io.ByteArrayInputStream; import java.io.StringWriter; @@ -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.io.sax.ext.ContentWriterXml; +import org.x4o.xml.o2o.io.sax3.ContentWriterXml; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlCDataTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlCDataTest.java similarity index 98% rename from nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlCDataTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlCDataTest.java index 08297c8..23a4e15 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlCDataTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlCDataTest.java @@ -20,13 +20,13 @@ * 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.io.sax; +package org.x4o.xml.o2o.io.sax3; import java.io.StringWriter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.io.sax.ext.ContentWriterXml; +import org.x4o.xml.o2o.io.sax3.ContentWriterXml; /** * ContentWriterXmlCDataTest tests cdata xml escaping. diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlTest.java similarity index 99% rename from nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlTest.java index 94a7b76..0470257 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlTest.java @@ -20,13 +20,13 @@ * 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.io.sax; +package org.x4o.xml.o2o.io.sax3; import java.io.StringWriter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.io.sax.ext.ContentWriterXml; +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/test/java/org/x4o/xml/io/sax/xdbx/XDBXReaderXmlTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java similarity index 95% rename from nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/xdbx/XDBXReaderXmlTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java index 75ed844..784ada8 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/xdbx/XDBXReaderXmlTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/xml/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.io.sax.xdbx; +package org.x4o.xml.o2o.io.sax3.xdbx; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -33,7 +33,9 @@ import javax.xml.parsers.SAXParserFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.io.sax.ext.ContentWriterXml; +import org.x4o.xml.o2o.io.sax3.ContentWriterXml; +import org.x4o.xml.o2o.io.sax3.xdbx.XDBXReaderXml; +import org.x4o.xml.o2o.io.sax3.xdbx.XDBXWriterXml; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; import org.xml.sax.helpers.AttributesImpl; diff --git a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/xdbx/XDBXWriterXmlTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java similarity index 98% rename from nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/xdbx/XDBXWriterXmlTest.java rename to nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java index 7b084dd..121c7d3 100644 --- a/nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/xdbx/XDBXWriterXmlTest.java +++ b/nx01-x4o-o2o/src/test/java/org/x4o/xml/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.io.sax.xdbx; +package org.x4o.xml.o2o.io.sax3.xdbx; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,7 +28,9 @@ import java.io.StringWriter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.x4o.xml.io.sax.ext.ContentWriterXml; +import org.x4o.xml.o2o.io.sax3.ContentWriterXml; +import org.x4o.xml.o2o.io.sax3.xdbx.XDBXReaderXml; +import org.x4o.xml.o2o.io.sax3.xdbx.XDBXWriterXml; import org.xml.sax.helpers.AttributesImpl; /** 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 08c6a17..63c87c1 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.io.XMLConstants; -import org.x4o.xml.io.sax.ext.ContentWriter; -import org.x4o.xml.io.sax.ext.ContentWriterTagWrapper; -import org.x4o.xml.io.sax.ext.ContentWriterXml; -import org.x4o.xml.io.sax.xdbx.XDBXWriterXml; +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.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl;