arch-jedi/nx01
1
0
Fork 0
Code Issues Pull requests Actions Packages Releases Activity

Moved SAX and XDBX out of X4O driver

Browse source
This commit is contained in:
Willem Cazander 2024-12-22 00:00:33 +01:00
parent 831eccea01
commit 002a556a79
66 changed files with 151 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/ioini/ScopicIniContentReader.java
View file

@ -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;

2
nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestConstants.java
View file

@ -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.

2
nx01-warp-manifestor/src/main/java/love/distributedrebirth/nx01/warp/manifestor/scopic/iomf/ScopicManifestContentReader.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdLanguageTask.java
View file

@ -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;
/**

8
nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriter.java
View file

@ -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;

10
nx01-x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdWriterElement.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnection.java
View file

@ -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.

5
nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OConnectionDebug.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/AbstractX4OWriterSession.java
View file

@ -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;
/**

8
nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java
View file

@ -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;

11
nx01-x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java
View file

@ -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;

7
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OContentHandler.java → nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentHandler.java
View file

@ -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;

5
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OContentParser.java → nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OContentParser.java
View file

@ -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;

9
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4ODebugWriter.java → nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4ODebugWriter.java
View file

@ -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;

5
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OEntityResolver.java → nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OEntityResolver.java
View file

@ -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;

5
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/X4OErrorHandler.java → nx01-x4o-driver/src/main/java/org/x4o/xml/io/X4OErrorHandler.java
View file

@ -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;

29
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/package-info.java
View file

@ -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;

4
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java
View file

@ -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;
/**

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java
View file

@ -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;
/**

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java
View file

@ -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;

4
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java
View file

@ -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));

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTask.java
View file

@ -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.

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTaskException.java
View file

@ -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.

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java
View file

@ -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;
/**

4
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java
View file

@ -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;
/**

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskCommandLine.java
View file

@ -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.

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java
View file

@ -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.

4
nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java
View file

@ -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;

4
nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java
View file

@ -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;
/**

2
nx01-x4o-driver/src/test/java/org/x4o/xml/test/element/InlinePropertiesElement.java
View file

@ -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

2
nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java
View file

@ -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.

6
nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java
View file

@ -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;
/**

4
nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java
View file

@ -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;

6
nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocWriter.java
View file

@ -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;
/**

2
nx01-x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java
View file

@ -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;
/**

8
nx01-x4o-html/src/main/java/org/x4o/html/ContentWriterHtml.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/PropertyConfig.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/PropertyConfig.java
View file

@ -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;

7
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterXsd.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/ContentWriterXsd.java
View file

@ -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;

4
nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/package-info.java
View file

@ -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;

4
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriter.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriter.java
View file

@ -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);

19
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriterHandler.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterHandler.java
View file

@ -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) {

7
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AbstractContentWriterLexical.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AbstractContentWriterLexical.java
View file

@ -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 {

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/AttributeMap.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/AttributeMap.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriter.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriter.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterTag.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTag.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterTagWrapper.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterTagWrapper.java
View file

@ -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;

4
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/ContentWriterXml.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/ContentWriterXml.java
View file

@ -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.
*

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/XMLConstants.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/XMLConstants.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/ext/package-info.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/package-info.java
View file

@ -26,4 +26,4 @@
* @since 1.0
*/
package org.x4o.xml.io.sax.ext;
package org.x4o.xml.o2o.io.sax3;

6
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriter.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriter.java
View file

@ -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);

21
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriterHandler.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterHandler.java
View file

@ -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) {

8
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/AbstractXDBXWriterLexical.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/AbstractXDBXWriterLexical.java
View file

@ -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 {

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXConstants.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXConstants.java
View file

@ -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.

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXContentTag.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXContentTag.java
View file

@ -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.

4
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXReaderXml.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXml.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/XDBXWriterXml.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXml.java
View file

@ -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;

2
nx01-x4o-driver/src/main/java/org/x4o/xml/io/sax/xdbx/package-info.java → nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/sax3/xdbx/package-info.java
View file

@ -26,4 +26,4 @@
* @since 1.0
*/
package org.x4o.xml.io.sax.xdbx;
package org.x4o.xml.o2o.io.sax3.xdbx;

2
nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/io/tlv/package-info.java
View file

@ -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;

4
nx01-x4o-o2o/src/main/java/org/x4o/xml/o2o/package-info.java
View file

@ -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;

4
nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlAttributeTest.java → nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlAttributeTest.java
View file

@ -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;

4
nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlCDataTest.java → nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlCDataTest.java
View file

@ -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.

4
nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/ContentWriterXmlTest.java → nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/ContentWriterXmlTest.java
View file

@ -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;

6
nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/xdbx/XDBXReaderXmlTest.java → nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXReaderXmlTest.java
View file

@ -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;

6
nx01-x4o-driver/src/test/java/org/x4o/xml/io/sax/xdbx/XDBXWriterXmlTest.java → nx01-x4o-o2o/src/test/java/org/x4o/xml/o2o/io/sax3/xdbx/XDBXWriterXmlTest.java
View file

@ -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;
/**

10
nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/web/WarpCorePlasmaInspectorServlet.java
View file

@ -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;