From eb8c650528510843e368db121a32bfb992515ebb Mon Sep 17 00:00:00 2001 From: Willem Date: Wed, 15 Jan 2025 14:23:45 +0100 Subject: [PATCH] Goodbye org.x4o.xml.eld.doc.api.dom --- .../king/java3doc/Java3Documentation.java | 2 +- .../metamodel/doc/DocModelWriter.java | 14 +++--- .../metamodel/doc/DocModelWriterSchema.java | 12 ++--- .../metamodel/doc/DocModelWriterTable.java | 14 +++--- .../nx01/popcorn/PopCornDriver.java | 2 +- .../org/x4o/xml/eld/doc/EldDocWriter.java | 16 +++---- .../xml/eld/doc/EldDocWriterElementClass.java | 18 +++---- .../eld/doc/EldDocWriterElementInterface.java | 16 +++---- .../eld/doc/EldDocWriterElementNamespace.java | 16 +++---- .../x4o/xml/eld/doc/EldDocWriterLanguage.java | 14 +++--- .../eld/doc/EldDocWriterLanguageModule.java | 16 +++---- .../xml/eld/doc/EldDocXTreePageWriter.java | 18 +++---- .../org/x4o/o2o/tdoc}/ApiDocContentCss.java | 2 +- .../x4o/o2o/tdoc}/ApiDocContentPrinter.java | 12 ++--- .../x4o/o2o/tdoc}/ApiDocContentWriter.java | 2 +- .../org/x4o/o2o/tdoc}/ApiDocGenerator.java | 37 +++++++++------ .../tdoc}/ApiDocNodeDataConfiguratorBean.java | 10 ++-- .../ApiDocNodeDataConfiguratorMethod.java | 2 +- .../x4o/o2o/tdoc}/ApiDocNodeWriterBean.java | 12 ++--- .../x4o/o2o/tdoc}/ApiDocNodeWriterMethod.java | 4 +- .../java/org/x4o/o2o/tdoc}/ApiDocProject.java | 2 +- .../o2o/tdoc}/ApiDocProjectPerspective.java | 2 +- .../tdoc}/ApiDocProjectPerspectiveWasp.java | 6 +-- .../java/org/x4o/o2o/tdoc}/ApiDocWriter.java | 47 +++++-------------- .../x4o/o2o/tdoc}/DefaultPageWriterHelp.java | 12 ++--- .../o2o/tdoc}/DefaultPageWriterIndexAll.java | 8 ++-- .../x4o/o2o/tdoc}/DefaultPageWriterTree.java | 12 ++--- .../java/org/x4o/o2o/tdoc}/dom/ApiDoc.java | 6 +-- .../org/x4o/o2o/tdoc}/dom/ApiDocConcept.java | 2 +- .../x4o/o2o/tdoc}/dom/ApiDocIndexItem.java | 2 +- .../org/x4o/o2o/tdoc}/dom/ApiDocNavLink.java | 2 +- .../org/x4o/o2o/tdoc}/dom/ApiDocNode.java | 2 +- .../org/x4o/o2o/tdoc}/dom/ApiDocNodeBody.java | 2 +- .../org/x4o/o2o/tdoc}/dom/ApiDocNodeData.java | 2 +- .../tdoc}/dom/ApiDocNodeDataConfigurator.java | 2 +- .../x4o/o2o/tdoc}/dom/ApiDocNodeWriter.java | 2 +- .../org/x4o/o2o/tdoc}/dom/ApiDocPage.java | 2 +- .../x4o/o2o/tdoc}/dom/ApiDocPageWriter.java | 2 +- .../x4o/o2o/tdoc}/dom/ApiDocRemoteClass.java | 2 +- .../x4o/o2o/tdoc}/dom/ApiDocWriteEvent.java | 4 +- .../org/x4o/o2o/tdoc}/dom/package-info.java | 2 +- .../java/org/x4o/o2o/tdoc}/package-info.java | 2 +- 42 files changed, 175 insertions(+), 189 deletions(-) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocContentCss.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocContentPrinter.java (96%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocContentWriter.java (99%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocGenerator.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocNodeDataConfiguratorBean.java (94%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocNodeDataConfiguratorMethod.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocNodeWriterBean.java (95%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocNodeWriterMethod.java (95%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocProject.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocProjectPerspective.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocProjectPerspectiveWasp.java (94%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/ApiDocWriter.java (89%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/DefaultPageWriterHelp.java (91%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/DefaultPageWriterIndexAll.java (92%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/DefaultPageWriterTree.java (92%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDoc.java (99%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocConcept.java (99%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocIndexItem.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocNavLink.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocNode.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocNodeBody.java (97%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocNodeData.java (99%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocNodeDataConfigurator.java (97%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocNodeWriter.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocPage.java (98%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocPageWriter.java (97%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocRemoteClass.java (99%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/ApiDocWriteEvent.java (96%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/dom/package-info.java (97%) rename {nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api => nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc}/package-info.java (97%) diff --git a/nx01-king-java3doc/src/main/java/love/distributedrebirth/nx01/king/java3doc/Java3Documentation.java b/nx01-king-java3doc/src/main/java/love/distributedrebirth/nx01/king/java3doc/Java3Documentation.java index 8f200db..6cad96c 100644 --- a/nx01-king-java3doc/src/main/java/love/distributedrebirth/nx01/king/java3doc/Java3Documentation.java +++ b/nx01-king-java3doc/src/main/java/love/distributedrebirth/nx01/king/java3doc/Java3Documentation.java @@ -33,7 +33,7 @@ import java.io.PrintStream; import java.util.Arrays; import java.util.List; -import org.x4o.xml.eld.doc.api.ApiDocProject; +import org.x4o.o2o.tdoc.ApiDocProject; import org.x4o.xml.io.X4OConnectionException; import org.xml.sax.SAXException; diff --git a/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriter.java b/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriter.java index ae78c80..179efe1 100644 --- a/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriter.java +++ b/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriter.java @@ -38,13 +38,13 @@ import org.apache.metamodel.schema.Column; import org.apache.metamodel.schema.Relationship; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; -import org.x4o.xml.eld.doc.api.ApiDocGenerator; -import org.x4o.xml.eld.doc.api.DefaultPageWriterHelp; -import org.x4o.xml.eld.doc.api.DefaultPageWriterIndexAll; -import org.x4o.xml.eld.doc.api.DefaultPageWriterTree; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocConcept; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; +import org.x4o.o2o.tdoc.ApiDocGenerator; +import org.x4o.o2o.tdoc.DefaultPageWriterHelp; +import org.x4o.o2o.tdoc.DefaultPageWriterIndexAll; +import org.x4o.o2o.tdoc.DefaultPageWriterTree; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocConcept; +import org.x4o.o2o.tdoc.dom.ApiDocNode; import org.xml.sax.SAXException; public class DocModelWriter { diff --git a/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterSchema.java b/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterSchema.java index 98183de..43aaeee 100644 --- a/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterSchema.java +++ b/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterSchema.java @@ -36,12 +36,12 @@ import org.apache.metamodel.query.FunctionType; import org.apache.metamodel.schema.Schema; import org.apache.metamodel.schema.Table; import org.apache.metamodel.schema.TableType; -import org.x4o.xml.eld.doc.api.ApiDocContentCss; -import org.x4o.xml.eld.doc.api.ApiDocContentWriter; -import org.x4o.xml.eld.doc.api.ApiDocNodeWriterMethod; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.ApiDocContentCss; +import org.x4o.o2o.tdoc.ApiDocContentWriter; +import org.x4o.o2o.tdoc.ApiDocNodeWriterMethod; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.xml.sax.SAXException; public class DocModelWriterSchema { diff --git a/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterTable.java b/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterTable.java index 6e304d1..90849ea 100644 --- a/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterTable.java +++ b/nx01-popcorn-mm-jdbc/src/main/java/org/eobjects/metamodel/doc/DocModelWriterTable.java @@ -44,13 +44,13 @@ import org.apache.metamodel.schema.Relationship; import org.apache.metamodel.schema.Table; import org.apache.metamodel.schema.TableType; import org.x4o.o2o.io.ContentWriterHtml.Tag; -import org.x4o.xml.eld.doc.api.ApiDocContentCss; -import org.x4o.xml.eld.doc.api.ApiDocContentWriter; -import org.x4o.xml.eld.doc.api.ApiDocNodeWriterMethod; -import org.x4o.xml.eld.doc.api.dom.ApiDocIndexItem; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.ApiDocContentCss; +import org.x4o.o2o.tdoc.ApiDocContentWriter; +import org.x4o.o2o.tdoc.ApiDocNodeWriterMethod; +import org.x4o.o2o.tdoc.dom.ApiDocIndexItem; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.xml.sax.SAXException; public class DocModelWriterTable { diff --git a/nx01-popcorn/src/main/java/love/distributedrebirth/nx01/popcorn/PopCornDriver.java b/nx01-popcorn/src/main/java/love/distributedrebirth/nx01/popcorn/PopCornDriver.java index ebb398d..5c1ef3b 100644 --- a/nx01-popcorn/src/main/java/love/distributedrebirth/nx01/popcorn/PopCornDriver.java +++ b/nx01-popcorn/src/main/java/love/distributedrebirth/nx01/popcorn/PopCornDriver.java @@ -27,9 +27,9 @@ package love.distributedrebirth.nx01.popcorn; +import org.x4o.o2o.tdoc.ApiDocProject; import org.x4o.xml.X4ODriver; import org.x4o.xml.X4ODriverManager; -import org.x4o.xml.eld.doc.api.ApiDocProject; /// @author للَّٰهِilLצسُو /// @version ©Δ∞ 仙上主天 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 cf94ad0..5ea4a15 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 @@ -32,14 +32,14 @@ import java.util.Map; import org.x4o.o2o.PropertyConfig; import org.x4o.o2o.PropertyConfig.PropertyConfigItem; import org.x4o.o2o.io.sax3.ContentWriterXml; -import org.x4o.xml.eld.doc.api.ApiDocGenerator; -import org.x4o.xml.eld.doc.api.DefaultPageWriterHelp; -import org.x4o.xml.eld.doc.api.DefaultPageWriterIndexAll; -import org.x4o.xml.eld.doc.api.DefaultPageWriterTree; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocConcept; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocRemoteClass; +import org.x4o.o2o.tdoc.ApiDocGenerator; +import org.x4o.o2o.tdoc.DefaultPageWriterHelp; +import org.x4o.o2o.tdoc.DefaultPageWriterIndexAll; +import org.x4o.o2o.tdoc.DefaultPageWriterTree; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocConcept; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocRemoteClass; import org.x4o.xml.element.ElementNamespaceAttribute; import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementClass; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java index 63a6c9b..7006b63 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java @@ -25,16 +25,16 @@ package org.x4o.xml.eld.doc; import java.util.List; import org.x4o.o2o.io.ContentWriterHtml.Tag; +import org.x4o.o2o.tdoc.ApiDocContentPrinter; +import org.x4o.o2o.tdoc.ApiDocContentWriter; +import org.x4o.o2o.tdoc.ApiDocNodeDataConfiguratorMethod; +import org.x4o.o2o.tdoc.ApiDocNodeWriterMethod; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocNodeData; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.x4o.xml.eld.doc.EldDocXTreePageWriter.TreeNode; -import org.x4o.xml.eld.doc.api.ApiDocContentPrinter; -import org.x4o.xml.eld.doc.api.ApiDocContentWriter; -import org.x4o.xml.eld.doc.api.ApiDocNodeDataConfiguratorMethod; -import org.x4o.xml.eld.doc.api.ApiDocNodeWriterMethod; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeData; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementClassAttribute; import org.x4o.xml.element.ElementConfigurator; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementInterface.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementInterface.java index 4e1ceeb..f5efc83 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementInterface.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementInterface.java @@ -22,14 +22,14 @@ */ package org.x4o.xml.eld.doc; -import org.x4o.xml.eld.doc.api.ApiDocContentPrinter; -import org.x4o.xml.eld.doc.api.ApiDocNodeDataConfiguratorMethod; -import org.x4o.xml.eld.doc.api.ApiDocNodeWriterMethod; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeData; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.ApiDocContentPrinter; +import org.x4o.o2o.tdoc.ApiDocNodeDataConfiguratorMethod; +import org.x4o.o2o.tdoc.ApiDocNodeWriterMethod; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocNodeData; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementClassAttribute; import org.x4o.xml.element.ElementConfigurator; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java index 844d87d..2d68d0d 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java @@ -22,14 +22,14 @@ */ package org.x4o.xml.eld.doc; -import org.x4o.xml.eld.doc.api.ApiDocContentPrinter; -import org.x4o.xml.eld.doc.api.ApiDocNodeDataConfiguratorMethod; -import org.x4o.xml.eld.doc.api.ApiDocNodeWriterMethod; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeData; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.ApiDocContentPrinter; +import org.x4o.o2o.tdoc.ApiDocNodeDataConfiguratorMethod; +import org.x4o.o2o.tdoc.ApiDocNodeWriterMethod; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocNodeData; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementNamespace; import org.xml.sax.SAXException; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java index ace4b90..c6e8519 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java @@ -22,13 +22,13 @@ */ package org.x4o.xml.eld.doc; -import org.x4o.xml.eld.doc.api.ApiDocContentPrinter; -import org.x4o.xml.eld.doc.api.ApiDocContentCss; -import org.x4o.xml.eld.doc.api.ApiDocContentWriter; -import org.x4o.xml.eld.doc.api.ApiDocNodeWriterMethod; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.ApiDocContentCss; +import org.x4o.o2o.tdoc.ApiDocContentPrinter; +import org.x4o.o2o.tdoc.ApiDocContentWriter; +import org.x4o.o2o.tdoc.ApiDocNodeWriterMethod; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementClassAttribute; import org.x4o.xml.element.ElementConfigurator; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java index 177b0e6..b597cad 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java @@ -22,15 +22,15 @@ */ package org.x4o.xml.eld.doc; -import org.x4o.xml.eld.doc.api.ApiDocContentPrinter; -import org.x4o.xml.eld.doc.api.ApiDocNodeDataConfiguratorMethod; -import org.x4o.xml.eld.doc.api.ApiDocNodeWriterMethod; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeData; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; import org.x4o.xml.element.ElementNamespaceAttribute; +import org.x4o.o2o.tdoc.ApiDocContentPrinter; +import org.x4o.o2o.tdoc.ApiDocNodeDataConfiguratorMethod; +import org.x4o.o2o.tdoc.ApiDocNodeWriterMethod; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocNodeData; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementConfigurator; import org.x4o.xml.element.ElementInterface; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java index 3c077d1..0a748db 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java +++ b/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java @@ -28,13 +28,13 @@ import java.util.Comparator; import java.util.List; import org.x4o.o2o.io.ContentWriterHtml.Tag; -import org.x4o.xml.eld.doc.api.ApiDocContentWriter; -import org.x4o.xml.eld.doc.api.DefaultPageWriterTree; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocPage; -import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.ApiDocContentWriter; +import org.x4o.o2o.tdoc.DefaultPageWriterTree; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocPage; +import org.x4o.o2o.tdoc.dom.ApiDocPageWriter; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementInterface; @@ -75,7 +75,7 @@ public class EldDocXTreePageWriter extends DefaultPageWriterTree implements ApiD /** * TODO: remove this - * @see org.x4o.xml.eld.doc.api.DefaultPageWriterTree#writePageContent(org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent) + * @see org.x4o.o2o.tdoc.DefaultPageWriterTree#writePageContent(org.x4o.o2o.tdoc.dom.ApiDocWriteEvent) */ @Override public void writePageContent(ApiDocWriteEvent e) throws SAXException { @@ -124,7 +124,7 @@ public class EldDocXTreePageWriter extends DefaultPageWriterTree implements ApiD /** * Overrided to select the dom view of the tree. - * @see org.x4o.xml.eld.doc.api.DefaultPageWriterTree#selectRootNode(org.x4o.xml.eld.doc.api.dom.ApiDoc) + * @see org.x4o.o2o.tdoc.DefaultPageWriterTree#selectRootNode(org.x4o.o2o.tdoc.dom.ApiDoc) */ @Override protected ApiDocNode selectRootNode(ApiDoc doc) { diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentCss.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocContentCss.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentCss.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocContentCss.java index 31b9b8b..524d9a6 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentCss.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocContentCss.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.eld.doc.api; +package org.x4o.o2o.tdoc; /** * ApiDocContentCss defines the css style names used in api docs. diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentPrinter.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocContentPrinter.java similarity index 96% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentPrinter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocContentPrinter.java index 9f9dd63..7508202 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentPrinter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocContentPrinter.java @@ -20,18 +20,18 @@ * 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.eld.doc.api; +package org.x4o.o2o.tdoc; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNavLink; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocRemoteClass; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNavLink; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocRemoteClass; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocContentWriter.java similarity index 99% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocContentWriter.java index 3dbec1d..999fb5b 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocContentWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocContentWriter.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.eld.doc.api; +package org.x4o.o2o.tdoc; import java.io.Writer; import java.util.Date; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocGenerator.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocGenerator.java index 8bb96a6..82eda25 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocGenerator.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocGenerator.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.eld.doc.api; +package org.x4o.o2o.tdoc; import java.io.BufferedReader; import java.io.File; @@ -44,18 +44,17 @@ import org.x4o.o2o.io.ContentWriterHtml.DocType; import org.x4o.o2o.io.ContentWriterHtml.Tag; import org.x4o.o2o.io.sax3.ContentWriterXml; import org.x4o.o2o.io.sax3.XMLConstants; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocConcept; -import org.x4o.xml.eld.doc.api.dom.ApiDocNavLink; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeData; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeDataConfigurator; -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.lang.X4OLanguageClassLoader; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocConcept; +import org.x4o.o2o.tdoc.dom.ApiDocNavLink; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocNodeData; +import org.x4o.o2o.tdoc.dom.ApiDocNodeDataConfigurator; +import org.x4o.o2o.tdoc.dom.ApiDocNodeWriter; +import org.x4o.o2o.tdoc.dom.ApiDocPage; +import org.x4o.o2o.tdoc.dom.ApiDocPageWriter; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; @@ -894,7 +893,7 @@ public class ApiDocGenerator implements ApiDocContentPrinter { } private void appendResourceToBuffer(StringBuilder buffer,String resource) throws IOException { - ClassLoader cl = X4OLanguageClassLoader.getClassLoader(); + ClassLoader cl = findClassLoader(); BufferedReader reader = null; try { InputStream inputStream = cl.getResourceAsStream(resource); @@ -925,11 +924,19 @@ public class ApiDocGenerator implements ApiDocContentPrinter { } private void copyResourceToFile(String resource,File basePath,String...argu) throws SecurityException, IOException, InterruptedException { - ClassLoader cl = X4OLanguageClassLoader.getClassLoader(); + ClassLoader cl = findClassLoader(); InputStream inputStream = cl.getResourceAsStream(resource); copyStreamToFile(inputStream,basePath,argu); } + public static ClassLoader findClassLoader() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + if (cl == null) { + cl = ApiDocGenerator.class.getClassLoader(); + } + return cl; + } + private void copyStreamToFile(InputStream inputStream,File basePath,String...argu) throws SecurityException, IOException, InterruptedException { OutputStream outputStream = new FileOutputStream(createOutputPathFile(basePath,argu)); diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeDataConfiguratorBean.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeDataConfiguratorBean.java similarity index 94% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeDataConfiguratorBean.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeDataConfiguratorBean.java index e5e5700..80c04ba 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeDataConfiguratorBean.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeDataConfiguratorBean.java @@ -20,16 +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.eld.doc.api; +package org.x4o.o2o.tdoc; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeData; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeDataConfigurator; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeData; +import org.x4o.o2o.tdoc.dom.ApiDocNodeDataConfigurator; /** * ApiDocNodeDataConfiguratorBean wraps the ApiDocNodeDataConfigurator to a single method of a bean. diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeDataConfiguratorMethod.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeDataConfiguratorMethod.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeDataConfiguratorMethod.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeDataConfiguratorMethod.java index f44fcce..8f9d0b0 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeDataConfiguratorMethod.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeDataConfiguratorMethod.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.eld.doc.api; +package org.x4o.o2o.tdoc; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeWriterBean.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeWriterBean.java similarity index 95% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeWriterBean.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeWriterBean.java index 8d02014..1d4427f 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeWriterBean.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeWriterBean.java @@ -20,17 +20,17 @@ * 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.eld.doc.api; +package org.x4o.o2o.tdoc; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeWriter; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocNodeWriter; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeWriterMethod.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeWriterMethod.java similarity index 95% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeWriterMethod.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeWriterMethod.java index 9f3659e..f6b3dc9 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocNodeWriterMethod.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocNodeWriterMethod.java @@ -20,14 +20,14 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.doc.api; +package org.x4o.o2o.tdoc; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; +import org.x4o.o2o.tdoc.dom.ApiDocNodeBody; /** * ApiDocNodeBodyWriterMethod wraps api doc file writer events to a method. diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocProject.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocProject.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocProject.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocProject.java index 8cd8913..ac4d552 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocProject.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocProject.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.doc.api; +package org.x4o.o2o.tdoc; import java.util.List; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocProjectPerspective.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocProjectPerspective.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocProjectPerspective.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocProjectPerspective.java index 2ca1572..35f8b6a 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocProjectPerspective.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocProjectPerspective.java @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.doc.api; +package org.x4o.o2o.tdoc; import java.util.ArrayList; import java.util.List; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocProjectPerspectiveWasp.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocProjectPerspectiveWasp.java similarity index 94% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocProjectPerspectiveWasp.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocProjectPerspectiveWasp.java index 563d0e9..d50421e 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocProjectPerspectiveWasp.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocProjectPerspectiveWasp.java @@ -25,10 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.doc.api; +package org.x4o.o2o.tdoc; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNode; public interface ApiDocProjectPerspectiveWasp { diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocWriter.java similarity index 89% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocWriter.java index fcface6..13d502d 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/ApiDocWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/ApiDocWriter.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.eld.doc.api; +package org.x4o.o2o.tdoc; import java.io.File; import java.io.IOException; @@ -32,26 +32,14 @@ import java.util.Map; import org.x4o.o2o.PropertyConfig; import org.x4o.o2o.PropertyConfig.PropertyConfigItem; import org.x4o.o2o.io.sax3.ContentWriterXml; -import org.x4o.xml.eld.doc.api.ApiDocGenerator; -import org.x4o.xml.eld.doc.api.DefaultPageWriterHelp; -import org.x4o.xml.eld.doc.api.DefaultPageWriterIndexAll; -import org.x4o.xml.eld.doc.api.DefaultPageWriterTree; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocConcept; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocRemoteClass; -import org.x4o.xml.element.ElementNamespaceAttribute; -import org.x4o.xml.element.ElementBindingHandler; -import org.x4o.xml.element.ElementClass; -import org.x4o.xml.element.ElementClassAttribute; -import org.x4o.xml.element.ElementConfigurator; -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.lang.X4OLanguage; -import org.x4o.xml.lang.X4OLanguageModule; -import org.x4o.xml.lang.X4OLanguageSession; +import org.x4o.o2o.tdoc.ApiDocGenerator; +import org.x4o.o2o.tdoc.DefaultPageWriterHelp; +import org.x4o.o2o.tdoc.DefaultPageWriterIndexAll; +import org.x4o.o2o.tdoc.DefaultPageWriterTree; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocConcept; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocRemoteClass; import org.xml.sax.SAXException; /** @@ -60,6 +48,7 @@ import org.xml.sax.SAXException; * @author Willem Cazander * @version 1.0 Aug 26, 2010 */ +@Deprecated // marked until make working to write multiple project or mix api docs in one big tree public class ApiDocWriter { // NOTE: this class is unused, and is waiting for ApiDocProject code and replaces most code in EldDocWriter to here. @@ -108,15 +97,7 @@ public class ApiDocWriter { /** The config of this writer. */ private final PropertyConfig propertyConfig; - /** The language to write doc over. */ - //private final X4OLanguage language; - - /** - * Creates an EldDocGenerator for this langauge context. - * @param language The language to generate doc for. - */ - public ApiDocWriter(X4OLanguage language,PropertyConfig parentConfig) { -// this.language=language; + public ApiDocWriter(PropertyConfig parentConfig) { this.propertyConfig=new PropertyConfig(DEFAULT_PROPERTY_CONFIG,PROPERTY_CONTEXT_PREFIX); this.propertyConfig.copyParentProperties(parentConfig); } @@ -125,16 +106,14 @@ public class ApiDocWriter { * Writes the language documentation to the base path. * @throws ElementException Is thrown when error is done. */ - public void writeDocumentation() throws ElementException { + public void writeDocumentation() throws IOException { try { File basePath = propertyConfig.getPropertyFile(OUTPUT_PATH); ApiDocGenerator writer = new ApiDocGenerator(); ApiDoc doc = buildLanguageDoc(); writer.write(doc, basePath); } catch (SAXException e) { - throw new ElementException(e); - } catch (IOException e) { - throw new ElementException(e); + throw new IOException(e); } } diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterHelp.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/DefaultPageWriterHelp.java similarity index 91% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterHelp.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/DefaultPageWriterHelp.java index bb10edb..919f572 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterHelp.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/DefaultPageWriterHelp.java @@ -20,14 +20,14 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.doc.api; +package org.x4o.o2o.tdoc; import org.x4o.o2o.io.ContentWriterHtml.Tag; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocConcept; -import org.x4o.xml.eld.doc.api.dom.ApiDocPage; -import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocConcept; +import org.x4o.o2o.tdoc.dom.ApiDocPage; +import org.x4o.o2o.tdoc.dom.ApiDocPageWriter; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterIndexAll.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/DefaultPageWriterIndexAll.java similarity index 92% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterIndexAll.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/DefaultPageWriterIndexAll.java index 19c7a17..32c6730 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterIndexAll.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/DefaultPageWriterIndexAll.java @@ -20,12 +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.eld.doc.api; +package org.x4o.o2o.tdoc; import org.x4o.o2o.io.ContentWriterHtml.Tag; -import org.x4o.xml.eld.doc.api.dom.ApiDocPage; -import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.dom.ApiDocPage; +import org.x4o.o2o.tdoc.dom.ApiDocPageWriter; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterTree.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/DefaultPageWriterTree.java similarity index 92% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterTree.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/DefaultPageWriterTree.java index a44600a..b2d27ef 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/DefaultPageWriterTree.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/DefaultPageWriterTree.java @@ -20,14 +20,14 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.xml.eld.doc.api; +package org.x4o.o2o.tdoc; import org.x4o.o2o.io.ContentWriterHtml.Tag; -import org.x4o.xml.eld.doc.api.dom.ApiDoc; -import org.x4o.xml.eld.doc.api.dom.ApiDocNode; -import org.x4o.xml.eld.doc.api.dom.ApiDocPage; -import org.x4o.xml.eld.doc.api.dom.ApiDocPageWriter; -import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; +import org.x4o.o2o.tdoc.dom.ApiDoc; +import org.x4o.o2o.tdoc.dom.ApiDocNode; +import org.x4o.o2o.tdoc.dom.ApiDocPage; +import org.x4o.o2o.tdoc.dom.ApiDocPageWriter; +import org.x4o.o2o.tdoc.dom.ApiDocWriteEvent; import org.xml.sax.SAXException; /** diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDoc.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDoc.java similarity index 99% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDoc.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDoc.java index efbd60d..07ee1b9 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDoc.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDoc.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; import java.io.File; import java.io.IOException; @@ -32,8 +32,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.x4o.xml.eld.doc.api.ApiDocNodeDataConfiguratorBean; -import org.x4o.xml.eld.doc.api.ApiDocNodeWriterBean; +import org.x4o.o2o.tdoc.ApiDocNodeDataConfiguratorBean; +import org.x4o.o2o.tdoc.ApiDocNodeWriterBean; /** * ApiDoc holds all config and data to write a full api doc structure. diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocConcept.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocConcept.java similarity index 99% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocConcept.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocConcept.java index 1c05373..8058f7c 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocConcept.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocConcept.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; import java.util.ArrayList; import java.util.List; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocIndexItem.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocIndexItem.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocIndexItem.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocIndexItem.java index 6f238f0..bf245db 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocIndexItem.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocIndexItem.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; /** * ApiDocIndexItem holds data to print the index all page. diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNavLink.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNavLink.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNavLink.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNavLink.java index c6d04cc..03da2f2 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNavLink.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNavLink.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; /** * ApiDocNavLink holds all fields of an navigation link. diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNode.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNode.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNode.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNode.java index 3d7f46d..4b207c8 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNode.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNode.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; import java.util.ArrayList; import java.util.List; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeBody.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeBody.java similarity index 97% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeBody.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeBody.java index e651a61..d0695a0 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeBody.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeBody.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; /** * ApiDocNodeBody are the parts from which the content body is created. diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeData.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeData.java similarity index 99% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeData.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeData.java index e7f02c9..9aeb486 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeData.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeData.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; import java.util.ArrayList; import java.util.HashMap; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeDataConfigurator.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeDataConfigurator.java similarity index 97% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeDataConfigurator.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeDataConfigurator.java index f93402d..d238bed 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeDataConfigurator.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeDataConfigurator.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; import java.util.List; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeWriter.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeWriter.java index fcd5cb2..67b7cc7 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocNodeWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocNodeWriter.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; import java.util.List; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocPage.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocPage.java similarity index 98% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocPage.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocPage.java index 3dbe831..48f30c0 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocPage.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocPage.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; import java.util.ArrayList; import java.util.List; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocPageWriter.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocPageWriter.java similarity index 97% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocPageWriter.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocPageWriter.java index d3b03f5..5f1cf98 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocPageWriter.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocPageWriter.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; import org.xml.sax.SAXException; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocRemoteClass.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocRemoteClass.java similarity index 99% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocRemoteClass.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocRemoteClass.java index 2a51d15..0056eda 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocRemoteClass.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocRemoteClass.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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; import java.io.BufferedReader; import java.io.IOException; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocWriteEvent.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocWriteEvent.java similarity index 96% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocWriteEvent.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocWriteEvent.java index 53092bc..7913138 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/ApiDocWriteEvent.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/ApiDocWriteEvent.java @@ -20,9 +20,9 @@ * 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.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; -import org.x4o.xml.eld.doc.api.ApiDocContentWriter; +import org.x4o.o2o.tdoc.ApiDocContentWriter; /** * ApiDocWriteEvent holds the needed objects to process write events of content parts. diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/package-info.java similarity index 97% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/package-info.java index 799eb6b..7fc8df7 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/dom/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/dom/package-info.java @@ -26,4 +26,4 @@ * @author Willem Cazander * @since 1.0 May 12,2013 */ -package org.x4o.xml.eld.doc.api.dom; +package org.x4o.o2o.tdoc.dom; diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/package-info.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/package-info.java similarity index 97% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/package-info.java rename to nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/package-info.java index 0283bb2..17c43bb 100644 --- a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/api/package-info.java +++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/tdoc/package-info.java @@ -26,4 +26,4 @@ * @author Willem Cazander * @since 1.0 May 12,2013 */ -package org.x4o.xml.eld.doc.api; +package org.x4o.o2o.tdoc;