You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by gi...@apache.org on 2023/06/26 18:47:08 UTC

[daffodil-site] branch asf-site updated: Publishing from c8cdff840cec4f9ab503bdcb39dc9a22ad3dc8a6

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/daffodil-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 6cc6ddd  Publishing from c8cdff840cec4f9ab503bdcb39dc9a22ad3dc8a6
6cc6ddd is described below

commit 6cc6ddd2f40a80cbf9d1d5033609bb92af752ba4
Author: Apache Daffodil Site Autobuild <de...@daffodil.apache.org>
AuthorDate: Mon Jun 26 18:47:03 2023 +0000

    Publishing from c8cdff840cec4f9ab503bdcb39dc9a22ad3dc8a6
---
 content/doap.rdf                                   |   7 +
 content/docs/latest/javadoc/allclasses-frame.html  |   8 +-
 .../docs/latest/javadoc/allclasses-noframe.html    |   8 +-
 content/docs/latest/javadoc/constant-values.html   |   4 +-
 content/docs/latest/javadoc/deprecated-list.html   | 246 +-----
 content/docs/latest/javadoc/help-doc.html          |   4 +-
 content/docs/latest/javadoc/index-all.html         | 362 ++-------
 content/docs/latest/javadoc/index.html             |   2 +-
 .../javadoc/org/apache/daffodil/japi/Compiler.html | 214 +----
 .../javadoc/org/apache/daffodil/japi/Daffodil.html |  60 +-
 .../daffodil/japi/DaffodilParseXMLReader.html      |  10 +-
 .../japi/DaffodilUnhandledSAXException.html        |  15 +-
 .../japi/DaffodilUnparseContentHandler.html        |  10 +-
 .../japi/DaffodilUnparseErrorSAXException.html     |  15 +-
 .../daffodil/japi/DaffodilXMLEntityResolver.html   |   4 +-
 .../org/apache/daffodil/japi/DataLocation.html     |  48 +-
 .../org/apache/daffodil/japi/DataProcessor.html    | 369 +--------
 .../org/apache/daffodil/japi/Diagnostic.html       |  10 +-
 .../daffodil/japi/ExternalVariableException.html   |   4 +-
 .../daffodil/japi/InvalidParserException.html      |  10 +-
 .../daffodil/japi/InvalidUsageException.html       |  10 +-
 .../apache/daffodil/japi/LocationInSchemaFile.html |  10 +-
 .../org/apache/daffodil/japi/ParseResult.html      |  53 +-
 .../japi/ProcessorFactory.ExperimentalWrapper.html |  14 +-
 .../org/apache/daffodil/japi/ProcessorFactory.html |  46 +-
 .../org/apache/daffodil/japi/UnparseResult.html    |  12 +-
 .../org/apache/daffodil/japi/ValidationMode.html   |   4 +-
 .../org/apache/daffodil/japi/WithDiagnostics.html  |  42 +-
 .../daffodil/japi/debugger/DebuggerRunner.html     |   4 +-
 .../japi/debugger/TraceDebuggerRunner.html         |   4 +-
 .../daffodil/japi/debugger/package-frame.html      |   2 +-
 .../daffodil/japi/debugger/package-summary.html    |   4 +-
 .../daffodil/japi/debugger/package-tree.html       |   4 +-
 .../daffodil/japi/infoset/InfosetInputter.html     |  66 +-
 .../japi/infoset/InfosetInputterProxy.html         |  62 +-
 .../daffodil/japi/infoset/InfosetOutputter.html    |  68 +-
 .../japi/infoset/InfosetOutputterProxy.html        |  94 +--
 .../daffodil/japi/infoset/JDOMInfosetInputter.html |  38 +-
 .../japi/infoset/JDOMInfosetOutputter.html         |  18 +-
 .../daffodil/japi/infoset/JsonInfosetInputter.html |  61 +-
 .../japi/infoset/JsonInfosetOutputter.html         |  69 +-
 .../japi/infoset/NullInfosetOutputter.html         |  18 +-
 .../japi/infoset/ScalaXMLInfosetInputter.html      |  38 +-
 .../japi/infoset/ScalaXMLInfosetOutputter.html     |  18 +-
 .../japi/infoset/W3CDOMInfosetInputter.html        |  38 +-
 .../japi/infoset/W3CDOMInfosetOutputter.html       |  22 +-
 .../XMLTextEscapeStyle.html}                       | 242 ++----
 .../japi/infoset/XMLTextInfosetInputter.html       |  65 +-
 .../japi/infoset/XMLTextInfosetOutputter.html      |  67 +-
 .../daffodil/japi/infoset/package-frame.html       |   6 +-
 .../daffodil/japi/infoset/package-summary.html     |  21 +-
 .../apache/daffodil/japi/infoset/package-tree.html |  20 +-
 .../japi/io/InputSourceDataInputStream.html        |   4 +-
 .../org/apache/daffodil/japi/io/package-frame.html |   2 +-
 .../apache/daffodil/japi/io/package-summary.html   |   8 +-
 .../org/apache/daffodil/japi/io/package-tree.html  |   8 +-
 .../daffodil/japi/logger/ConsoleLogWriter.html     | 306 -------
 .../apache/daffodil/japi/logger/FileLogWriter.html | 331 --------
 .../org/apache/daffodil/japi/logger/LogWriter.html | 394 ---------
 .../apache/daffodil/japi/logger/NullLogWriter.html | 306 -------
 .../apache/daffodil/japi/logger/package-frame.html |  26 -
 .../daffodil/japi/logger/package-summary.html      | 176 ----
 .../apache/daffodil/japi/logger/package-tree.html  | 152 ----
 .../org/apache/daffodil/japi/package-frame.html    |   2 +-
 .../org/apache/daffodil/japi/package-summary.html  |  12 +-
 .../org/apache/daffodil/japi/package-tree.html     |   4 +-
 .../apache/daffodil/udf/UserDefinedFunction.html   |   4 +-
 .../udf/UserDefinedFunctionIdentification.html     |   4 +-
 .../daffodil/udf/UserDefinedFunctionProvider.html  |   4 +-
 .../UserDefinedFunctionFatalException.html         |   4 +-
 .../UserDefinedFunctionProcessingError.html        |   4 +-
 .../daffodil/udf/exceptions/package-frame.html     |   2 +-
 .../daffodil/udf/exceptions/package-summary.html   |   4 +-
 .../daffodil/udf/exceptions/package-tree.html      |   4 +-
 .../org/apache/daffodil/udf/package-frame.html     |   2 +-
 .../org/apache/daffodil/udf/package-summary.html   |   8 +-
 .../org/apache/daffodil/udf/package-tree.html      |   8 +-
 content/docs/latest/javadoc/overview-frame.html    |   3 +-
 content/docs/latest/javadoc/overview-summary.html  |  12 +-
 content/docs/latest/javadoc/overview-tree.html     |  18 +-
 content/docs/latest/javadoc/package-list           |   1 -
 content/docs/latest/javadoc/serialized-form.html   | 262 +-----
 content/docs/latest/scaladoc/index.html            |   8 +-
 content/docs/latest/scaladoc/index.js              |   2 +-
 content/docs/latest/scaladoc/lib/jquery.min.js     |   4 +-
 .../latest/scaladoc/org/apache/daffodil/index.html |   8 +-
 .../org/apache/daffodil/sapi/Compiler.html         | 191 +----
 .../org/apache/daffodil/sapi/Daffodil$.html        |  75 +-
 .../daffodil/sapi/DaffodilParseXMLReader$.html     |  32 +-
 .../daffodil/sapi/DaffodilParseXMLReader.html      |  32 +-
 .../sapi/DaffodilUnhandledSAXException.html        |  37 +-
 .../sapi/DaffodilUnparseContentHandler.html        |  32 +-
 .../sapi/DaffodilUnparseErrorSAXException.html     |  37 +-
 .../daffodil/sapi/DaffodilXMLEntityResolver$.html  |  32 +-
 .../org/apache/daffodil/sapi/DataLocation.html     |  61 +-
 .../org/apache/daffodil/sapi/DataProcessor.html    | 301 +------
 .../org/apache/daffodil/sapi/Diagnostic.html       |  32 +-
 .../daffodil/sapi/ExternalVariableException.html   |  32 +-
 .../daffodil/sapi/InvalidParserException.html      |  38 +-
 .../daffodil/sapi/InvalidUsageException.html       |  38 +-
 .../apache/daffodil/sapi/LocationInSchemaFile.html |  32 +-
 .../org/apache/daffodil/sapi/ParseResult.html      |  85 +-
 .../sapi/ProcessorFactory$experimental$.html       |  14 +-
 .../org/apache/daffodil/sapi/ProcessorFactory.html |  80 +-
 .../org/apache/daffodil/sapi/UnparseResult.html    |  58 +-
 .../daffodil/sapi/ValidationMode$$Custom.html      |  22 +-
 .../org/apache/daffodil/sapi/ValidationMode$.html  |  34 +-
 .../org/apache/daffodil/sapi/WithDiagnostics.html  |  58 +-
 .../daffodil/sapi/debugger/DebuggerRunner.html     |   8 +-
 .../sapi/debugger/TraceDebuggerRunner.html         |   8 +-
 .../org/apache/daffodil/sapi/debugger/index.html   |  24 +-
 .../scaladoc/org/apache/daffodil/sapi/index.html   |  56 +-
 .../daffodil/sapi/infoset/InfosetInputter.html     | 176 ++--
 .../sapi/infoset/InfosetInputterProxy.html         | 176 ++--
 .../daffodil/sapi/infoset/InfosetOutputter.html    |  94 +--
 .../sapi/infoset/InfosetOutputterProxy.html        |  98 +--
 .../daffodil/sapi/infoset/JDOMInfosetInputter.html | 176 ++--
 .../sapi/infoset/JDOMInfosetOutputter.html         |  98 +--
 .../daffodil/sapi/infoset/JsonInfosetInputter.html | 197 +++--
 .../sapi/infoset/JsonInfosetOutputter.html         | 142 ++--
 .../sapi/infoset/NullInfosetOutputter.html         |  98 +--
 .../sapi/infoset/ScalaXMLInfosetInputter.html      | 176 ++--
 .../sapi/infoset/ScalaXMLInfosetOutputter.html     |  98 +--
 .../sapi/infoset/W3CDOMInfosetInputter.html        | 176 ++--
 .../sapi/infoset/W3CDOMInfosetOutputter.html       |  98 +--
 .../XMLTextEscapeStyle$.html}                      | 346 ++++----
 .../sapi/infoset/XMLTextInfosetInputter.html       | 197 +++--
 .../sapi/infoset/XMLTextInfosetOutputter.html      | 152 ++--
 .../org/apache/daffodil/sapi/infoset/index.html    |  98 ++-
 .../sapi/io/InputSourceDataInputStream.html        |   8 +-
 .../org/apache/daffodil/sapi/io/index.html         |  26 +-
 .../daffodil/sapi/logger/ConsoleLogWriter.html     | 880 --------------------
 .../apache/daffodil/sapi/logger/FileLogWriter.html | 897 ---------------------
 .../org/apache/daffodil/sapi/logger/LogWriter.html | 886 --------------------
 .../apache/daffodil/sapi/logger/NullLogWriter.html | 880 --------------------
 .../org/apache/daffodil/sapi/logger/index.html     | 575 -------------
 .../apache/daffodil/udf/UserDefinedFunction.html   |   8 +-
 .../udf/UserDefinedFunctionIdentification.html     |   8 +-
 .../daffodil/udf/UserDefinedFunctionProvider.html  |   8 +-
 .../UserDefinedFunctionFatalException.html         |   8 +-
 .../UserDefinedFunctionProcessingError.html        |   8 +-
 .../org/apache/daffodil/udf/exceptions/index.html  |   8 +-
 .../scaladoc/org/apache/daffodil/udf/index.html    |   8 +-
 content/docs/latest/scaladoc/org/apache/index.html |   8 +-
 content/docs/latest/scaladoc/org/index.html        |   8 +-
 content/index.html                                 |   4 +-
 content/releases/3.5.0/index.html                  |  36 +-
 content/releases/index.html                        |   9 +
 148 files changed, 2274 insertions(+), 10791 deletions(-)

diff --git a/content/doap.rdf b/content/doap.rdf
index cf15bde..f965bdc 100644
--- a/content/doap.rdf
+++ b/content/doap.rdf
@@ -84,6 +84,13 @@
       </asfext:Standard>
     </asfext:implements>
 
+    <release>
+        <Version>
+            <name>Apache Daffodil</name>
+            <created>2023-06-26</created>
+            <revision>3.5.0</revision>
+        </Version>
+    </release>
     <release>
         <Version>
             <name>Apache Daffodil</name>
diff --git a/content/docs/latest/javadoc/allclasses-frame.html b/content/docs/latest/javadoc/allclasses-frame.html
index 93d0b48..3673c28 100644
--- a/content/docs/latest/javadoc/allclasses-frame.html
+++ b/content/docs/latest/javadoc/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Apache Daffodil 3.4.0 Java API)</title>
+<title>All Classes (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,6 @@
 <div class="indexContainer">
 <ul>
 <li><a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi" target="classFrame">Compiler</a></li>
-<li><a href="org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger" target="classFrame">ConsoleLogWriter</a></li>
 <li><a href="org/apache/daffodil/japi/Daffodil.html" title="class in org.apache.daffodil.japi" target="classFrame">Daffodil</a></li>
 <li><a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html" title="class in org.apache.daffodil.japi" target="classFrame">DaffodilParseXMLReader</a></li>
 <li><a href="org/apache/daffodil/japi/DaffodilUnhandledSAXException.html" title="class in org.apache.daffodil.japi" target="classFrame">DaffodilUnhandledSAXException</a></li>
@@ -24,7 +23,6 @@
 <li><a href="org/apache/daffodil/japi/debugger/DebuggerRunner.html" title="class in org.apache.daffodil.japi.debugger" target="classFrame">DebuggerRunner</a></li>
 <li><a href="org/apache/daffodil/japi/Diagnostic.html" title="class in org.apache.daffodil.japi" target="classFrame">Diagnostic</a></li>
 <li><a href="org/apache/daffodil/japi/ExternalVariableException.html" title="class in org.apache.daffodil.japi" target="classFrame">ExternalVariableException</a></li>
-<li><a href="org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger" target="classFrame">FileLogWriter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">InfosetInputter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">InfosetInputterProxy</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">InfosetOutputter</a></li>
@@ -37,10 +35,7 @@
 <li><a href="org/apache/daffodil/japi/infoset/JsonInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">JsonInfosetInputter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">JsonInfosetOutputter</a></li>
 <li><a href="org/apache/daffodil/japi/LocationInSchemaFile.html" title="class in org.apache.daffodil.japi" target="classFrame">LocationInSchemaFile</a></li>
-<li><a href="org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger" target="classFrame">LogLevel</a></li>
-<li><a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger" target="classFrame">LogWriter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/NullInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">NullInfosetOutputter</a></li>
-<li><a href="org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger" target="classFrame">NullLogWriter</a></li>
 <li><a href="org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi" target="classFrame">ParseResult</a></li>
 <li><a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi" target="classFrame">ProcessorFactory</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/ScalaXMLInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">ScalaXMLInfosetInputter</a></li>
@@ -56,6 +51,7 @@
 <li><a href="org/apache/daffodil/japi/infoset/W3CDOMInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">W3CDOMInfosetInputter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">W3CDOMInfosetOutputter</a></li>
 <li><a href="org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi" target="classFrame">WithDiagnostics</a></li>
+<li><a href="org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset" target="classFrame">XMLTextEscapeStyle</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">XMLTextInfosetInputter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">XMLTextInfosetOutputter</a></li>
 </ul>
diff --git a/content/docs/latest/javadoc/allclasses-noframe.html b/content/docs/latest/javadoc/allclasses-noframe.html
index 936473e..dac4fe6 100644
--- a/content/docs/latest/javadoc/allclasses-noframe.html
+++ b/content/docs/latest/javadoc/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (Apache Daffodil 3.4.0 Java API)</title>
+<title>All Classes (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,6 @@
 <div class="indexContainer">
 <ul>
 <li><a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></li>
-<li><a href="org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger">ConsoleLogWriter</a></li>
 <li><a href="org/apache/daffodil/japi/Daffodil.html" title="class in org.apache.daffodil.japi">Daffodil</a></li>
 <li><a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html" title="class in org.apache.daffodil.japi">DaffodilParseXMLReader</a></li>
 <li><a href="org/apache/daffodil/japi/DaffodilUnhandledSAXException.html" title="class in org.apache.daffodil.japi">DaffodilUnhandledSAXException</a></li>
@@ -24,7 +23,6 @@
 <li><a href="org/apache/daffodil/japi/debugger/DebuggerRunner.html" title="class in org.apache.daffodil.japi.debugger">DebuggerRunner</a></li>
 <li><a href="org/apache/daffodil/japi/Diagnostic.html" title="class in org.apache.daffodil.japi">Diagnostic</a></li>
 <li><a href="org/apache/daffodil/japi/ExternalVariableException.html" title="class in org.apache.daffodil.japi">ExternalVariableException</a></li>
-<li><a href="org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger">FileLogWriter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></li>
@@ -37,10 +35,7 @@
 <li><a href="org/apache/daffodil/japi/infoset/JsonInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">JsonInfosetInputter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">JsonInfosetOutputter</a></li>
 <li><a href="org/apache/daffodil/japi/LocationInSchemaFile.html" title="class in org.apache.daffodil.japi">LocationInSchemaFile</a></li>
-<li><a href="org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a></li>
-<li><a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/NullInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">NullInfosetOutputter</a></li>
-<li><a href="org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger">NullLogWriter</a></li>
 <li><a href="org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a></li>
 <li><a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi">ProcessorFactory</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/ScalaXMLInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">ScalaXMLInfosetInputter</a></li>
@@ -56,6 +51,7 @@
 <li><a href="org/apache/daffodil/japi/infoset/W3CDOMInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">W3CDOMInfosetInputter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">W3CDOMInfosetOutputter</a></li>
 <li><a href="org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi">WithDiagnostics</a></li>
+<li><a href="org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">XMLTextInfosetInputter</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">XMLTextInfosetOutputter</a></li>
 </ul>
diff --git a/content/docs/latest/javadoc/constant-values.html b/content/docs/latest/javadoc/constant-values.html
index 1ea0eaa..34d5504 100644
--- a/content/docs/latest/javadoc/constant-values.html
+++ b/content/docs/latest/javadoc/constant-values.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (Apache Daffodil 3.4.0 Java API)</title>
+<title>Constant Field Values (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="Constant Field Values (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/deprecated-list.html b/content/docs/latest/javadoc/deprecated-list.html
index 9bfd119..a19ed68 100644
--- a/content/docs/latest/javadoc/deprecated-list.html
+++ b/content/docs/latest/javadoc/deprecated-list.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (Apache Daffodil 3.4.0 Java API)</title>
+<title>Deprecated List (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="Deprecated List (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -70,248 +70,6 @@
 <div class="header">
 <h1 title="Deprecated API" class="title">Deprecated API</h1>
 <h2 title="Contents">Contents</h2>
-<ul>
-<li><a href="#class">Deprecated Classes</a></li>
-<li><a href="#enum">Deprecated Enums</a></li>
-<li><a href="#method">Deprecated Methods</a></li>
-<li><a href="#constructor">Deprecated Constructors</a></li>
-</ul>
-</div>
-<div class="contentContainer"><a name="class">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Classes table, listing deprecated classes, and an explanation">
-<caption><span>Deprecated Classes</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger">org.apache.daffodil.japi.logger.ConsoleLogWriter</a>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger">org.apache.daffodil.japi.logger.FileLogWriter</a>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">org.apache.daffodil.japi.logger.LogWriter</a>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger">org.apache.daffodil.japi.logger.NullLogWriter</a>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<a name="enum">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Enums table, listing deprecated enums, and an explanation">
-<caption><span>Deprecated Enums</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Enum and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">org.apache.daffodil.japi.logger.LogLevel</a>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<a name="method">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Methods table, listing deprecated methods, and an explanation">
-<caption><span>Deprecated Methods</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/WithDiagnostics.html#canProceed--">org.apache.daffodil.japi.WithDiagnostics.canProceed()</a>
-<div class="block"><span class="deprecationComment">Use !isError() to determine if it is safe to proceed. Since 2.0.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataLocation.html#isAtEnd--">org.apache.daffodil.japi.DataLocation.isAtEnd()</a>
-<div class="block"><span class="deprecationComment">Use comparison of bitPos1b() with expected position instead. Since 3.1.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-">org.apache.daffodil.japi.DataProcessor.parse(ReadableByteChannel)</a>
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-">org.apache.daffodil.japi.DataProcessor.parse(ReadableByteChannel, InfosetOutputter)</a>
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-long-">org.apache.daffodil.japi.DataProcessor.parse(ReadableByteChannel, InfosetOutputter, long)</a>
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-long-">org.apache.daffodil.japi.DataProcessor.parse(ReadableByteChannel, long)</a>
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/ParseResult.html#result--">org.apache.daffodil.japi.ParseResult.result()</a>
-<div class="block"><span class="deprecationComment">Use parse(ReadableByteChannel, InfosetInputter) to parse the data and get the infoset representation from the InfosetOutputter. Since 2.0.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#setDebugger-org.apache.daffodil.japi.debugger.DebuggerRunner-">org.apache.daffodil.japi.DataProcessor.setDebugger(DebuggerRunner)</a>
-<div class="block"><span class="deprecationComment">Use withDebuggerRunner. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#setDebugging-boolean-">org.apache.daffodil.japi.DataProcessor.setDebugging(boolean)</a>
-<div class="block"><span class="deprecationComment">Use withDebugging. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/Compiler.html#setDistinguishedRootNode-java.lang.String-java.lang.String-">org.apache.daffodil.japi.Compiler.setDistinguishedRootNode(String, String)</a>
-<div class="block"><span class="deprecationComment">Pass arguments to compileSource, or compileFile. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/ProcessorFactory.html#setDistinguishedRootNode-java.lang.String-java.lang.String-">org.apache.daffodil.japi.ProcessorFactory.setDistinguishedRootNode(String, String)</a>
-<div class="block"><span class="deprecationComment">Use withDistinguishedRootNode. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/Compiler.html#setExternalDFDLVariable-java.lang.String-java.lang.String-java.lang.String-">org.apache.daffodil.japi.Compiler.setExternalDFDLVariable(String, String, String)</a>
-<div class="block"><span class="deprecationComment">Use DataProcessor.withExternalVariable. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/Compiler.html#setExternalDFDLVariables-java.util.AbstractMap-">org.apache.daffodil.japi.Compiler.setExternalDFDLVariables(AbstractMap&lt;String, String&gt;)</a>
-<div class="block"><span class="deprecationComment">Use DataProcessor.withExternalVariables. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/Compiler.html#setExternalDFDLVariables-java.io.File-">org.apache.daffodil.japi.Compiler.setExternalDFDLVariables(File)</a>
-<div class="block"><span class="deprecationComment">Use DataProcessor.withExternalVariables. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#setExternalVariables-java.io.File-">org.apache.daffodil.japi.DataProcessor.setExternalVariables(File)</a>
-<div class="block"><span class="deprecationComment">Use withExternalVariables. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#setExternalVariables-scala.collection.immutable.Map-">org.apache.daffodil.japi.DataProcessor.setExternalVariables(Map&lt;String, String&gt;)</a>
-<div class="block"><span class="deprecationComment">Use withExternalVariables. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/Daffodil.html#setLoggingLevel-org.apache.daffodil.japi.logger.LogLevel-">org.apache.daffodil.japi.Daffodil.setLoggingLevel(LogLevel)</a>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/Daffodil.html#setLogWriter-org.apache.daffodil.japi.logger.LogWriter-">org.apache.daffodil.japi.Daffodil.setLogWriter(LogWriter)</a>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/Compiler.html#setTunable-java.lang.String-java.lang.String-">org.apache.daffodil.japi.Compiler.setTunable(String, String)</a>
-<div class="block"><span class="deprecationComment">Use withTunable. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/Compiler.html#setTunables-java.util.AbstractMap-">org.apache.daffodil.japi.Compiler.setTunables(AbstractMap&lt;String, String&gt;)</a>
-<div class="block"><span class="deprecationComment">Use withTunables. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/Compiler.html#setValidateDFDLSchemas-boolean-">org.apache.daffodil.japi.Compiler.setValidateDFDLSchemas(boolean)</a>
-<div class="block"><span class="deprecationComment">Do not use this method. DFDL schema validation should be performed. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#setValidationMode-org.apache.daffodil.japi.ValidationMode-">org.apache.daffodil.japi.DataProcessor.setValidationMode(ValidationMode)</a>
-<div class="block"><span class="deprecationComment">Use withValidationMode. Since 2.6.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#unparse-java.nio.channels.WritableByteChannel-org.jdom2.Document-">org.apache.daffodil.japi.DataProcessor.unparse(WritableByteChannel, Document)</a>
-<div class="block"><span class="deprecationComment">Use unparse(InfosetInputter, WritableByteChannel). Since 2.0.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/DataProcessor.html#withExternalVariables-scala.collection.immutable.Map-">org.apache.daffodil.japi.DataProcessor.withExternalVariables(Map&lt;String, String&gt;)</a>
-<div class="block"><span class="deprecationComment">Use withExternalVariables that accepts a Java AbstractMap. Since 3.0.</span></div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-<a name="constructor">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Constructors table, listing deprecated constructors, and an explanation">
-<caption><span>Deprecated Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/infoset/JsonInfosetInputter.html#JsonInfosetInputter-java.io.Reader-">org.apache.daffodil.japi.infoset.JsonInfosetInputter(Reader)</a>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use JsonInfosetInputter(java.io.InputStream) instead. Since 2.4.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html#JsonInfosetOutputter-java.io.Writer-">org.apache.daffodil.japi.infoset.JsonInfosetOutputter(Writer)</a>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use JsonInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html#JsonInfosetOutputter-java.io.Writer-boolean-">org.apache.daffodil.japi.infoset.JsonInfosetOutputter(Writer, boolean)</a>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use JsonInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html#XMLTextInfosetInputter-java.io.Reader-">org.apache.daffodil.japi.infoset.XMLTextInfosetInputter(Reader)</a>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetInputter(java.io.InputStream) instead. Since 2.4.0.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.Writer-">org.apache.daffodil.japi.infoset.XMLTextInfosetOutputter(Writer)</a>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.Writer-boolean-">org.apache.daffodil.japi.infoset.XMLTextInfosetOutputter(Writer, boolean)</a>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
diff --git a/content/docs/latest/javadoc/help-doc.html b/content/docs/latest/javadoc/help-doc.html
index 0e611e4..269973b 100644
--- a/content/docs/latest/javadoc/help-doc.html
+++ b/content/docs/latest/javadoc/help-doc.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (Apache Daffodil 3.4.0 Java API)</title>
+<title>API Help (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="API Help (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/index-all.html b/content/docs/latest/javadoc/index-all.html
index 5c8b845..981e751 100644
--- a/content/docs/latest/javadoc/index-all.html
+++ b/content/docs/latest/javadoc/index-all.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (Apache Daffodil 3.4.0 Java API)</title>
+<title>Index (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="Index (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -86,12 +86,6 @@
 </a>
 <h2 class="title">C</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/WithDiagnostics.html#canProceed--">canProceed()</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi">WithDiagnostics</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use !isError() to determine if it is safe to proceed. Since 2.0.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#characters-char:A-int-int-">characters(char[], int, int)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#compileFile-java.io.File-">compileFile(File)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
@@ -106,7 +100,7 @@
 <dd>
 <div class="block">Compile DFDL schemas into <a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi"><code>ProcessorFactory</code></a>'s or reload saved parsers into <a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a>'s.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#Compiler-org.apache.daffodil.compiler.Compiler-">Compiler(Compiler)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#Compiler-org.apache.daffodil.core.compiler.Compiler-">Compiler(Compiler)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Daffodil.html#compiler--">compiler()</a></span> - Static method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Daffodil.html" title="class in org.apache.daffodil.japi">Daffodil</a></dt>
 <dd>
@@ -120,16 +114,6 @@
 <dd>
 <div class="block">Compile DFDL schema source into a <a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi"><code>ProcessorFactory</code></a></div>
 </dd>
-<dt><a href="org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">ConsoleLogWriter</span></a> - Class in <a href="org/apache/daffodil/japi/logger/package-summary.html">org.apache.daffodil.japi.logger</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/ConsoleLogWriter.html#ConsoleLogWriter--">ConsoleLogWriter()</a></span> - Constructor for class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger">ConsoleLogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/udf/UserDefinedFunctionProvider.html#createUserDefinedFunction-java.lang.String-java.lang.String-">createUserDefinedFunction(String, String)</a></span> - Method in class org.apache.daffodil.udf.<a href="org/apache/daffodil/udf/UserDefinedFunctionProvider.html" title="class in org.apache.daffodil.udf">UserDefinedFunctionProvider</a></dt>
 <dd>
 <div class="block">Finds and initializes User Defined Function class based on namespace and name
@@ -168,25 +152,27 @@
 <div class="block">SAX method of parsing schema and getting the DFDL Infoset via some
  org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html#DaffodilParseXMLReader-org.apache.daffodil.processors.DaffodilParseXMLReader-">DaffodilParseXMLReader(DaffodilParseXMLReader)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html" title="class in org.apache.daffodil.japi">DaffodilParseXMLReader</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html#DaffodilParseXMLReader-org.apache.daffodil.runtime1.processors.DaffodilParseXMLReader-">DaffodilParseXMLReader(DaffodilParseXMLReader)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html" title="class in org.apache.daffodil.japi">DaffodilParseXMLReader</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/DaffodilUnhandledSAXException.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">DaffodilUnhandledSAXException</span></a> - Exception in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
-<div class="block">This exception will be thrown when an unexpected error occurs during the SAX unparse</div>
+<div class="block">This exception is thrown when and unexpected error occurs while unparsing an
+ infoset with an XMLReader and a DaffodilUnparseContentHandler.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnhandledSAXException.html#DaffodilUnhandledSAXException-org.apache.daffodil.api.DFDL.DaffodilUnhandledSAXException-">DaffodilUnhandledSAXException(DFDL.DaffodilUnhandledSAXException)</a></span> - Constructor for exception org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnhandledSAXException.html" title="class in org.apache.daffodil.japi">DaffodilUnhandledSAXException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnhandledSAXException.html#DaffodilUnhandledSAXException-org.apache.daffodil.runtime1.api.DFDL.DaffodilUnhandledSAXException-">DaffodilUnhandledSAXException(DFDL.DaffodilUnhandledSAXException)</a></span> - Constructor for exception org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnhandledSAXException.html" title="class in org.apache.daffodil.japi">DaffodilUnhandledSAXException</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">DaffodilUnparseContentHandler</span></a> - Class in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
 <div class="block">Accepts SAX callback events from any SAX XMLReader for unparsing</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#DaffodilUnparseContentHandler-org.apache.daffodil.processors.DaffodilUnparseContentHandler-">DaffodilUnparseContentHandler(DaffodilUnparseContentHandler)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#DaffodilUnparseContentHandler-org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseContentHandler-">DaffodilUnparseContentHandler(DFDL.DaffodilUnparseContentHandler)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">DaffodilUnparseErrorSAXException</span></a> - Exception in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
-<div class="block">This exception will be thrown when unparseResult.isError returns true during a SAX Unparse</div>
+<div class="block">This exception is thrown when UnparseResult.isError returns true while
+ unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html#DaffodilUnparseErrorSAXException-org.apache.daffodil.api.DFDL.DaffodilUnparseErrorSAXException-">DaffodilUnparseErrorSAXException(DFDL.DaffodilUnparseErrorSAXException)</a></span> - Constructor for exception org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html" title="class in org.apache.daffodil.japi">DaffodilUnparseErrorSAXException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html#DaffodilUnparseErrorSAXException-org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseErrorSAXException-">DaffodilUnparseErrorSAXException(DFDL.DaffodilUnparseErrorSAXException)</a></span> - Constructor for exception org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html" title="class in org.apache.daffodil.japi">DaffodilUnparseErrorSAXExcepti [...]
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/DaffodilXMLEntityResolver.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">DaffodilXMLEntityResolver</span></a> - Class in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
@@ -199,13 +185,13 @@
 <dd>
 <div class="block">Information related to a location in data</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataLocation.html#DataLocation-org.apache.daffodil.api.DataLocation-">DataLocation(DataLocation)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataLocation.html" title="class in org.apache.daffodil.japi">DataLocation</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataLocation.html#DataLocation-org.apache.daffodil.lib.api.DataLocation-">DataLocation(DataLocation)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataLocation.html" title="class in org.apache.daffodil.japi">DataLocation</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">DataProcessor</span></a> - Class in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
 <div class="block">Compiled version of a DFDL Schema, used to parse data and get the DFDL infoset</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#DataProcessor-org.apache.daffodil.processors.DataProcessor-">DataProcessor(DataProcessor)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#DataProcessor-org.apache.daffodil.runtime1.processors.DataProcessor-">DataProcessor(DataProcessor)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/debugger/DebuggerRunner.html" title="class in org.apache.daffodil.japi.debugger"><span class="typeNameLink">DebuggerRunner</span></a> - Class in <a href="org/apache/daffodil/japi/debugger/package-summary.html">org.apache.daffodil.japi.debugger</a></dt>
 <dd>
@@ -217,7 +203,7 @@
 <dd>
 <div class="block">Class containing diagnostic information</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Diagnostic.html#Diagnostic-org.apache.daffodil.api.Diagnostic-">Diagnostic(Diagnostic)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Diagnostic.html" title="class in org.apache.daffodil.japi">Diagnostic</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Diagnostic.html#Diagnostic-org.apache.daffodil.lib.api.Diagnostic-">Diagnostic(Diagnostic)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Diagnostic.html" title="class in org.apache.daffodil.japi">Diagnostic</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/io/InputSourceDataInputStream.html#dis--">dis()</a></span> - Method in class org.apache.daffodil.japi.io.<a href="org/apache/daffodil/japi/io/InputSourceDataInputStream.html" title="class in org.apache.daffodil.japi.io">InputSourceDataInputStream</a></dt>
 <dd>&nbsp;</dd>
@@ -227,17 +213,17 @@
 </a>
 <h2 class="title">E</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray(DIArray)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray(DIArray)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
 <dd>
 <div class="block">Called by Daffodil internals to signify the end of an array of elements.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray(DIArray)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray(DIArray)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex(DIComplex)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex(DIComplex)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
 <dd>
 <div class="block">Called by Daffodil internals to signify the end of a complex element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex(DIComplex)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex(DIComplex)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#endDocument--">endDocument()</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
 <dd>&nbsp;</dd>
@@ -251,15 +237,15 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#endPrefixMapping-java.lang.String-">endPrefixMapping(String)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#endSimple-org.apache.daffodil.infoset.DISimple-">endSimple(DISimple)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#endSimple-org.apache.daffodil.runtime1.infoset.DISimple-">endSimple(DISimple)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
 <dd>
 <div class="block">Called by Daffodil internals to signify the end of a simple element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endSimple-org.apache.daffodil.infoset.DISimple-">endSimple(DISimple)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endSimple-org.apache.daffodil.runtime1.infoset.DISimple-">endSimple(DISimple)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ProcessorFactory.html#experimental--">experimental()</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi">ProcessorFactory</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html#ExperimentalWrapper-org.apache.daffodil.dsom.walker.RootView-">ExperimentalWrapper(RootView)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html" title="class in org.apache.daffodil.japi">ProcessorFactory.ExperimentalWrapper</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html#ExperimentalWrapper-org.apache.daffodil.core.dsom.walker.RootView-">ExperimentalWrapper(RootView)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html" title="class in org.apache.daffodil.japi">ProcessorFactory.ExperimentalWrapper</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/ExternalVariableException.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">ExternalVariableException</span></a> - Exception in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
@@ -273,16 +259,6 @@
 </a>
 <h2 class="title">F</h2>
 <dl>
-<dt><a href="org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">FileLogWriter</span></a> - Class in <a href="org/apache/daffodil/japi/logger/package-summary.html">org.apache.daffodil.japi.logger</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/FileLogWriter.html#FileLogWriter-java.io.File-">FileLogWriter(File)</a></span> - Constructor for class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger">FileLogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/debugger/DebuggerRunner.html#fini--">fini()</a></span> - Method in class org.apache.daffodil.japi.debugger.<a href="org/apache/daffodil/japi/debugger/DebuggerRunner.html" title="class in org.apache.daffodil.japi.debugger">DebuggerRunner</a></dt>
 <dd>
 <div class="block">Called once upon completion of a parse, allowing one to perform any
@@ -341,11 +317,6 @@
 <dd>
 <div class="block">Get the value of the feature flag</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/FileLogWriter.html#getFile--">getFile()</a></span> - Method in class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger">FileLogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-<div class="block">Retrieve the file the log writer writes to</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html#getLocalName--">getLocalName()</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputter</a></dt>
 <dd>
 <div class="block">Get the local name of the current event.</div>
@@ -384,18 +355,18 @@
 <dd>
 <div class="block">Get the w3c Document representing the infoset created during a parse</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText(NodeInfo.Kind, Map&lt;String, String&gt;)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText(NodeInfo.Kind, Map&lt;String, String&gt;)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputter</a></dt>
 <dd>
 <div class="block">Get the content of a simple type.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-">getSimpleText(NodeInfo.Kind)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-">getSimpleText(NodeInfo.Kind)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputter</a></dt>
 <dd>
 <div class="block">See getSimpleText(primType, runtimeProperties), which has a default
  implementation to call this function without the runtimeProperties Map</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText(NodeInfo.Kind, Map&lt;String, String&gt;)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText(NodeInfo.Kind, Map&lt;String, String&gt;)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-">getSimpleText(NodeInfo.Kind)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-">getSimpleText(NodeInfo.Kind)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Diagnostic.html#getSomeCause--">getSomeCause()</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Diagnostic.html" title="class in org.apache.daffodil.japi">Diagnostic</a></dt>
 <dd>
@@ -438,11 +409,6 @@
 </a>
 <h2 class="title">I</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/LogLevel.html#id">id</a></span> - Variable in enum org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-<div class="block">Numeric ID of the log level</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ValidationMode.html#id">id</a></span> - Variable in enum org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ValidationMode.html" title="enum in org.apache.daffodil.japi">ValidationMode</a></dt>
 <dd>
 <div class="block">Numeric ID of the validation mode</div>
@@ -537,20 +503,14 @@
  that is invalid (not a parser file, corrupt, etc.) or
  is not in the GZIP format.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/InvalidParserException.html#InvalidParserException-org.apache.daffodil.compiler.InvalidParserException-">InvalidParserException(InvalidParserException)</a></span> - Constructor for exception org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/InvalidParserException.html" title="class in org.apache.daffodil.japi">InvalidParserException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/InvalidParserException.html#InvalidParserException-org.apache.daffodil.core.compiler.InvalidParserException-">InvalidParserException(InvalidParserException)</a></span> - Constructor for exception org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/InvalidParserException.html" title="class in org.apache.daffodil.japi">InvalidParserException</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/InvalidUsageException.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">InvalidUsageException</span></a> - Exception in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
 <div class="block">This exception will be thrown as a result of an invalid usage of the Daffodil API</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/InvalidUsageException.html#InvalidUsageException-org.apache.daffodil.processors.InvalidUsageException-">InvalidUsageException(InvalidUsageException)</a></span> - Constructor for exception org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/InvalidUsageException.html" title="class in org.apache.daffodil.japi">InvalidUsageException</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/InvalidUsageException.html#InvalidUsageException-org.apache.daffodil.runtime1.processors.InvalidUsageException-">InvalidUsageException(InvalidUsageException)</a></span> - Constructor for exception org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/InvalidUsageException.html" title="class in org.apache.daffodil.japi">InvalidUsageException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataLocation.html#isAtEnd--">isAtEnd()</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataLocation.html" title="class in org.apache.daffodil.japi">DataLocation</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use comparison of bitPos1b() with expected position instead. Since 3.1.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Diagnostic.html#isError--">isError()</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Diagnostic.html" title="class in org.apache.daffodil.japi">Diagnostic</a></dt>
 <dd>
 <div class="block">Determine if a diagnostic object represents an error or something less serious.</div>
@@ -596,12 +556,6 @@
 <dd>
 <div class="block"><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><code>InfosetInputter</code></a> to read an infoset represented as JSON from a java.io.InputStream</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/JsonInfosetInputter.html#JsonInfosetInputter-java.io.Reader-">JsonInfosetInputter(Reader)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/JsonInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">JsonInfosetInputter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use JsonInfosetInputter(java.io.InputStream) instead. Since 2.4.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/JsonInfosetInputter.html#JsonInfosetInputter-java.io.InputStream-">JsonInfosetInputter(InputStream)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/JsonInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">JsonInfosetInputter</a></dt>
 <dd>
 <div class="block">Read in an infoset in the form of json text from a java.io.InputStream</div>
@@ -610,18 +564,6 @@
 <dd>
 <div class="block"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><code>InfosetOutputter</code></a> to build an infoset represented as JSON written to a java.io.OutputStream</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html#JsonInfosetOutputter-java.io.Writer-boolean-">JsonInfosetOutputter(Writer, boolean)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">JsonInfosetOutputter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use JsonInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html#JsonInfosetOutputter-java.io.Writer-">JsonInfosetOutputter(Writer)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">JsonInfosetOutputter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use JsonInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html#JsonInfosetOutputter-java.io.OutputStream-boolean-">JsonInfosetOutputter(OutputStream, boolean)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">JsonInfosetOutputter</a></dt>
 <dd>
 <div class="block">Output the infoset as json text, written to a java.io.OutputStream</div>
@@ -646,29 +588,8 @@
 <dd>
 <div class="block">Information related to locations in DFDL schema files</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/LocationInSchemaFile.html#LocationInSchemaFile-org.apache.daffodil.api.LocationInSchemaFile-">LocationInSchemaFile(LocationInSchemaFile)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/LocationInSchemaFile.html" title="class in org.apache.daffodil.japi">LocationInSchemaFile</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/LocationInSchemaFile.html#LocationInSchemaFile-org.apache.daffodil.lib.api.LocationInSchemaFile-">LocationInSchemaFile(LocationInSchemaFile)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/LocationInSchemaFile.html" title="class in org.apache.daffodil.japi">LocationInSchemaFile</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/LogWriter.html#log-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-java.util.List-">log(LogLevel, String, String, List&lt;Object&gt;)</a></span> - Method in class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-<div class="block">Generates a log message as a string and calls the write method.</div>
-</dd>
-<dt><a href="org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger"><span class="typeNameLink">LogLevel</span></a> - Enum in <a href="org/apache/daffodil/japi/logger/package-summary.html">org.apache.daffodil.japi.logger</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-</dd>
-<dt><a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">LogWriter</span></a> - Class in <a href="org/apache/daffodil/japi/logger/package-summary.html">org.apache.daffodil.japi.logger</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/LogWriter.html#LogWriter--">LogWriter()</a></span> - Constructor for class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-&nbsp;</dd>
 </dl>
 <a name="I:N">
 <!--   -->
@@ -696,16 +617,6 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/NullInfosetOutputter.html#NullInfosetOutputter--">NullInfosetOutputter()</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/NullInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">NullInfosetOutputter</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">NullLogWriter</span></a> - Class in <a href="org/apache/daffodil/japi/logger/package-summary.html">org.apache.daffodil.japi.logger</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/NullLogWriter.html#NullLogWriter--">NullLogWriter()</a></span> - Constructor for class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger">NullLogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-&nbsp;</dd>
 </dl>
 <a name="I:O">
 <!--   -->
@@ -733,8 +644,6 @@
 </dd>
 <dt><a href="org/apache/daffodil/japi/io/package-summary.html">org.apache.daffodil.japi.io</a> - package org.apache.daffodil.japi.io</dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/apache/daffodil/japi/logger/package-summary.html">org.apache.daffodil.japi.logger</a> - package org.apache.daffodil.japi.logger</dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/udf/package-summary.html">org.apache.daffodil.udf</a> - package org.apache.daffodil.udf</dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/udf/exceptions/package-summary.html">org.apache.daffodil.udf.exceptions</a> - package org.apache.daffodil.udf.exceptions</dt>
@@ -765,53 +674,24 @@
 <dd>
 <div class="block">Parse input data from an array of bytes.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-long-">parse(ReadableByteChannel, long)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-">parse(ReadableByteChannel)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-long-">parse(ReadableByteChannel, InfosetOutputter, long)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-">parse(ReadableByteChannel, InfosetOutputter)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#parse-org.apache.daffodil.japi.io.InputSourceDataInputStream-org.apache.daffodil.japi.infoset.InfosetOutputter-">parse(InputSourceDataInputStream, InfosetOutputter)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
 <dd>
 <div class="block">Parse input data from an InputSourceDataInputStream and output the infoset to an InfosetOutputter</div>
 </dd>
 <dt><a href="org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">ParseResult</span></a> - Class in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
-<div class="block">Result of calling <a href="org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-long-"><code>DataProcessor.parse(java.nio.channels.ReadableByteChannel, InfosetOutputter, long)</code></a>, containing
+<div class="block">Result of calling <a href="org/apache/daffodil/japi/DataProcessor.html#parse-org.apache.daffodil.japi.io.InputSourceDataInputStream-org.apache.daffodil.japi.infoset.InfosetOutputter-"><code>DataProcessor.parse(InputSourceDataInputStream, InfosetOutputter)</code></a>, containing
  the diagnostic information, and the final data location</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ParseResult.html#ParseResult-org.apache.daffodil.processors.ParseResult-org.apache.daffodil.util.Maybe-">ParseResult(ParseResult, Maybe&lt;JDOMInfosetOutputter&gt;)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ParseResult.html#ParseResult-org.apache.daffodil.runtime1.processors.ParseResult-">ParseResult(ParseResult)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/LogWriter.html#prefix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">prefix(LogLevel, String)</a></span> - Method in class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-<div class="block">Override to change the prefix string of the log message.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#processingInstruction-java.lang.String-java.lang.String-">processingInstruction(String, String)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">ProcessorFactory</span></a> - Class in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
 <div class="block">Factory to create <a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a>'s, used for parsing data</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ProcessorFactory.html#ProcessorFactory-org.apache.daffodil.compiler.ProcessorFactory-">ProcessorFactory(ProcessorFactory)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi">ProcessorFactory</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ProcessorFactory.html#ProcessorFactory-org.apache.daffodil.core.compiler.ProcessorFactory-">ProcessorFactory(ProcessorFactory)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi">ProcessorFactory</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">ProcessorFactory.ExperimentalWrapper</span></a> - Class in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
@@ -837,12 +717,6 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#reset--">reset()</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ParseResult.html#result--">result()</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use parse(ReadableByteChannel, InfosetInputter) to parse the data and get the infoset representation from the InfosetOutputter. Since 2.0.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html#rootView--">rootView()</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html" title="class in org.apache.daffodil.japi">ProcessorFactory.ExperimentalWrapper</a></dt>
 <dd>&nbsp;</dd>
 </dl>
@@ -871,30 +745,6 @@
 <dd>
 <div class="block">Register a content handler</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#setDebugger-org.apache.daffodil.japi.debugger.DebuggerRunner-">setDebugger(DebuggerRunner)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use withDebuggerRunner. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#setDebugging-boolean-">setDebugging(boolean)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use withDebugging. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#setDistinguishedRootNode-java.lang.String-java.lang.String-">setDistinguishedRootNode(String, String)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Pass arguments to compileSource, or compileFile. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ProcessorFactory.html#setDistinguishedRootNode-java.lang.String-java.lang.String-">setDistinguishedRootNode(String, String)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi">ProcessorFactory</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use withDistinguishedRootNode. Since 2.6.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#setDocumentLocator-org.xml.sax.Locator-">setDocumentLocator(Locator)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html#setDTDHandler-org.xml.sax.DTDHandler-">setDTDHandler(DTDHandler)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html" title="class in org.apache.daffodil.japi">DaffodilParseXMLReader</a></dt>
@@ -909,93 +759,27 @@
 <dd>
 <div class="block">Register an error handler</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#setExternalDFDLVariable-java.lang.String-java.lang.String-java.lang.String-">setExternalDFDLVariable(String, String, String)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use DataProcessor.withExternalVariable. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#setExternalDFDLVariables-java.util.AbstractMap-">setExternalDFDLVariables(AbstractMap&lt;String, String&gt;)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use DataProcessor.withExternalVariables. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#setExternalDFDLVariables-java.io.File-">setExternalDFDLVariables(File)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use DataProcessor.withExternalVariables. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#setExternalVariables-java.io.File-">setExternalVariables(File)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use withExternalVariables. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#setExternalVariables-scala.collection.immutable.Map-">setExternalVariables(Map&lt;String, String&gt;)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use withExternalVariables. Since 2.6.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html#setFeature-java.lang.String-boolean-">setFeature(String, boolean)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html" title="class in org.apache.daffodil.japi">DaffodilParseXMLReader</a></dt>
 <dd>
 <div class="block">Set the value of the feature flag</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Daffodil.html#setLoggingLevel-org.apache.daffodil.japi.logger.LogLevel-">setLoggingLevel(LogLevel)</a></span> - Static method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Daffodil.html" title="class in org.apache.daffodil.japi">Daffodil</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Daffodil.html#setLogWriter-org.apache.daffodil.japi.logger.LogWriter-">setLogWriter(LogWriter)</a></span> - Static method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Daffodil.html" title="class in org.apache.daffodil.japi">Daffodil</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html#setProperty-java.lang.String-java.lang.Object-">setProperty(String, Object)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilParseXMLReader.html" title="class in org.apache.daffodil.japi">DaffodilParseXMLReader</a></dt>
 <dd>
 <div class="block">Set the value of the property</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#setTunable-java.lang.String-java.lang.String-">setTunable(String, String)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use withTunable. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#setTunables-java.util.AbstractMap-">setTunables(AbstractMap&lt;String, String&gt;)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use withTunables. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/Compiler.html#setValidateDFDLSchemas-boolean-">setValidateDFDLSchemas(boolean)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Do not use this method. DFDL schema validation should be performed. Since 2.6.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#setValidationMode-org.apache.daffodil.japi.ValidationMode-">setValidationMode(ValidationMode)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use withValidationMode. Since 2.6.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#skippedEntity-java.lang.String-">skippedEntity(String)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#startArray-org.apache.daffodil.infoset.DIArray-">startArray(DIArray)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#startArray-org.apache.daffodil.runtime1.infoset.DIArray-">startArray(DIArray)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
 <dd>
 <div class="block">Called by Daffodil internals to signify the beginning of an array of elements.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startArray-org.apache.daffodil.infoset.DIArray-">startArray(DIArray)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startArray-org.apache.daffodil.runtime1.infoset.DIArray-">startArray(DIArray)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#startComplex-org.apache.daffodil.infoset.DIComplex-">startComplex(DIComplex)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#startComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">startComplex(DIComplex)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
 <dd>
 <div class="block">Called by Daffodil internals to signify the beginning of a complex element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startComplex-org.apache.daffodil.infoset.DIComplex-">startComplex(DIComplex)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">startComplex(DIComplex)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#startDocument--">startDocument()</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
 <dd>&nbsp;</dd>
@@ -1009,17 +793,12 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#startPrefixMapping-java.lang.String-java.lang.String-">startPrefixMapping(String, String)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DaffodilUnparseContentHandler.html" title="class in org.apache.daffodil.japi">DaffodilUnparseContentHandler</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#startSimple-org.apache.daffodil.infoset.DISimple-">startSimple(DISimple)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html#startSimple-org.apache.daffodil.runtime1.infoset.DISimple-">startSimple(DISimple)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></dt>
 <dd>
 <div class="block">Called by Daffodil internals to signify the beginning of a simple element.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startSimple-org.apache.daffodil.infoset.DISimple-">startSimple(DISimple)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startSimple-org.apache.daffodil.runtime1.infoset.DISimple-">startSimple(DISimple)</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/LogWriter.html#suffix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">suffix(LogLevel, String)</a></span> - Method in class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-<div class="block">Override to change the suffix string of the log message.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#supportsNamespaces--">supportsNamespaces()</a></span> - Method in class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></dt>
 <dd>&nbsp;</dd>
 </dl>
@@ -1052,18 +831,12 @@
 <dd>
 <div class="block">Unparse an InfosetInputter</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#unparse-java.nio.channels.WritableByteChannel-org.jdom2.Document-">unparse(WritableByteChannel, Document)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use unparse(InfosetInputter, WritableByteChannel). Since 2.0.0.</span></div>
-</div>
-</dd>
 <dt><a href="org/apache/daffodil/japi/UnparseResult.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">UnparseResult</span></a> - Class in <a href="org/apache/daffodil/japi/package-summary.html">org.apache.daffodil.japi</a></dt>
 <dd>
 <div class="block">Result of calling <a href="org/apache/daffodil/japi/DataProcessor.html#unparse-org.apache.daffodil.japi.infoset.InfosetInputter-java.nio.channels.WritableByteChannel-"><code>DataProcessor.unparse(InfosetInputter, java.nio.channels.WritableByteChannel)</code></a>,
  containing diagnostic information</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/UnparseResult.html#UnparseResult-org.apache.daffodil.processors.UnparseResult-">UnparseResult(UnparseResult)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/UnparseResult.html" title="class in org.apache.daffodil.japi">UnparseResult</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/UnparseResult.html#UnparseResult-org.apache.daffodil.runtime1.processors.UnparseResult-">UnparseResult(UnparseResult)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/UnparseResult.html" title="class in org.apache.daffodil.japi">UnparseResult</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/daffodil/udf/UserDefinedFunction.html" title="interface in org.apache.daffodil.udf"><span class="typeNameLink">UserDefinedFunction</span></a> - Interface in <a href="org/apache/daffodil/udf/package-summary.html">org.apache.daffodil.udf</a></dt>
 <dd>
@@ -1118,18 +891,16 @@
 <dd>
 <div class="block">Validation modes for validating the resulting infoset against the DFDL schema</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/LogLevel.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ValidationMode.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ValidationMode.html" title="enum in org.apache.daffodil.japi">ValidationMode</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/LogLevel.html#values--">values()</a></span> - Static method in enum org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html#values--">values()</a></span> - Static method in enum org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
@@ -1156,7 +927,7 @@ the order they are declared.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html#W3CDOMInfosetOutputter--">W3CDOMInfosetOutputter()</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">W3CDOMInfosetOutputter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#withDebugger-org.apache.daffodil.debugger.Debugger-">withDebugger(Debugger)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#withDebugger-org.apache.daffodil.runtime1.debugger.Debugger-">withDebugger(Debugger)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
 <dd>
 <div class="block">Obtain a new <a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with a specified debugger.</div>
 </dd>
@@ -1172,7 +943,7 @@ the order they are declared.</div>
 <dd>
 <div class="block">Abstract class that adds diagnostic information to classes that extend it.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/WithDiagnostics.html#WithDiagnostics-org.apache.daffodil.api.WithDiagnostics-">WithDiagnostics(WithDiagnostics)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi">WithDiagnostics</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/WithDiagnostics.html#WithDiagnostics-org.apache.daffodil.lib.api.WithDiagnostics-">WithDiagnostics(WithDiagnostics)</a></span> - Constructor for class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi">WithDiagnostics</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/ProcessorFactory.html#withDistinguishedRootNode-java.lang.String-java.lang.String-">withDistinguishedRootNode(String, String)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi">ProcessorFactory</a></dt>
 <dd>
@@ -1182,12 +953,6 @@ the order they are declared.</div>
 <dd>
 <div class="block">Obtain a new <a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with external variables read from a Daffodil configuration file</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#withExternalVariables-scala.collection.immutable.Map-">withExternalVariables(Map&lt;String, String&gt;)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">Use withExternalVariables that accepts a Java AbstractMap. Since 3.0.</span></div>
-</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#withExternalVariables-java.util.AbstractMap-">withExternalVariables(AbstractMap&lt;String, String&gt;)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
 <dd>
 <div class="block">Obtain a new <a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with multiple DFDL variables set.</div>
@@ -1204,42 +969,23 @@ the order they are declared.</div>
 <dd>
 <div class="block">Obtain a new <a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> having a specific validation mode</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#withValidator-org.apache.daffodil.api.Validator-">withValidator(Validator)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/DataProcessor.html#withValidator-org.apache.daffodil.lib.api.Validator-">withValidator(Validator)</a></span> - Method in class org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></dt>
 <dd>
 <div class="block">Obtain a new <a href="org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> having a specific validator</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/ConsoleLogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write(LogLevel, String, String)</a></span> - Method in class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger">ConsoleLogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/FileLogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write(LogLevel, String, String)</a></span> - Method in class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger">FileLogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/LogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write(LogLevel, String, String)</a></span> - Method in class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-<div class="block">Implement this method to determine how the log message is written.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/logger/NullLogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write(LogLevel, String, String)</a></span> - Method in class org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger">NullLogWriter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
-&nbsp;</dd>
 </dl>
 <a name="I:X">
 <!--   -->
 </a>
 <h2 class="title">X</h2>
 <dl>
-<dt><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">XMLTextInfosetInputter</span></a> - Class in <a href="org/apache/daffodil/japi/infoset/package-summary.html">org.apache.daffodil.japi.infoset</a></dt>
+<dt><a href="org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset"><span class="typeNameLink">XMLTextEscapeStyle</span></a> - Enum in <a href="org/apache/daffodil/japi/infoset/package-summary.html">org.apache.daffodil.japi.infoset</a></dt>
 <dd>
-<div class="block"><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><code>InfosetInputter</code></a> to read an infoset represented as XML from a java.io.InputStream</div>
+<div class="block">XMLTextEscapeStyles for determining whether to wrap info in CDATA tags</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html#XMLTextInfosetInputter-java.io.Reader-">XMLTextInfosetInputter(Reader)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">XMLTextInfosetInputter</a></dt>
+<dt><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">XMLTextInfosetInputter</span></a> - Class in <a href="org/apache/daffodil/japi/infoset/package-summary.html">org.apache.daffodil.japi.infoset</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetInputter(java.io.InputStream) instead. Since 2.4.0.</span></div>
-</div>
+<div class="block"><a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><code>InfosetInputter</code></a> to read an infoset represented as XML from a java.io.InputStream</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html#XMLTextInfosetInputter-java.io.InputStream-">XMLTextInfosetInputter(InputStream)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">XMLTextInfosetInputter</a></dt>
 <dd>
@@ -1249,19 +995,11 @@ the order they are declared.</div>
 <dd>
 <div class="block"><a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><code>InfosetOutputter</code></a> to build an infoset represented as XML written to a java.io.OutputStream</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.Writer-boolean-">XMLTextInfosetOutputter(Writer, boolean)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">XMLTextInfosetOutputter</a></dt>
-<dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.Writer-">XMLTextInfosetOutputter(Writer)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">XMLTextInfosetOutputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.OutputStream-boolean-">XMLTextInfosetOutputter(OutputStream, boolean)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">XMLTextInfosetOutputter</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</div>
+<div class="block">Output the infoset as XML Text, written to a java.io.OutputStream</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.OutputStream-boolean-">XMLTextInfosetOutputter(OutputStream, boolean)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">XMLTextInfosetOutputter</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.OutputStream-boolean-org.apache.daffodil.japi.infoset.XMLTextEscapeStyle-">XMLTextInfosetOutputter(OutputStream, boolean, XMLTextEscapeStyle)</a></span> - Constructor for class org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">XMLTextInfosetOutputter< [...]
 <dd>
 <div class="block">Output the infoset as XML Text, written to a java.io.OutputStream</div>
 </dd>
diff --git a/content/docs/latest/javadoc/index.html b/content/docs/latest/javadoc/index.html
index 4ba08f8..d16925d 100644
--- a/content/docs/latest/javadoc/index.html
+++ b/content/docs/latest/javadoc/index.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Apache Daffodil 3.4.0 Java API</title>
+<title>Apache Daffodil 3.5.0 Java API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/Compiler.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/Compiler.html
index d975bf3..fcec7fd 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/Compiler.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/Compiler.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Compiler (Apache Daffodil 3.4.0 Java API)</title>
+<title>Compiler (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Compiler (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="Compiler (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":42,"i7":42,"i8":42,"i9":42,"i10":42,"i11":42,"i12":42,"i13":10,"i14":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -130,7 +130,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#Compiler-org.apache.daffodil.compiler.Compiler-">Compiler</a></span>(org.apache.daffodil.compiler.Compiler&nbsp;sCompiler)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#Compiler-org.apache.daffodil.core.compiler.Compiler-">Compiler</a></span>(org.apache.daffodil.core.compiler.Compiler&nbsp;sCompiler)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -142,7 +142,7 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -188,73 +188,13 @@ extends java.lang.Object</pre>
 </td>
 </tr>
 <tr id="i6" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#setDistinguishedRootNode-java.lang.String-java.lang.String-">setDistinguishedRootNode</a></span>(java.lang.String&nbsp;name,
-                        java.lang.String&nbsp;namespace)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Pass arguments to compileSource, or compileFile. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#setExternalDFDLVariable-java.lang.String-java.lang.String-java.lang.String-">setExternalDFDLVariable</a></span>(java.lang.String&nbsp;name,
-                       java.lang.String&nbsp;namespace,
-                       java.lang.String&nbsp;value)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use DataProcessor.withExternalVariable. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#setExternalDFDLVariables-java.util.AbstractMap-">setExternalDFDLVariables</a></span>(java.util.AbstractMap&lt;java.lang.String,java.lang.String&gt;&nbsp;extVarsMap)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use DataProcessor.withExternalVariables. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#setExternalDFDLVariables-java.io.File-">setExternalDFDLVariables</a></span>(java.io.File&nbsp;extVarsFile)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use DataProcessor.withExternalVariables. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#setTunable-java.lang.String-java.lang.String-">setTunable</a></span>(java.lang.String&nbsp;tunable,
-          java.lang.String&nbsp;value)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use withTunable. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#setTunables-java.util.AbstractMap-">setTunables</a></span>(java.util.AbstractMap&lt;java.lang.String,java.lang.String&gt;&nbsp;tunables)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use withTunables. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#setValidateDFDLSchemas-boolean-">setValidateDFDLSchemas</a></span>(boolean&nbsp;value)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Do not use this method. DFDL schema validation should be performed. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i13" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#withTunable-java.lang.String-java.lang.String-">withTunable</a></span>(java.lang.String&nbsp;tunable,
            java.lang.String&nbsp;value)</code>
 <div class="block">Create a new Compiler instance having a specific Daffodil tunable parameter value.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Compiler.html#withTunables-java.util.AbstractMap-">withTunables</a></span>(java.util.AbstractMap&lt;java.lang.String,java.lang.String&gt;&nbsp;tunables)</code>
 <div class="block">Create a new Compiler instance having specific Daffodil tunable parameter values.</div>
@@ -282,13 +222,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="Compiler-org.apache.daffodil.compiler.Compiler-">
+<a name="Compiler-org.apache.daffodil.core.compiler.Compiler-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>Compiler</h4>
-<pre>public&nbsp;Compiler(org.apache.daffodil.compiler.Compiler&nbsp;sCompiler)</pre>
+<pre>public&nbsp;Compiler(org.apache.daffodil.core.compiler.Compiler&nbsp;sCompiler)</pre>
 </li>
 </ul>
 </li>
@@ -441,142 +381,6 @@ extends java.lang.Object</pre>
 </dl>
 </li>
 </ul>
-<a name="setDistinguishedRootNode-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setDistinguishedRootNode</h4>
-<pre>public&nbsp;void&nbsp;setDistinguishedRootNode(java.lang.String&nbsp;name,
-                                     java.lang.String&nbsp;namespace)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Pass arguments to compileSource, or compileFile. Since 2.6.0.</span></div>
-<div class="block">Specify a global element to be the root of DFDL Schema to start parsing
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - name of the root node</dd>
-<dd><code>namespace</code> - namespace of the root node. Set to empty string to specify
-                  no namespace. Set to to NULL to figure out the namespace.</dd>
-</dl>
-</li>
-</ul>
-<a name="setExternalDFDLVariable-java.lang.String-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setExternalDFDLVariable</h4>
-<pre>public&nbsp;void&nbsp;setExternalDFDLVariable(java.lang.String&nbsp;name,
-                                    java.lang.String&nbsp;namespace,
-                                    java.lang.String&nbsp;value)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use DataProcessor.withExternalVariable. Since 2.6.0.</span></div>
-<div class="block">Set the value of a DFDL variable
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - name of the variable</dd>
-<dd><code>namespace</code> - namespace of the variable. Set to empty string to specify
-                  no namespace. Set to to NULL to figure out the namespace.</dd>
-<dd><code>value</code> - value to so the variable to</dd>
-</dl>
-</li>
-</ul>
-<a name="setExternalDFDLVariables-java.util.AbstractMap-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setExternalDFDLVariables</h4>
-<pre>public&nbsp;void&nbsp;setExternalDFDLVariables(java.util.AbstractMap&lt;java.lang.String,java.lang.String&gt;&nbsp;extVarsMap)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use DataProcessor.withExternalVariables. Since 2.6.0.</span></div>
-<div class="block">Set the value of multiple DFDL variables
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>extVarsMap</code> - a may of key/value pairs, where the key is the variable
-                   name, and the value is the value of the variable. The key
-                   may be preceded by a string of the form "{namespace}" to
-                   define a namespace for the variable. If preceded with "{}",
-                   then no namespace is used. With not preceded by "{namespace}",
-                   then Daffodil will figure out the namespace.</dd>
-</dl>
-</li>
-</ul>
-<a name="setExternalDFDLVariables-java.io.File-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setExternalDFDLVariables</h4>
-<pre>public&nbsp;void&nbsp;setExternalDFDLVariables(java.io.File&nbsp;extVarsFile)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use DataProcessor.withExternalVariables. Since 2.6.0.</span></div>
-<div class="block">Read external variables from a Daffodil configuration file
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>extVarsFile</code> - file to read DFDL variables from.</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a target="_blank" href='https://daffodil.apache.org/configuration/'>Daffodil Configuration File</a> - Daffodil configuration file format
- <p></dd>
-</dl>
-</li>
-</ul>
-<a name="setTunable-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setTunable</h4>
-<pre>public&nbsp;void&nbsp;setTunable(java.lang.String&nbsp;tunable,
-                       java.lang.String&nbsp;value)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use withTunable. Since 2.6.0.</span></div>
-<div class="block">Set a Daffodil tunable parameter
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>tunable</code> - name of the tunable parameter to set.</dd>
-<dd><code>value</code> - value of the tunable parameter to set</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a target="_blank" href='https://daffodil.apache.org/configuration/#tunable-parameters'>Tunable Parameters</a> - list of tunables names of default values
- <p></dd>
-</dl>
-</li>
-</ul>
-<a name="setTunables-java.util.AbstractMap-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setTunables</h4>
-<pre>public&nbsp;void&nbsp;setTunables(java.util.AbstractMap&lt;java.lang.String,java.lang.String&gt;&nbsp;tunables)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use withTunables. Since 2.6.0.</span></div>
-<div class="block">Set the value of multiple tunable parameters
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>tunables</code> - a map of key/value pairs, where the key is the tunable name and the value is the value to set it to</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a target="_blank" href='https://daffodil.apache.org/configuration/#tunable-parameters'>Tunable Parameters</a> - list of tunables names of default values
- <p></dd>
-</dl>
-</li>
-</ul>
-<a name="setValidateDFDLSchemas-boolean-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setValidateDFDLSchemas</h4>
-<pre>public&nbsp;void&nbsp;setValidateDFDLSchemas(boolean&nbsp;value)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Do not use this method. DFDL schema validation should be performed. Since 2.6.0.</span></div>
-<div class="block">Enable/disable DFDL validation of resulting infoset with the DFDL schema
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>value</code> - true to enable validation, false to disabled</dd>
-</dl>
-</li>
-</ul>
 <a name="withTunable-java.lang.String-java.lang.String-">
 <!--   -->
 </a>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/Daffodil.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/Daffodil.html
index 2f55b1d..0c90bdd 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/Daffodil.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/Daffodil.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Daffodil (Apache Daffodil 3.4.0 Java API)</title>
+<title>Daffodil (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Daffodil (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="Daffodil (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":41,"i2":41};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
+var methods = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -140,7 +140,7 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tab [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -151,22 +151,6 @@ extends java.lang.Object</pre>
 <div class="block">Create a new object used to compiled DFDL schemas</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Daffodil.html#setLoggingLevel-org.apache.daffodil.japi.logger.LogLevel-">setLoggingLevel</a></span>(<a href="../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;lvl)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Daffodil.html#setLogWriter-org.apache.daffodil.japi.logger.LogWriter-">setLogWriter</a></span>(<a href="../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a>&nbsp;lw)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-</td>
-</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -209,7 +193,7 @@ extends java.lang.Object</pre>
 <a name="compiler--">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
 <h4>compiler</h4>
 <pre>public static&nbsp;<a href="../../../../org/apache/daffodil/japi/Compiler.html" title="class in org.apache.daffodil.japi">Compiler</a>&nbsp;compiler()</pre>
@@ -221,38 +205,6 @@ extends java.lang.Object</pre>
 </dl>
 </li>
 </ul>
-<a name="setLogWriter-org.apache.daffodil.japi.logger.LogWriter-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setLogWriter</h4>
-<pre>public static&nbsp;void&nbsp;setLogWriter(<a href="../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a>&nbsp;lw)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-<div class="block">Set the LogWriter to use to capture logging messages from Daffodil
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>lw</code> - log writer to capture logging messages</dd>
-</dl>
-</li>
-</ul>
-<a name="setLoggingLevel-org.apache.daffodil.japi.logger.LogLevel-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setLoggingLevel</h4>
-<pre>public static&nbsp;void&nbsp;setLoggingLevel(<a href="../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;lvl)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-<div class="block">Set the maximum logging level
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>lvl</code> - log level</dd>
-</dl>
-</li>
-</ul>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilParseXMLReader.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilParseXMLReader.html
index d57bde6..83459d4 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilParseXMLReader.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilParseXMLReader.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>DaffodilParseXMLReader (Apache Daffodil 3.4.0 Java API)</title>
+<title>DaffodilParseXMLReader (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DaffodilParseXMLReader (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="DaffodilParseXMLReader (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -134,7 +134,7 @@ implements org.xml.sax.XMLReader</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DaffodilParseXMLReader.html#DaffodilParseXMLReader-org.apache.daffodil.processors.DaffodilParseXMLReader-">DaffodilParseXMLReader</a></span>(org.apache.daffodil.processors.DaffodilParseXMLReader&nbsp;xmlrdr)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DaffodilParseXMLReader.html#DaffodilParseXMLReader-org.apache.daffodil.runtime1.processors.DaffodilParseXMLReader-">DaffodilParseXMLReader</a></span>(org.apache.daffodil.runtime1.processors.DaffodilParseXMLReader&nbsp;xmlrdr)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -301,13 +301,13 @@ implements org.xml.sax.XMLReader</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DaffodilParseXMLReader-org.apache.daffodil.processors.DaffodilParseXMLReader-">
+<a name="DaffodilParseXMLReader-org.apache.daffodil.runtime1.processors.DaffodilParseXMLReader-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DaffodilParseXMLReader</h4>
-<pre>public&nbsp;DaffodilParseXMLReader(org.apache.daffodil.processors.DaffodilParseXMLReader&nbsp;xmlrdr)</pre>
+<pre>public&nbsp;DaffodilParseXMLReader(org.apache.daffodil.runtime1.processors.DaffodilParseXMLReader&nbsp;xmlrdr)</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnhandledSAXException.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnhandledSAXException.html
index d0c6155..c7fc369 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnhandledSAXException.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnhandledSAXException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>DaffodilUnhandledSAXException (Apache Daffodil 3.4.0 Java API)</title>
+<title>DaffodilUnhandledSAXException (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DaffodilUnhandledSAXException (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="DaffodilUnhandledSAXException (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -122,7 +122,10 @@
 <br>
 <pre>public class <span class="typeNameLabel">DaffodilUnhandledSAXException</span>
 extends org.xml.sax.SAXException</pre>
-<div class="block">This exception will be thrown when an unexpected error occurs during the SAX unparse</div>
+<div class="block">This exception is thrown when and unexpected error occurs while unparsing an
+ infoset with an XMLReader and a DaffodilUnparseContentHandler. If caught,
+ the DaffodilUnparseContentHandler.getUnparseResult returns null. This most
+ likely represents a bug in Daffodil.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../serialized-form.html#org.apache.daffodil.japi.DaffodilUnhandledSAXException">Serialized Form</a></dd>
@@ -145,7 +148,7 @@ extends org.xml.sax.SAXException</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DaffodilUnhandledSAXException.html#DaffodilUnhandledSAXException-org.apache.daffodil.api.DFDL.DaffodilUnhandledSAXException-">DaffodilUnhandledSAXException</a></span>(org.apache.daffodil.api.DFDL.DaffodilUnhandledSAXException&nbsp;exception)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DaffodilUnhandledSAXException.html#DaffodilUnhandledSAXException-org.apache.daffodil.runtime1.api.DFDL.DaffodilUnhandledSAXException-">DaffodilUnhandledSAXException</a></span>(org.apache.daffodil.runtime1.api.DFDL.DaffodilUnhandledSAXException&nbsp;exception)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -191,13 +194,13 @@ extends org.xml.sax.SAXException</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DaffodilUnhandledSAXException-org.apache.daffodil.api.DFDL.DaffodilUnhandledSAXException-">
+<a name="DaffodilUnhandledSAXException-org.apache.daffodil.runtime1.api.DFDL.DaffodilUnhandledSAXException-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DaffodilUnhandledSAXException</h4>
-<pre>public&nbsp;DaffodilUnhandledSAXException(org.apache.daffodil.api.DFDL.DaffodilUnhandledSAXException&nbsp;exception)</pre>
+<pre>public&nbsp;DaffodilUnhandledSAXException(org.apache.daffodil.runtime1.api.DFDL.DaffodilUnhandledSAXException&nbsp;exception)</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnparseContentHandler.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnparseContentHandler.html
index cc4d1ef..bd988e0 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnparseContentHandler.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnparseContentHandler.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>DaffodilUnparseContentHandler (Apache Daffodil 3.4.0 Java API)</title>
+<title>DaffodilUnparseContentHandler (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DaffodilUnparseContentHandler (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="DaffodilUnparseContentHandler (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -133,7 +133,7 @@ implements org.xml.sax.ContentHandler</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#DaffodilUnparseContentHandler-org.apache.daffodil.processors.DaffodilUnparseContentHandler-">DaffodilUnparseContentHandler</a></span>(org.apache.daffodil.processors.DaffodilUnparseContentHandler&nbsp;sContentHandler)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DaffodilUnparseContentHandler.html#DaffodilUnparseContentHandler-org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseContentHandler-">DaffodilUnparseContentHandler</a></span>(org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseContentHandler&nbsp;sContentHandler)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -233,13 +233,13 @@ implements org.xml.sax.ContentHandler</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DaffodilUnparseContentHandler-org.apache.daffodil.processors.DaffodilUnparseContentHandler-">
+<a name="DaffodilUnparseContentHandler-org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseContentHandler-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DaffodilUnparseContentHandler</h4>
-<pre>public&nbsp;DaffodilUnparseContentHandler(org.apache.daffodil.processors.DaffodilUnparseContentHandler&nbsp;sContentHandler)</pre>
+<pre>public&nbsp;DaffodilUnparseContentHandler(org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseContentHandler&nbsp;sContentHandler)</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html
index 4749730..f819d90 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>DaffodilUnparseErrorSAXException (Apache Daffodil 3.4.0 Java API)</title>
+<title>DaffodilUnparseErrorSAXException (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DaffodilUnparseErrorSAXException (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="DaffodilUnparseErrorSAXException (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -122,7 +122,10 @@
 <br>
 <pre>public class <span class="typeNameLabel">DaffodilUnparseErrorSAXException</span>
 extends org.xml.sax.SAXException</pre>
-<div class="block">This exception will be thrown when unparseResult.isError returns true during a SAX Unparse</div>
+<div class="block">This exception is thrown when UnparseResult.isError returns true while
+ unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler. If
+ caught, the DaffodilUnparseContentHandler.getUnparseResult function can be
+ used to get the UnparseResult and error diagnostics</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../../../../serialized-form.html#org.apache.daffodil.japi.DaffodilUnparseErrorSAXException">Serialized Form</a></dd>
@@ -145,7 +148,7 @@ extends org.xml.sax.SAXException</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html#DaffodilUnparseErrorSAXException-org.apache.daffodil.api.DFDL.DaffodilUnparseErrorSAXException-">DaffodilUnparseErrorSAXException</a></span>(org.apache.daffodil.api.DFDL.DaffodilUnparseErrorSAXException&nbsp;exception)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html#DaffodilUnparseErrorSAXException-org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseErrorSAXException-">DaffodilUnparseErrorSAXException</a></span>(org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseErrorSAXException&nbsp;exception)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -191,13 +194,13 @@ extends org.xml.sax.SAXException</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DaffodilUnparseErrorSAXException-org.apache.daffodil.api.DFDL.DaffodilUnparseErrorSAXException-">
+<a name="DaffodilUnparseErrorSAXException-org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseErrorSAXException-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DaffodilUnparseErrorSAXException</h4>
-<pre>public&nbsp;DaffodilUnparseErrorSAXException(org.apache.daffodil.api.DFDL.DaffodilUnparseErrorSAXException&nbsp;exception)</pre>
+<pre>public&nbsp;DaffodilUnparseErrorSAXException(org.apache.daffodil.runtime1.api.DFDL.DaffodilUnparseErrorSAXException&nbsp;exception)</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilXMLEntityResolver.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilXMLEntityResolver.html
index 55ce12c..544fa39 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilXMLEntityResolver.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/DaffodilXMLEntityResolver.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>DaffodilXMLEntityResolver (Apache Daffodil 3.4.0 Java API)</title>
+<title>DaffodilXMLEntityResolver (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DaffodilXMLEntityResolver (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="DaffodilXMLEntityResolver (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/DataLocation.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/DataLocation.html
index b1ef28c..14ad14a 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/DataLocation.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/DataLocation.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>DataLocation (Apache Daffodil 3.4.0 Java API)</title>
+<title>DataLocation (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DataLocation (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="DataLocation (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":42,"i3":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -128,7 +128,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataLocation.html#DataLocation-org.apache.daffodil.api.DataLocation-">DataLocation</a></span>(org.apache.daffodil.api.DataLocation&nbsp;dl)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataLocation.html#DataLocation-org.apache.daffodil.lib.api.DataLocation-">DataLocation</a></span>(org.apache.daffodil.lib.api.DataLocation&nbsp;dl)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -140,7 +140,7 @@ extends java.lang.Object</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -158,14 +158,6 @@ extends java.lang.Object</pre>
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataLocation.html#isAtEnd--">isAtEnd</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use comparison of bitPos1b() with expected position instead. Since 3.1.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataLocation.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
@@ -191,13 +183,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DataLocation-org.apache.daffodil.api.DataLocation-">
+<a name="DataLocation-org.apache.daffodil.lib.api.DataLocation-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DataLocation</h4>
-<pre>public&nbsp;DataLocation(org.apache.daffodil.api.DataLocation&nbsp;dl)</pre>
+<pre>public&nbsp;DataLocation(org.apache.daffodil.lib.api.DataLocation&nbsp;dl)</pre>
 </li>
 </ul>
 </li>
@@ -238,30 +230,6 @@ extends java.lang.Object</pre>
 </dl>
 </li>
 </ul>
-<a name="isAtEnd--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isAtEnd</h4>
-<pre>public&nbsp;boolean&nbsp;isAtEnd()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use comparison of bitPos1b() with expected position instead. Since 3.1.0.</span></div>
-<div class="block">Determine if we're positioned at the end of data.
- <p>
- Blocks until either one byte of data can be read, or end-of-data
- is encountered.
- <p>
- It is generally not advised to use this on network TCP data streams
- as it will block waiting for the sender of data to provide more data
- or close the stream.
- <p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>boolean indicating whether we are known to be positioned at
-         the end of data.</dd>
-</dl>
-</li>
-</ul>
 <a name="toString--">
 <!--   -->
 </a>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/DataProcessor.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/DataProcessor.html
index 231ef44..c5edd8d 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/DataProcessor.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/DataProcessor.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>DataProcessor (Apache Daffodil 3.4.0 Java API)</title>
+<title>DataProcessor (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DataProcessor (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="DataProcessor (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":42,"i4":42,"i5":42,"i6":42,"i7":10,"i8":42,"i9":42,"i10":42,"i11":42,"i12":42,"i13":10,"i14":42,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":42,"i21":10,"i22":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -142,7 +142,7 @@ implements scala.Serializable</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#DataProcessor-org.apache.daffodil.processors.DataProcessor-">DataProcessor</a></span>(org.apache.daffodil.processors.DataProcessor&nbsp;dp)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#DataProcessor-org.apache.daffodil.runtime1.processors.DataProcessor-">DataProcessor</a></span>(org.apache.daffodil.runtime1.processors.DataProcessor&nbsp;dp)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -154,7 +154,7 @@ implements scala.Serializable</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -179,150 +179,57 @@ implements scala.Serializable</pre>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-">parse</a></span>(java.nio.channels.ReadableByteChannel&nbsp;input)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-">parse</a></span>(java.nio.channels.ReadableByteChannel&nbsp;input,
-     <a href="../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a>&nbsp;output)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-long-">parse</a></span>(java.nio.channels.ReadableByteChannel&nbsp;input,
-     <a href="../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a>&nbsp;output,
-     long&nbsp;lengthLimitInBits)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-long-">parse</a></span>(java.nio.channels.ReadableByteChannel&nbsp;input,
-     long&nbsp;lengthLimitInBits)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#save-java.nio.channels.WritableByteChannel-">save</a></span>(java.nio.channels.WritableByteChannel&nbsp;output)</code>
 <div class="block">Save the DataProcessor</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#setDebugger-org.apache.daffodil.japi.debugger.DebuggerRunner-">setDebugger</a></span>(<a href="../../../../org/apache/daffodil/japi/debugger/DebuggerRunner.html" title="class in org.apache.daffodil.japi.debugger">DebuggerRunner</a>&nbsp;dr)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use withDebuggerRunner. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#setDebugging-boolean-">setDebugging</a></span>(boolean&nbsp;flag)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use withDebugging. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#setExternalVariables-java.io.File-">setExternalVariables</a></span>(java.io.File&nbsp;extVars)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use withExternalVariables. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#setExternalVariables-scala.collection.immutable.Map-">setExternalVariables</a></span>(scala.collection.immutable.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;extVars)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use withExternalVariables. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#setValidationMode-org.apache.daffodil.japi.ValidationMode-">setValidationMode</a></span>(<a href="../../../../org/apache/daffodil/japi/ValidationMode.html" title="enum in org.apache.daffodil.japi">ValidationMode</a>&nbsp;mode)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use withValidationMode. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i13" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/UnparseResult.html" title="class in org.apache.daffodil.japi">UnparseResult</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#unparse-org.apache.daffodil.japi.infoset.InfosetInputter-java.nio.channels.WritableByteChannel-">unparse</a></span>(<a href="../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputter</a>&nbsp;input,
        java.nio.channels.WritableByteChannel&nbsp;output)</code>
 <div class="block">Unparse an InfosetInputter</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/UnparseResult.html" title="class in org.apache.daffodil.japi">UnparseResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#unparse-java.nio.channels.WritableByteChannel-org.jdom2.Document-">unparse</a></span>(java.nio.channels.WritableByteChannel&nbsp;output,
-       org.jdom2.Document&nbsp;infoset)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use unparse(InfosetInputter, WritableByteChannel). Since 2.0.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i15" class="rowColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebugger-org.apache.daffodil.debugger.Debugger-">withDebugger</a></span>(org.apache.daffodil.debugger.Debugger&nbsp;dbg)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebugger-org.apache.daffodil.runtime1.debugger.Debugger-">withDebugger</a></span>(org.apache.daffodil.runtime1.debugger.Debugger&nbsp;dbg)</code>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with a specified debugger.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebuggerRunner-org.apache.daffodil.japi.debugger.DebuggerRunner-">withDebuggerRunner</a></span>(<a href="../../../../org/apache/daffodil/japi/debugger/DebuggerRunner.html" title="class in org.apache.daffodil.japi.debugger">DebuggerRunner</a>&nbsp;dr)</code>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with a specified debugger runner.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebugging-boolean-">withDebugging</a></span>(boolean&nbsp;flag)</code>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> instance with debugging enabled or disabled.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withExternalVariables-java.util.AbstractMap-">withExternalVariables</a></span>(java.util.AbstractMap&lt;java.lang.String,java.lang.String&gt;&nbsp;extVars)</code>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with multiple DFDL variables set.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withExternalVariables-java.io.File-">withExternalVariables</a></span>(java.io.File&nbsp;extVars)</code>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with external variables read from a Daffodil configuration file</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withExternalVariables-scala.collection.immutable.Map-">withExternalVariables</a></span>(scala.collection.immutable.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;extVars)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use withExternalVariables that accepts a Java AbstractMap. Since 3.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i21" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withValidationMode-org.apache.daffodil.japi.ValidationMode-">withValidationMode</a></span>(<a href="../../../../org/apache/daffodil/japi/ValidationMode.html" title="enum in org.apache.daffodil.japi">ValidationMode</a>&nbsp;mode)</code>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> having a specific validation mode</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withValidator-org.apache.daffodil.api.Validator-">withValidator</a></span>(org.apache.daffodil.api.Validator&nbsp;validator)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withValidator-org.apache.daffodil.lib.api.Validator-">withValidator</a></span>(org.apache.daffodil.lib.api.Validator&nbsp;validator)</code>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> having a specific validator</div>
 </td>
 </tr>
@@ -332,7 +239,7 @@ implements scala.Serializable</pre>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.<a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi">WithDiagnostics</a></h3>
-<code><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#canProceed--">canProceed</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#getDiagnostics--">getDiagnostics</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#isError--">isError</a></code></li>
+<code><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#getDiagnostics--">getDiagnostics</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#isError--">isError</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -355,13 +262,13 @@ implements scala.Serializable</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DataProcessor-org.apache.daffodil.processors.DataProcessor-">
+<a name="DataProcessor-org.apache.daffodil.runtime1.processors.DataProcessor-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DataProcessor</h4>
-<pre>public&nbsp;DataProcessor(org.apache.daffodil.processors.DataProcessor&nbsp;dp)</pre>
+<pre>public&nbsp;DataProcessor(org.apache.daffodil.runtime1.processors.DataProcessor&nbsp;dp)</pre>
 </li>
 </ul>
 </li>
@@ -402,88 +309,6 @@ implements scala.Serializable</pre>
 </dl>
 </li>
 </ul>
-<a name="parse-java.nio.channels.ReadableByteChannel-long-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>parse</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a>&nbsp;parse(java.nio.channels.ReadableByteChannel&nbsp;input,
-                         long&nbsp;lengthLimitInBits)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-<div class="block">Parse input data with a specified length
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>input</code> - data to be parsed</dd>
-<dd><code>lengthLimitInBits</code> - the length of the input data in bits, or -1 if no limit</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object which contains the result, and/or diagnostic information.</dd>
-</dl>
-</li>
-</ul>
-<a name="parse-java.nio.channels.ReadableByteChannel-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>parse</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a>&nbsp;parse(java.nio.channels.ReadableByteChannel&nbsp;input)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-<div class="block">Parse input data without specifying a length
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>input</code> - data to be parsed</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object which contains the result, and/or diagnostic information.</dd>
-</dl>
-</li>
-</ul>
-<a name="parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-long-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>parse</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a>&nbsp;parse(java.nio.channels.ReadableByteChannel&nbsp;input,
-                         <a href="../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a>&nbsp;output,
-                         long&nbsp;lengthLimitInBits)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-<div class="block">Parse input data with a specified length
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>input</code> - data to be parsed</dd>
-<dd><code>output</code> - the InfosetOutputter that will be used to output the infoset</dd>
-<dd><code>lengthLimitInBits</code> - the length of the input data in bits, or -1 if no limit</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object which contains the result, and/or diagnostic information.</dd>
-</dl>
-</li>
-</ul>
-<a name="parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>parse</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a>&nbsp;parse(java.nio.channels.ReadableByteChannel&nbsp;input,
-                         <a href="../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a>&nbsp;output)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use parse(InputSourceDataInputStream, InfosetOutputter) to parse the data and get the infoset representation from the InfosetOutputter instead of ParseResult#result(). Since 2.2.0.</span></div>
-<div class="block">Parse input data without specifying a length
- <p>
- Use this when you don't know how big the data is.
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>input</code> - data to be parsed</dd>
-<dd><code>output</code> - the InfosetOutputter that will be used to output the infoset</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object which contains the result, and/or diagnostic information.</dd>
-</dl>
-</li>
-</ul>
 <a name="parse-org.apache.daffodil.japi.io.InputSourceDataInputStream-org.apache.daffodil.japi.infoset.InfosetOutputter-">
 <!--   -->
 </a>
@@ -521,106 +346,6 @@ implements scala.Serializable</pre>
 </dl>
 </li>
 </ul>
-<a name="setDebugger-org.apache.daffodil.japi.debugger.DebuggerRunner-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setDebugger</h4>
-<pre>public&nbsp;void&nbsp;setDebugger(<a href="../../../../org/apache/daffodil/japi/debugger/DebuggerRunner.html" title="class in org.apache.daffodil.japi.debugger">DebuggerRunner</a>&nbsp;dr)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use withDebuggerRunner. Since 2.6.0.</span></div>
-<div class="block">Set the debugger runner
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>dr</code> - debugger runner</dd>
-</dl>
-</li>
-</ul>
-<a name="setDebugging-boolean-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setDebugging</h4>
-<pre>public&nbsp;void&nbsp;setDebugging(boolean&nbsp;flag)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use withDebugging. Since 2.6.0.</span></div>
-<div class="block">Enable/disable debugging.
- <p>
- Before enabling, <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebugger-org.apache.daffodil.debugger.Debugger-"><code>withDebugger(org.apache.daffodil.debugger.Debugger)</code></a> or <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebuggerRunner-org.apache.daffodil.japi.debugger.DebuggerRunner-"><code>withDebuggerRunner(DebuggerRunner)</code></a> must be
- called with a non-null debugger.
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>flag</code> - true to enable debugging, false to disabled</dd>
-</dl>
-</li>
-</ul>
-<a name="setExternalVariables-java.io.File-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setExternalVariables</h4>
-<pre>public&nbsp;void&nbsp;setExternalVariables(java.io.File&nbsp;extVars)
-                          throws <a href="../../../../org/apache/daffodil/japi/ExternalVariableException.html" title="class in org.apache.daffodil.japi">ExternalVariableException</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use withExternalVariables. Since 2.6.0.</span></div>
-<div class="block">Read external variables from a Daffodil configuration file
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>extVars</code> - file to read DFDL variables from.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/daffodil/japi/ExternalVariableException.html" title="class in org.apache.daffodil.japi">ExternalVariableException</a></code> - if an error occurs while setting an external variable</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a target="_blank" href='https://daffodil.apache.org/configuration/'>Daffodil Configuration File</a> - Daffodil configuration file format
- <p></dd>
-</dl>
-</li>
-</ul>
-<a name="setExternalVariables-scala.collection.immutable.Map-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setExternalVariables</h4>
-<pre>public&nbsp;void&nbsp;setExternalVariables(scala.collection.immutable.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;extVars)
-                          throws <a href="../../../../org/apache/daffodil/japi/ExternalVariableException.html" title="class in org.apache.daffodil.japi">ExternalVariableException</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use withExternalVariables. Since 2.6.0.</span></div>
-<div class="block">Set the value of multiple DFDL variables
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>extVars</code> - a map of key/value pairs, where the key is the variable
-                name, and the value is the value of the variable. The key
-                may be preceded by a string of the form "{namespace}" to
-                define a namespace for the variable. If preceded with "{}",
-                then no namespace is used. If not preceded by anything,
-                then Daffodil will figure out the namespace.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/daffodil/japi/ExternalVariableException.html" title="class in org.apache.daffodil.japi">ExternalVariableException</a></code> - if an error occurs while setting an external variable</dd>
-</dl>
-</li>
-</ul>
-<a name="setValidationMode-org.apache.daffodil.japi.ValidationMode-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setValidationMode</h4>
-<pre>public&nbsp;void&nbsp;setValidationMode(<a href="../../../../org/apache/daffodil/japi/ValidationMode.html" title="enum in org.apache.daffodil.japi">ValidationMode</a>&nbsp;mode)
-                       throws <a href="../../../../org/apache/daffodil/japi/InvalidUsageException.html" title="class in org.apache.daffodil.japi">InvalidUsageException</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use withValidationMode. Since 2.6.0.</span></div>
-<div class="block">Set validation mode
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>mode</code> - mode to control validation</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/daffodil/japi/InvalidUsageException.html" title="class in org.apache.daffodil.japi">InvalidUsageException</a></code> - if mode is not a valid ValidateMode value</dd>
-</dl>
-</li>
-</ul>
 <a name="unparse-org.apache.daffodil.japi.infoset.InfosetInputter-java.nio.channels.WritableByteChannel-">
 <!--   -->
 </a>
@@ -640,33 +365,13 @@ implements scala.Serializable</pre>
 </dl>
 </li>
 </ul>
-<a name="unparse-java.nio.channels.WritableByteChannel-org.jdom2.Document-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>unparse</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/UnparseResult.html" title="class in org.apache.daffodil.japi">UnparseResult</a>&nbsp;unparse(java.nio.channels.WritableByteChannel&nbsp;output,
-                             org.jdom2.Document&nbsp;infoset)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use unparse(InfosetInputter, WritableByteChannel). Since 2.0.0.</span></div>
-<div class="block">Unparse a JDOM2 infoset
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>output</code> - the byte channel to write the data to</dd>
-<dd><code>infoset</code> - the infoset to unparse, as a jdom event cursor</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>an object with contains the result and/or diagnostic information</dd>
-</dl>
-</li>
-</ul>
-<a name="withDebugger-org.apache.daffodil.debugger.Debugger-">
+<a name="withDebugger-org.apache.daffodil.runtime1.debugger.Debugger-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>withDebugger</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a>&nbsp;withDebugger(org.apache.daffodil.debugger.Debugger&nbsp;dbg)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a>&nbsp;withDebugger(org.apache.daffodil.runtime1.debugger.Debugger&nbsp;dbg)</pre>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with a specified debugger.
  <p></div>
 <dl>
@@ -703,7 +408,7 @@ implements scala.Serializable</pre>
 <pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a>&nbsp;withDebugging(boolean&nbsp;flag)</pre>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> instance with debugging enabled or disabled.
  <p>
- Before enabling, <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebugger-org.apache.daffodil.debugger.Debugger-"><code>withDebugger(Debugger)</code></a> or <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebuggerRunner-org.apache.daffodil.japi.debugger.DebuggerRunner-"><code>withDebuggerRunner(DebuggerRunner)</code></a>
+ Before enabling, <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebugger-org.apache.daffodil.runtime1.debugger.Debugger-"><code>withDebugger(Debugger)</code></a> or <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#withDebuggerRunner-org.apache.daffodil.japi.debugger.DebuggerRunner-"><code>withDebuggerRunner(DebuggerRunner)</code></a>
  must be called to obtain a <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with a non-null debugger.
  <p></div>
 <dl>
@@ -737,32 +442,6 @@ implements scala.Serializable</pre>
 </dl>
 </li>
 </ul>
-<a name="withExternalVariables-scala.collection.immutable.Map-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>withExternalVariables</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a>&nbsp;withExternalVariables(scala.collection.immutable.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;extVars)
-                                    throws <a href="../../../../org/apache/daffodil/japi/ExternalVariableException.html" title="class in org.apache.daffodil.japi">ExternalVariableException</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use withExternalVariables that accepts a Java AbstractMap. Since 3.0.</span></div>
-<div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> with multiple DFDL variables set.
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>extVars</code> - a map of key/value pairs, where the key is the variable
-                name, and the value is the value of the variable. The key
-                may be preceded by a string of the form "{namespace}" to
-                define a namespace for the variable. If preceded with "{}",
-                then no namespace is used. If not preceded by anything,
-                then Daffodil will figure out the namespace.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>(undocumented)</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/daffodil/japi/ExternalVariableException.html" title="class in org.apache.daffodil.japi">ExternalVariableException</a></code> - if an error occurs while setting an external variable</dd>
-</dl>
-</li>
-</ul>
 <a name="withExternalVariables-java.util.AbstractMap-">
 <!--   -->
 </a>
@@ -808,13 +487,13 @@ implements scala.Serializable</pre>
 </dl>
 </li>
 </ul>
-<a name="withValidator-org.apache.daffodil.api.Validator-">
+<a name="withValidator-org.apache.daffodil.lib.api.Validator-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>withValidator</h4>
-<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a>&nbsp;withValidator(org.apache.daffodil.api.Validator&nbsp;validator)</pre>
+<pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi">DataProcessor</a>&nbsp;withValidator(org.apache.daffodil.lib.api.Validator&nbsp;validator)</pre>
 <div class="block">Obtain a new <a href="../../../../org/apache/daffodil/japi/DataProcessor.html" title="class in org.apache.daffodil.japi"><code>DataProcessor</code></a> having a specific validator</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/Diagnostic.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/Diagnostic.html
index 8599dd6..25c0cf1 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/Diagnostic.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/Diagnostic.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Diagnostic (Apache Daffodil 3.4.0 Java API)</title>
+<title>Diagnostic (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Diagnostic (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="Diagnostic (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -128,7 +128,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Diagnostic.html#Diagnostic-org.apache.daffodil.api.Diagnostic-">Diagnostic</a></span>(org.apache.daffodil.api.Diagnostic&nbsp;d)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/Diagnostic.html#Diagnostic-org.apache.daffodil.lib.api.Diagnostic-">Diagnostic</a></span>(org.apache.daffodil.lib.api.Diagnostic&nbsp;d)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -207,13 +207,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="Diagnostic-org.apache.daffodil.api.Diagnostic-">
+<a name="Diagnostic-org.apache.daffodil.lib.api.Diagnostic-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>Diagnostic</h4>
-<pre>public&nbsp;Diagnostic(org.apache.daffodil.api.Diagnostic&nbsp;d)</pre>
+<pre>public&nbsp;Diagnostic(org.apache.daffodil.lib.api.Diagnostic&nbsp;d)</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/ExternalVariableException.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/ExternalVariableException.html
index 8954591..47dd447 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/ExternalVariableException.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/ExternalVariableException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ExternalVariableException (Apache Daffodil 3.4.0 Java API)</title>
+<title>ExternalVariableException (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ExternalVariableException (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="ExternalVariableException (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/InvalidParserException.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/InvalidParserException.html
index 01d2e84..aa3d504 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/InvalidParserException.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/InvalidParserException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>InvalidParserException (Apache Daffodil 3.4.0 Java API)</title>
+<title>InvalidParserException (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InvalidParserException (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="InvalidParserException (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -142,7 +142,7 @@ extends java.lang.Exception</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/InvalidParserException.html#InvalidParserException-org.apache.daffodil.compiler.InvalidParserException-">InvalidParserException</a></span>(org.apache.daffodil.compiler.InvalidParserException&nbsp;cause)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/InvalidParserException.html#InvalidParserException-org.apache.daffodil.core.compiler.InvalidParserException-">InvalidParserException</a></span>(org.apache.daffodil.core.compiler.InvalidParserException&nbsp;cause)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -181,13 +181,13 @@ extends java.lang.Exception</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="InvalidParserException-org.apache.daffodil.compiler.InvalidParserException-">
+<a name="InvalidParserException-org.apache.daffodil.core.compiler.InvalidParserException-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>InvalidParserException</h4>
-<pre>public&nbsp;InvalidParserException(org.apache.daffodil.compiler.InvalidParserException&nbsp;cause)</pre>
+<pre>public&nbsp;InvalidParserException(org.apache.daffodil.core.compiler.InvalidParserException&nbsp;cause)</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/InvalidUsageException.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/InvalidUsageException.html
index d594dca..cb859c3 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/InvalidUsageException.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/InvalidUsageException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>InvalidUsageException (Apache Daffodil 3.4.0 Java API)</title>
+<title>InvalidUsageException (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InvalidUsageException (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="InvalidUsageException (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -140,7 +140,7 @@ extends java.lang.Exception</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/InvalidUsageException.html#InvalidUsageException-org.apache.daffodil.processors.InvalidUsageException-">InvalidUsageException</a></span>(org.apache.daffodil.processors.InvalidUsageException&nbsp;cause)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/InvalidUsageException.html#InvalidUsageException-org.apache.daffodil.runtime1.processors.InvalidUsageException-">InvalidUsageException</a></span>(org.apache.daffodil.runtime1.processors.InvalidUsageException&nbsp;cause)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -179,13 +179,13 @@ extends java.lang.Exception</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="InvalidUsageException-org.apache.daffodil.processors.InvalidUsageException-">
+<a name="InvalidUsageException-org.apache.daffodil.runtime1.processors.InvalidUsageException-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>InvalidUsageException</h4>
-<pre>public&nbsp;InvalidUsageException(org.apache.daffodil.processors.InvalidUsageException&nbsp;cause)</pre>
+<pre>public&nbsp;InvalidUsageException(org.apache.daffodil.runtime1.processors.InvalidUsageException&nbsp;cause)</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/LocationInSchemaFile.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/LocationInSchemaFile.html
index 2934184..4417593 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/LocationInSchemaFile.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/LocationInSchemaFile.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>LocationInSchemaFile (Apache Daffodil 3.4.0 Java API)</title>
+<title>LocationInSchemaFile (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LocationInSchemaFile (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="LocationInSchemaFile (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -128,7 +128,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/LocationInSchemaFile.html#LocationInSchemaFile-org.apache.daffodil.api.LocationInSchemaFile-">LocationInSchemaFile</a></span>(org.apache.daffodil.api.LocationInSchemaFile&nbsp;lsf)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/LocationInSchemaFile.html#LocationInSchemaFile-org.apache.daffodil.lib.api.LocationInSchemaFile-">LocationInSchemaFile</a></span>(org.apache.daffodil.lib.api.LocationInSchemaFile&nbsp;lsf)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -173,13 +173,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="LocationInSchemaFile-org.apache.daffodil.api.LocationInSchemaFile-">
+<a name="LocationInSchemaFile-org.apache.daffodil.lib.api.LocationInSchemaFile-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>LocationInSchemaFile</h4>
-<pre>public&nbsp;LocationInSchemaFile(org.apache.daffodil.api.LocationInSchemaFile&nbsp;lsf)</pre>
+<pre>public&nbsp;LocationInSchemaFile(org.apache.daffodil.lib.api.LocationInSchemaFile&nbsp;lsf)</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/ParseResult.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/ParseResult.html
index 02301d0..6474666 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/ParseResult.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/ParseResult.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ParseResult (Apache Daffodil 3.4.0 Java API)</title>
+<title>ParseResult (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ParseResult (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="ParseResult (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":42};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public class <span class="typeNameLabel">ParseResult</span>
 extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi">WithDiagnostics</a></pre>
-<div class="block">Result of calling <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-long-"><code>DataProcessor.parse(java.nio.channels.ReadableByteChannel, InfosetOutputter, long)</code></a>, containing
+<div class="block">Result of calling <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#parse-org.apache.daffodil.japi.io.InputSourceDataInputStream-org.apache.daffodil.japi.infoset.InfosetOutputter-"><code>DataProcessor.parse(InputSourceDataInputStream, InfosetOutputter)</code></a>, containing
  the diagnostic information, and the final data location</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -142,8 +142,7 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ParseResult.html#ParseResult-org.apache.daffodil.processors.ParseResult-org.apache.daffodil.util.Maybe-">ParseResult</a></span>(org.apache.daffodil.processors.ParseResult&nbsp;pr,
-           org.apache.daffodil.util.Maybe&lt;<a href="../../../../org/apache/daffodil/japi/infoset/JDOMInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">JDOMInfosetOutputter</a>&gt;&nbsp;deprecatedOutput)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ParseResult.html#ParseResult-org.apache.daffodil.runtime1.processors.ParseResult-">ParseResult</a></span>(org.apache.daffodil.runtime1.processors.ParseResult&nbsp;pr)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -155,7 +154,7 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -179,21 +178,13 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <div class="block">Get the <a href="../../../../org/apache/daffodil/japi/DataLocation.html" title="class in org.apache.daffodil.japi"><code>DataLocation</code></a> where the parse completed</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>org.jdom2.Document</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ParseResult.html#result--">result</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use parse(ReadableByteChannel, InfosetInputter) to parse the data and get the infoset representation from the InfosetOutputter. Since 2.0.0.</span></div>
-</div>
-</td>
-</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.japi.WithDiagnostics">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.<a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi">WithDiagnostics</a></h3>
-<code><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#canProceed--">canProceed</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#getDiagnostics--">getDiagnostics</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#isError--">isError</a></code></li>
+<code><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#getDiagnostics--">getDiagnostics</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#isError--">isError</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -216,14 +207,13 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ParseResult-org.apache.daffodil.processors.ParseResult-org.apache.daffodil.util.Maybe-">
+<a name="ParseResult-org.apache.daffodil.runtime1.processors.ParseResult-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ParseResult</h4>
-<pre>public&nbsp;ParseResult(org.apache.daffodil.processors.ParseResult&nbsp;pr,
-                   org.apache.daffodil.util.Maybe&lt;<a href="../../../../org/apache/daffodil/japi/infoset/JDOMInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">JDOMInfosetOutputter</a>&gt;&nbsp;deprecatedOutput)</pre>
+<pre>public&nbsp;ParseResult(org.apache.daffodil.runtime1.processors.ParseResult&nbsp;pr)</pre>
 </li>
 </ul>
 </li>
@@ -271,7 +261,7 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <a name="location--">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
 <h4>location</h4>
 <pre>public&nbsp;<a href="../../../../org/apache/daffodil/japi/DataLocation.html" title="class in org.apache.daffodil.japi">DataLocation</a>&nbsp;location()</pre>
@@ -283,27 +273,6 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 </dl>
 </li>
 </ul>
-<a name="result--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>result</h4>
-<pre>public&nbsp;org.jdom2.Document&nbsp;result()
-                          throws <a href="../../../../org/apache/daffodil/japi/InvalidUsageException.html" title="class in org.apache.daffodil.japi">InvalidUsageException</a></pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use parse(ReadableByteChannel, InfosetInputter) to parse the data and get the infoset representation from the InfosetOutputter. Since 2.0.0.</span></div>
-<div class="block">Get the resulting infoset as a jdom2 Document
- <p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>a jdom2 Document representing the DFDL infoset for the parsed data</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/apache/daffodil/japi/InvalidUsageException.html" title="class in org.apache.daffodil.japi">InvalidUsageException</a></code> - if you call this when isError is true
-         because in that case there is no result document.
- <p></dd>
-</dl>
-</li>
-</ul>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html
index f04eebc..9eb28a6 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ProcessorFactory.ExperimentalWrapper (Apache Daffodil 3.4.0 Java API)</title>
+<title>ProcessorFactory.ExperimentalWrapper (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ProcessorFactory.ExperimentalWrapper (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="ProcessorFactory.ExperimentalWrapper (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -132,7 +132,7 @@ extends java.lang.Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html#ExperimentalWrapper-org.apache.daffodil.dsom.walker.RootView-">ExperimentalWrapper</a></span>(org.apache.daffodil.dsom.walker.RootView&nbsp;rootView)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html#ExperimentalWrapper-org.apache.daffodil.core.dsom.walker.RootView-">ExperimentalWrapper</a></span>(org.apache.daffodil.core.dsom.walker.RootView&nbsp;rootView)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -150,7 +150,7 @@ extends java.lang.Object</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.dsom.walker.RootView</code></td>
+<td class="colFirst"><code>org.apache.daffodil.core.dsom.walker.RootView</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html#rootView--">rootView</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
@@ -175,13 +175,13 @@ extends java.lang.Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ExperimentalWrapper-org.apache.daffodil.dsom.walker.RootView-">
+<a name="ExperimentalWrapper-org.apache.daffodil.core.dsom.walker.RootView-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ExperimentalWrapper</h4>
-<pre>public&nbsp;ExperimentalWrapper(org.apache.daffodil.dsom.walker.RootView&nbsp;rootView)</pre>
+<pre>public&nbsp;ExperimentalWrapper(org.apache.daffodil.core.dsom.walker.RootView&nbsp;rootView)</pre>
 </li>
 </ul>
 </li>
@@ -198,7 +198,7 @@ extends java.lang.Object</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>rootView</h4>
-<pre>public&nbsp;org.apache.daffodil.dsom.walker.RootView&nbsp;rootView()</pre>
+<pre>public&nbsp;org.apache.daffodil.core.dsom.walker.RootView&nbsp;rootView()</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/ProcessorFactory.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/ProcessorFactory.html
index aff91c1..72d9034 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/ProcessorFactory.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/ProcessorFactory.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ProcessorFactory (Apache Daffodil 3.4.0 Java API)</title>
+<title>ProcessorFactory (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ProcessorFactory (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="ProcessorFactory (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":42,"i3":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -165,7 +165,7 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ProcessorFactory.html#ProcessorFactory-org.apache.daffodil.compiler.ProcessorFactory-">ProcessorFactory</a></span>(org.apache.daffodil.compiler.ProcessorFactory&nbsp;pf)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ProcessorFactory.html#ProcessorFactory-org.apache.daffodil.core.compiler.ProcessorFactory-">ProcessorFactory</a></span>(org.apache.daffodil.core.compiler.ProcessorFactory&nbsp;pf)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -177,7 +177,7 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -193,15 +193,6 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ProcessorFactory.html#setDistinguishedRootNode-java.lang.String-java.lang.String-">setDistinguishedRootNode</a></span>(java.lang.String&nbsp;name,
-                        java.lang.String&nbsp;namespace)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use withDistinguishedRootNode. Since 2.6.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/apache/daffodil/japi/ProcessorFactory.html" title="class in org.apache.daffodil.japi">ProcessorFactory</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/ProcessorFactory.html#withDistinguishedRootNode-java.lang.String-java.lang.String-">withDistinguishedRootNode</a></span>(java.lang.String&nbsp;name,
                          java.lang.String&nbsp;namespace)</code>
@@ -214,7 +205,7 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.<a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi">WithDiagnostics</a></h3>
-<code><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#canProceed--">canProceed</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#getDiagnostics--">getDiagnostics</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#isError--">isError</a></code></li>
+<code><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#getDiagnostics--">getDiagnostics</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#isError--">isError</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -237,13 +228,13 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ProcessorFactory-org.apache.daffodil.compiler.ProcessorFactory-">
+<a name="ProcessorFactory-org.apache.daffodil.core.compiler.ProcessorFactory-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>ProcessorFactory</h4>
-<pre>public&nbsp;ProcessorFactory(org.apache.daffodil.compiler.ProcessorFactory&nbsp;pf)</pre>
+<pre>public&nbsp;ProcessorFactory(org.apache.daffodil.core.compiler.ProcessorFactory&nbsp;pf)</pre>
 </li>
 </ul>
 </li>
@@ -280,25 +271,6 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 </dl>
 </li>
 </ul>
-<a name="setDistinguishedRootNode-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setDistinguishedRootNode</h4>
-<pre>public&nbsp;void&nbsp;setDistinguishedRootNode(java.lang.String&nbsp;name,
-                                     java.lang.String&nbsp;namespace)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use withDistinguishedRootNode. Since 2.6.0.</span></div>
-<div class="block">Specify a global element to be the root of DFDL Schema to start parsing
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>name</code> - name of the root node</dd>
-<dd><code>namespace</code> - namespace of the root node. Set to empty string to specify
-                  no namespace. Set to to NULL to figure out the namespace.</dd>
-</dl>
-</li>
-</ul>
 <a name="withDistinguishedRootNode-java.lang.String-java.lang.String-">
 <!--   -->
 </a>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/UnparseResult.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/UnparseResult.html
index 74134d9..818cac4 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/UnparseResult.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/UnparseResult.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>UnparseResult (Apache Daffodil 3.4.0 Java API)</title>
+<title>UnparseResult (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UnparseResult (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="UnparseResult (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -136,7 +136,7 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/UnparseResult.html#UnparseResult-org.apache.daffodil.processors.UnparseResult-">UnparseResult</a></span>(org.apache.daffodil.processors.UnparseResult&nbsp;ur)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/UnparseResult.html#UnparseResult-org.apache.daffodil.runtime1.processors.UnparseResult-">UnparseResult</a></span>(org.apache.daffodil.runtime1.processors.UnparseResult&nbsp;ur)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -152,7 +152,7 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.<a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" title="class in org.apache.daffodil.japi">WithDiagnostics</a></h3>
-<code><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#canProceed--">canProceed</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#getDiagnostics--">getDiagnostics</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#isError--">isError</a></code></li>
+<code><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#getDiagnostics--">getDiagnostics</a>, <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#isError--">isError</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -175,13 +175,13 @@ extends <a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html" titl
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="UnparseResult-org.apache.daffodil.processors.UnparseResult-">
+<a name="UnparseResult-org.apache.daffodil.runtime1.processors.UnparseResult-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>UnparseResult</h4>
-<pre>public&nbsp;UnparseResult(org.apache.daffodil.processors.UnparseResult&nbsp;ur)</pre>
+<pre>public&nbsp;UnparseResult(org.apache.daffodil.runtime1.processors.UnparseResult&nbsp;ur)</pre>
 </li>
 </ul>
 </li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/ValidationMode.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/ValidationMode.html
index 99282c0..7acdae8 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/ValidationMode.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/ValidationMode.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ValidationMode (Apache Daffodil 3.4.0 Java API)</title>
+<title>ValidationMode (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ValidationMode (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="ValidationMode (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/WithDiagnostics.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/WithDiagnostics.html
index cf688df..8f6ac29 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/WithDiagnostics.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/WithDiagnostics.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>WithDiagnostics (Apache Daffodil 3.4.0 Java API)</title>
+<title>WithDiagnostics (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="WithDiagnostics (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="WithDiagnostics (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":42,"i1":10,"i2":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
+var methods = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -147,7 +147,7 @@ implements scala.Serializable</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#WithDiagnostics-org.apache.daffodil.api.WithDiagnostics-">WithDiagnostics</a></span>(org.apache.daffodil.api.WithDiagnostics&nbsp;wd)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#WithDiagnostics-org.apache.daffodil.lib.api.WithDiagnostics-">WithDiagnostics</a></span>(org.apache.daffodil.lib.api.WithDiagnostics&nbsp;wd)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -159,26 +159,18 @@ implements scala.Serializable</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#canProceed--">canProceed</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use !isError() to determine if it is safe to proceed. Since 2.0.0.</span></div>
-</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
 <td class="colFirst"><code>java.util.List&lt;<a href="../../../../org/apache/daffodil/japi/Diagnostic.html" title="class in org.apache.daffodil.japi">Diagnostic</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#getDiagnostics--">getDiagnostics</a></span>()</code>
 <div class="block">Get the list of <a href="../../../../org/apache/daffodil/japi/Diagnostic.html" title="class in org.apache.daffodil.japi"><code>Diagnostic</code></a>'s created during the construction of the parent object</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/apache/daffodil/japi/WithDiagnostics.html#isError--">isError</a></span>()</code>
 <div class="block">Determine if any errors occurred in the creation of the parent object.</div>
@@ -206,13 +198,13 @@ implements scala.Serializable</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="WithDiagnostics-org.apache.daffodil.api.WithDiagnostics-">
+<a name="WithDiagnostics-org.apache.daffodil.lib.api.WithDiagnostics-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>WithDiagnostics</h4>
-<pre>public&nbsp;WithDiagnostics(org.apache.daffodil.api.WithDiagnostics&nbsp;wd)</pre>
+<pre>public&nbsp;WithDiagnostics(org.apache.daffodil.lib.api.WithDiagnostics&nbsp;wd)</pre>
 </li>
 </ul>
 </li>
@@ -223,22 +215,6 @@ implements scala.Serializable</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="canProceed--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>canProceed</h4>
-<pre>public&nbsp;boolean&nbsp;canProceed()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">Use !isError() to determine if it is safe to proceed. Since 2.0.0.</span></div>
-<div class="block">Determine if this object can be used in any future parse activities
- <p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>true it is safe to proceed, false otherwise</dd>
-</dl>
-</li>
-</ul>
 <a name="getDiagnostics--">
 <!--   -->
 </a>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/DebuggerRunner.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/DebuggerRunner.html
index de2ae6b..92bee63 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/DebuggerRunner.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/DebuggerRunner.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>DebuggerRunner (Apache Daffodil 3.4.0 Java API)</title>
+<title>DebuggerRunner (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DebuggerRunner (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="DebuggerRunner (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/TraceDebuggerRunner.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/TraceDebuggerRunner.html
index e9beaea..caea459 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/TraceDebuggerRunner.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/TraceDebuggerRunner.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>TraceDebuggerRunner (Apache Daffodil 3.4.0 Java API)</title>
+<title>TraceDebuggerRunner (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TraceDebuggerRunner (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="TraceDebuggerRunner (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-frame.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-frame.html
index bac2a4b..ed29505 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-frame.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.debugger (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi.debugger (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-summary.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-summary.html
index c35d01e..cf06894 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-summary.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.debugger (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi.debugger (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi.debugger (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.japi.debugger (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-tree.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-tree.html
index 434bb4b..9437819 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-tree.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/debugger/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.debugger Class Hierarchy (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi.debugger Class Hierarchy (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi.debugger Class Hierarchy (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.japi.debugger Class Hierarchy (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetInputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetInputter.html
index e9688dc..e2cf3a8 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetInputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetInputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>InfosetInputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>InfosetInputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InfosetInputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="InfosetInputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.daffodil.infoset.InfosetInputter</li>
+<li>org.apache.daffodil.runtime1.infoset.InfosetInputter</li>
 <li>
 <ul class="inheritance">
 <li>org.apache.daffodil.japi.infoset.InfosetInputter</li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.NextElementResolver, org.apache.daffodil.util.Cursor&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;, org.apache.daffodil.util.CursorImplMixin&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;</dd>
+<dd>org.apache.daffodil.lib.util.Cursor&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.lib.util.CursorImplMixin&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.runtime1.infoset.NextElementResolver</dd>
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
@@ -121,7 +121,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>public abstract class <span class="typeNameLabel">InfosetInputter</span>
-extends org.apache.daffodil.infoset.InfosetInputter</pre>
+extends org.apache.daffodil.runtime1.infoset.InfosetInputter</pre>
 <div class="block">Abstract class used to determine how the infoset representation should be
  input from a call to DataProcessor#unparse. This uses a Cursor API, such
  that each call to advance/inspect must update a cursor value, minimizing
@@ -141,11 +141,11 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 </a>
 <h3>Nested Class Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
-<code>org.apache.daffodil.util.CursorImplMixin.Advance$, org.apache.daffodil.util.CursorImplMixin.Inspect$, org.apache.daffodil.util.CursorImplMixin.OpKind, org.apache.daffodil.util.CursorImplMixin.Unsuccessful$</code></li>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
+<code>org.apache.daffodil.lib.util.CursorImplMixin.Advance$, org.apache.daffodil.lib.util.CursorImplMixin.Inspect$, org.apache.daffodil.lib.util.CursorImplMixin.OpKind, org.apache.daffodil.lib.util.CursorImplMixin.Unsuccessful$</code></li>
 </ul>
 </li>
 </ul>
@@ -179,7 +179,7 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>abstract org.apache.daffodil.infoset.InfosetInputterEventType</code></td>
+<td class="colFirst"><code>abstract org.apache.daffodil.runtime1.infoset.InfosetInputterEventType</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getEventType--">getEventType</a></span>()</code>
 <div class="block">Return the current infoset inputter event type</div>
 </td>
@@ -198,14 +198,14 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>abstract java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-">getSimpleText</a></span>(org.apache.daffodil.dpath.NodeInfo.Kind&nbsp;primType)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-">getSimpleText</a></span>(org.apache.daffodil.runtime1.dpath.NodeInfo.Kind&nbsp;primType)</code>
 <div class="block">See getSimpleText(primType, runtimeProperties), which has a default
  implementation to call this function without the runtimeProperties Map</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText</a></span>(org.apache.daffodil.dpath.NodeInfo.Kind&nbsp;primType,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText</a></span>(org.apache.daffodil.runtime1.dpath.NodeInfo.Kind&nbsp;primType,
              java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;runtimeProperties)</code>
 <div class="block">Get the content of a simple type.</div>
 </td>
@@ -217,7 +217,7 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 </td>
 </tr>
 <tr id="i6" class="altColor">
-<td class="colFirst"><code>abstract org.apache.daffodil.util.MaybeBoolean</code></td>
+<td class="colFirst"><code>abstract org.apache.daffodil.lib.util.MaybeBoolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#isNilled--">isNilled</a></span>()</code>
 <div class="block">Determine if the current event is nilled.</div>
 </td>
@@ -230,11 +230,11 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetInputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetInputter">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.infoset.InfosetInputter</h3>
-<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$infoset$NextElementResolver$_setter_$org$apache$daffodil$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$infoset$NextElementResolver$$trdStack, org$apache$daffodil$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$util$CursorImplMixin$$isFilled, p [...]
+<h3>Methods inherited from class&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputter</h3>
+<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled, org$apache$daffodil$runtime1$infoset$NextElementResolver$_setter_$org$apache$daffodil$runtime1$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$runtime1$infos [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -244,24 +244,24 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.Cursor">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.Cursor">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.Cursor</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.Cursor</h3>
 <code>$init$, fini</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.NextElementResolver">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.NextElementResolver">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.NextElementResolver</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.NextElementResolver</h3>
 <code>$init$</code></li>
 </ul>
 </li>
@@ -301,11 +301,11 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>getEventType</h4>
-<pre>public abstract&nbsp;org.apache.daffodil.infoset.InfosetInputterEventType&nbsp;getEventType()</pre>
+<pre>public abstract&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputterEventType&nbsp;getEventType()</pre>
 <div class="block">Return the current infoset inputter event type</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>getEventType</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.infoset.InfosetInputter</code></dd>
+<dd><code>getEventType</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetInputter</code></dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>(undocumented)</dd>
 </dl>
@@ -322,7 +322,7 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
  current event type is StartElement.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>getLocalName</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.infoset.InfosetInputter</code></dd>
+<dd><code>getLocalName</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetInputter</code></dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>(undocumented)</dd>
 </dl>
@@ -341,19 +341,19 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
  represent no namespaces.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>getNamespaceURI</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.infoset.InfosetInputter</code></dd>
+<dd><code>getNamespaceURI</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetInputter</code></dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>(undocumented)</dd>
 </dl>
 </li>
 </ul>
-<a name="getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-java.util.Map-">
+<a name="getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-java.util.Map-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getSimpleText</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getSimpleText(org.apache.daffodil.dpath.NodeInfo.Kind&nbsp;primType,
+<pre>public&nbsp;java.lang.String&nbsp;getSimpleText(org.apache.daffodil.runtime1.dpath.NodeInfo.Kind&nbsp;primType,
                                       java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;runtimeProperties)</pre>
 <div class="block">Get the content of a simple type. This will only be called when the
  current event type is StartElement and the element is a simple type. If
@@ -362,7 +362,7 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
  simple content, this should return either null or the empty string.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>getSimpleText</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.infoset.InfosetInputter</code></dd>
+<dd><code>getSimpleText</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetInputter</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>primType</code> - (undocumented)</dd>
 <dd><code>runtimeProperties</code> - (undocumented)</dd>
@@ -371,13 +371,13 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 </dl>
 </li>
 </ul>
-<a name="getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-">
+<a name="getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getSimpleText</h4>
-<pre>public abstract&nbsp;java.lang.String&nbsp;getSimpleText(org.apache.daffodil.dpath.NodeInfo.Kind&nbsp;primType)</pre>
+<pre>public abstract&nbsp;java.lang.String&nbsp;getSimpleText(org.apache.daffodil.runtime1.dpath.NodeInfo.Kind&nbsp;primType)</pre>
 <div class="block">See getSimpleText(primType, runtimeProperties), which has a default
  implementation to call this function without the runtimeProperties Map</div>
 <dl>
@@ -398,7 +398,7 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 <div class="block">Return true if there are remaining events. False otherwise.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>hasNext</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.infoset.InfosetInputter</code></dd>
+<dd><code>hasNext</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetInputter</code></dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>(undocumented)</dd>
 </dl>
@@ -410,7 +410,7 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>isNilled</h4>
-<pre>public abstract&nbsp;org.apache.daffodil.util.MaybeBoolean&nbsp;isNilled()</pre>
+<pre>public abstract&nbsp;org.apache.daffodil.lib.util.MaybeBoolean&nbsp;isNilled()</pre>
 <div class="block">Determine if the current event is nilled. This will only be called when
  the current event type is StartElement. Return MaybeBoolean.Nope if no
  nil property is set, which implies the element is not nilled. Return
@@ -432,7 +432,7 @@ extends org.apache.daffodil.infoset.InfosetInputter</pre>
 <div class="block">Move the internal state to the next event.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>next</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.infoset.InfosetInputter</code></dd>
+<dd><code>next</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetInputter</code></dd>
 </dl>
 </li>
 </ul>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetInputterProxy.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetInputterProxy.html
index 1d086eb..04ac3af 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetInputterProxy.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetInputterProxy.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>InfosetInputterProxy (Apache Daffodil 3.4.0 Java API)</title>
+<title>InfosetInputterProxy (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InfosetInputterProxy (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="InfosetInputterProxy (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.daffodil.infoset.InfosetInputter</li>
+<li>org.apache.daffodil.runtime1.infoset.InfosetInputter</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">org.apache.daffodil.japi.infoset.InfosetInputter</a></li>
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.NextElementResolver, org.apache.daffodil.util.Cursor&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;, org.apache.daffodil.util.CursorImplMixin&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;</dd>
+<dd>org.apache.daffodil.lib.util.Cursor&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.lib.util.CursorImplMixin&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.runtime1.infoset.NextElementResolver</dd>
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
@@ -141,11 +141,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </a>
 <h3>Nested Class Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
-<code>org.apache.daffodil.util.CursorImplMixin.Advance$, org.apache.daffodil.util.CursorImplMixin.Inspect$, org.apache.daffodil.util.CursorImplMixin.OpKind, org.apache.daffodil.util.CursorImplMixin.Unsuccessful$</code></li>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
+<code>org.apache.daffodil.lib.util.CursorImplMixin.Advance$, org.apache.daffodil.lib.util.CursorImplMixin.Inspect$, org.apache.daffodil.lib.util.CursorImplMixin.OpKind, org.apache.daffodil.lib.util.CursorImplMixin.Unsuccessful$</code></li>
 </ul>
 </li>
 </ul>
@@ -183,7 +183,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.InfosetInputterEventType</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.InfosetInputterEventType</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a></span>()</code>
 <div class="block">Return the current infoset inputter event type</div>
 </td>
@@ -202,11 +202,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>scala.runtime.Nothing$</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-">getSimpleText</a></span>(org.apache.daffodil.dpath.NodeInfo.Kind&nbsp;primType)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-">getSimpleText</a></span>(org.apache.daffodil.runtime1.dpath.NodeInfo.Kind&nbsp;primType)</code>&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText</a></span>(org.apache.daffodil.dpath.NodeInfo.Kind&nbsp;primType,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText</a></span>(org.apache.daffodil.runtime1.dpath.NodeInfo.Kind&nbsp;primType,
              java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;runtimeProperties)</code>
 <div class="block">Get the content of a simple type.</div>
 </td>
@@ -218,13 +218,13 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </td>
 </tr>
 <tr id="i7" class="rowColor">
-<td class="colFirst"><code>protected abstract org.apache.daffodil.infoset.InfosetInputter</code></td>
+<td class="colFirst"><code>protected abstract org.apache.daffodil.runtime1.infoset.InfosetInputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#infosetInputter--">infosetInputter</a></span>()</code>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.util.MaybeBoolean</code></td>
+<td class="colFirst"><code>org.apache.daffodil.lib.util.MaybeBoolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#isNilled--">isNilled</a></span>()</code>
 <div class="block">Determine if the current event is nilled.</div>
 </td>
@@ -241,11 +241,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetInputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetInputter">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.infoset.InfosetInputter</h3>
-<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$infoset$NextElementResolver$_setter_$org$apache$daffodil$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$infoset$NextElementResolver$$trdStack, org$apache$daffodil$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$util$CursorImplMixin$$isFilled, p [...]
+<h3>Methods inherited from class&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputter</h3>
+<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled, org$apache$daffodil$runtime1$infoset$NextElementResolver$_setter_$org$apache$daffodil$runtime1$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$runtime1$infos [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -255,24 +255,24 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.Cursor">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.Cursor">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.Cursor</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.Cursor</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.NextElementResolver">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.NextElementResolver">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.NextElementResolver</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.NextElementResolver</h3>
 <code>$init$</code></li>
 </ul>
 </li>
@@ -321,7 +321,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <ul class="blockList">
 <li class="blockList">
 <h4>getEventType</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.InfosetInputterEventType&nbsp;getEventType()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputterEventType&nbsp;getEventType()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getEventType--">InfosetInputter</a></code></span></div>
 <div class="block">Return the current infoset inputter event type</div>
 <dl>
@@ -370,15 +370,15 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </dl>
 </li>
 </ul>
-<a name="getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-java.util.Map-">
+<a name="getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-java.util.Map-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getSimpleText</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getSimpleText(org.apache.daffodil.dpath.NodeInfo.Kind&nbsp;primType,
+<pre>public&nbsp;java.lang.String&nbsp;getSimpleText(org.apache.daffodil.runtime1.dpath.NodeInfo.Kind&nbsp;primType,
                                       java.util.Map&lt;java.lang.String,java.lang.String&gt;&nbsp;runtimeProperties)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-java.util.Map-">InfosetInputter</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-java.util.Map-">InfosetInputter</a></code></span></div>
 <div class="block">Get the content of a simple type. This will only be called when the
  current event type is StartElement and the element is a simple type. If
  the event contains complex data, it is an error and should throw
@@ -386,7 +386,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
  simple content, this should return either null or the empty string.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputter</a></code></dd>
+<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-java.util.Map-">getSimpleText</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputter</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>primType</code> - (undocumented)</dd>
 <dd><code>runtimeProperties</code> - (undocumented)</dd>
@@ -395,13 +395,13 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </dl>
 </li>
 </ul>
-<a name="getSimpleText-org.apache.daffodil.dpath.NodeInfo.Kind-">
+<a name="getSimpleText-org.apache.daffodil.runtime1.dpath.NodeInfo.Kind-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getSimpleText</h4>
-<pre>public&nbsp;scala.runtime.Nothing$&nbsp;getSimpleText(org.apache.daffodil.dpath.NodeInfo.Kind&nbsp;primType)</pre>
+<pre>public&nbsp;scala.runtime.Nothing$&nbsp;getSimpleText(org.apache.daffodil.runtime1.dpath.NodeInfo.Kind&nbsp;primType)</pre>
 </li>
 </ul>
 <a name="hasNext--">
@@ -427,7 +427,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <ul class="blockList">
 <li class="blockList">
 <h4>infosetInputter</h4>
-<pre>protected abstract&nbsp;org.apache.daffodil.infoset.InfosetInputter&nbsp;infosetInputter()</pre>
+<pre>protected abstract&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputter&nbsp;infosetInputter()</pre>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -441,7 +441,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <ul class="blockList">
 <li class="blockList">
 <h4>isNilled</h4>
-<pre>public&nbsp;org.apache.daffodil.util.MaybeBoolean&nbsp;isNilled()</pre>
+<pre>public&nbsp;org.apache.daffodil.lib.util.MaybeBoolean&nbsp;isNilled()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html#isNilled--">InfosetInputter</a></code></span></div>
 <div class="block">Determine if the current event is nilled. This will only be called when
  the current event type is StartElement. Return MaybeBoolean.Nope if no
@@ -480,7 +480,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <pre>public&nbsp;boolean&nbsp;supportsNamespaces()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>supportsNamespaces</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.infoset.InfosetInputter</code></dd>
+<dd><code>supportsNamespaces</code>&nbsp;in class&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetInputter</code></dd>
 </dl>
 </li>
 </ul>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetOutputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetOutputter.html
index aa55fb0..7720174 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetOutputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetOutputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>InfosetOutputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>InfosetOutputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InfosetOutputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="InfosetOutputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -107,7 +107,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.InfosetOutputter</dd>
+<dd>org.apache.daffodil.runtime1.infoset.InfosetOutputter</dd>
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>public abstract class <span class="typeNameLabel">InfosetOutputter</span>
 extends java.lang.Object
-implements org.apache.daffodil.infoset.InfosetOutputter</pre>
+implements org.apache.daffodil.runtime1.infoset.InfosetOutputter</pre>
 <div class="block">Abstract class used to determine how the infoset representation should be
  output from a call to DataProcessor#parse. The Daffodil core will call
  the various methods of this class in an order appropriate to create an
@@ -161,13 +161,13 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray</a></span>(org.apache.daffodil.infoset.DIArray&nbsp;diArray)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray</a></span>(org.apache.daffodil.runtime1.infoset.DIArray&nbsp;diArray)</code>
 <div class="block">Called by Daffodil internals to signify the end of an array of elements.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex</a></span>(org.apache.daffodil.infoset.DIComplex&nbsp;diComplex)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex</a></span>(org.apache.daffodil.runtime1.infoset.DIComplex&nbsp;diComplex)</code>
 <div class="block">Called by Daffodil internals to signify the end of a complex element.</div>
 </td>
 </tr>
@@ -179,7 +179,7 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endSimple-org.apache.daffodil.infoset.DISimple-">endSimple</a></span>(org.apache.daffodil.infoset.DISimple&nbsp;diSimple)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endSimple-org.apache.daffodil.runtime1.infoset.DISimple-">endSimple</a></span>(org.apache.daffodil.runtime1.infoset.DISimple&nbsp;diSimple)</code>
 <div class="block">Called by Daffodil internals to signify the end of a simple element.</div>
 </td>
 </tr>
@@ -191,13 +191,13 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startArray-org.apache.daffodil.infoset.DIArray-">startArray</a></span>(org.apache.daffodil.infoset.DIArray&nbsp;diArray)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startArray-org.apache.daffodil.runtime1.infoset.DIArray-">startArray</a></span>(org.apache.daffodil.runtime1.infoset.DIArray&nbsp;diArray)</code>
 <div class="block">Called by Daffodil internals to signify the beginning of an array of elements.</div>
 </td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startComplex-org.apache.daffodil.infoset.DIComplex-">startComplex</a></span>(org.apache.daffodil.infoset.DIComplex&nbsp;diComplex)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">startComplex</a></span>(org.apache.daffodil.runtime1.infoset.DIComplex&nbsp;diComplex)</code>
 <div class="block">Called by Daffodil internals to signify the beginning of a complex element.</div>
 </td>
 </tr>
@@ -209,7 +209,7 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startSimple-org.apache.daffodil.infoset.DISimple-">startSimple</a></span>(org.apache.daffodil.infoset.DISimple&nbsp;diSimple)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startSimple-org.apache.daffodil.runtime1.infoset.DISimple-">startSimple</a></span>(org.apache.daffodil.runtime1.infoset.DISimple&nbsp;diSimple)</code>
 <div class="block">Called by Daffodil internals to signify the beginning of a simple element.</div>
 </td>
 </tr>
@@ -222,11 +222,11 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetOutputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetOutputter">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.InfosetOutputter</h3>
-<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix, org$apache$daffodil$infoset$Inf [...]
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.InfosetOutputter</h3>
+<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$runtime1$infoset$Infoset [...]
 </ul>
 </li>
 </ul>
@@ -259,19 +259,19 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="endArray-org.apache.daffodil.infoset.DIArray-">
+<a name="endArray-org.apache.daffodil.runtime1.infoset.DIArray-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>endArray</h4>
-<pre>public abstract&nbsp;void&nbsp;endArray(org.apache.daffodil.infoset.DIArray&nbsp;diArray)
+<pre>public abstract&nbsp;void&nbsp;endArray(org.apache.daffodil.runtime1.infoset.DIArray&nbsp;diArray)
                        throws java.lang.Exception</pre>
 <div class="block">Called by Daffodil internals to signify the end of an array of elements.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>endArray</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>endArray</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diArray</code> - the array that is ended. Various fields of
                 DIArray can be accessed to determine things like the
@@ -281,19 +281,19 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
 </dl>
 </li>
 </ul>
-<a name="endComplex-org.apache.daffodil.infoset.DIComplex-">
+<a name="endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>endComplex</h4>
-<pre>public abstract&nbsp;void&nbsp;endComplex(org.apache.daffodil.infoset.DIComplex&nbsp;diComplex)
+<pre>public abstract&nbsp;void&nbsp;endComplex(org.apache.daffodil.runtime1.infoset.DIComplex&nbsp;diComplex)
                          throws java.lang.Exception</pre>
 <div class="block">Called by Daffodil internals to signify the end of a complex element.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>endComplex</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>endComplex</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diComplex</code> - the complex element that is ended. Various fields of
                   DIComplex can be accessed to determine things like the
@@ -315,25 +315,25 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>endDocument</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>endDocument</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code>java.lang.Exception</code> - if there was an error and Daffodil should stop parsing</dd>
 </dl>
 </li>
 </ul>
-<a name="endSimple-org.apache.daffodil.infoset.DISimple-">
+<a name="endSimple-org.apache.daffodil.runtime1.infoset.DISimple-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>endSimple</h4>
-<pre>public abstract&nbsp;void&nbsp;endSimple(org.apache.daffodil.infoset.DISimple&nbsp;diSimple)
+<pre>public abstract&nbsp;void&nbsp;endSimple(org.apache.daffodil.runtime1.infoset.DISimple&nbsp;diSimple)
                         throws java.lang.Exception</pre>
 <div class="block">Called by Daffodil internals to signify the end of a simple element.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>endSimple</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>endSimple</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diSimple</code> - the simple element that is ended. Various fields of
                  DISimple can be accessed to determine things like the
@@ -354,23 +354,23 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
  inbetween calls to the parse method.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>reset</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>reset</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 </dl>
 </li>
 </ul>
-<a name="startArray-org.apache.daffodil.infoset.DIArray-">
+<a name="startArray-org.apache.daffodil.runtime1.infoset.DIArray-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>startArray</h4>
-<pre>public abstract&nbsp;void&nbsp;startArray(org.apache.daffodil.infoset.DIArray&nbsp;diArray)
+<pre>public abstract&nbsp;void&nbsp;startArray(org.apache.daffodil.runtime1.infoset.DIArray&nbsp;diArray)
                          throws java.lang.Exception</pre>
 <div class="block">Called by Daffodil internals to signify the beginning of an array of elements.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>startArray</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>startArray</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diArray</code> - the array that is started. Various fields of
                 DIArray can be accessed to determine things like the
@@ -380,19 +380,19 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
 </dl>
 </li>
 </ul>
-<a name="startComplex-org.apache.daffodil.infoset.DIComplex-">
+<a name="startComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>startComplex</h4>
-<pre>public abstract&nbsp;void&nbsp;startComplex(org.apache.daffodil.infoset.DIComplex&nbsp;diComplex)
+<pre>public abstract&nbsp;void&nbsp;startComplex(org.apache.daffodil.runtime1.infoset.DIComplex&nbsp;diComplex)
                            throws java.lang.Exception</pre>
 <div class="block">Called by Daffodil internals to signify the beginning of a complex element.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>startComplex</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>startComplex</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diComplex</code> - the complex element that is started. Various fields of
                   DIComplex can be accessed to determine things like the
@@ -414,25 +414,25 @@ implements org.apache.daffodil.infoset.InfosetOutputter</pre>
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>startDocument</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>startDocument</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code>java.lang.Exception</code> - if there was an error and Daffodil should stop parsing</dd>
 </dl>
 </li>
 </ul>
-<a name="startSimple-org.apache.daffodil.infoset.DISimple-">
+<a name="startSimple-org.apache.daffodil.runtime1.infoset.DISimple-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>startSimple</h4>
-<pre>public abstract&nbsp;void&nbsp;startSimple(org.apache.daffodil.infoset.DISimple&nbsp;diSimple)
+<pre>public abstract&nbsp;void&nbsp;startSimple(org.apache.daffodil.runtime1.infoset.DISimple&nbsp;diSimple)
                           throws java.lang.Exception</pre>
 <div class="block">Called by Daffodil internals to signify the beginning of a simple element.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>startSimple</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>startSimple</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diSimple</code> - the simple element that is started. Various fields of
                  DISimple can be accessed to determine things like the
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html
index 8cacbcb..375cf29 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>InfosetOutputterProxy (Apache Daffodil 3.4.0 Java API)</title>
+<title>InfosetOutputterProxy (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InfosetOutputterProxy (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="InfosetOutputterProxy (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.InfosetOutputter</dd>
+<dd>org.apache.daffodil.runtime1.infoset.InfosetOutputter</dd>
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
@@ -160,13 +160,13 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray</a></span>(org.apache.daffodil.infoset.DIArray&nbsp;diArray)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray</a></span>(org.apache.daffodil.runtime1.infoset.DIArray&nbsp;diArray)</code>
 <div class="block">Called by Daffodil internals to signify the end of an array of elements.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex</a></span>(org.apache.daffodil.infoset.DIComplex&nbsp;diComplex)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex</a></span>(org.apache.daffodil.runtime1.infoset.DIComplex&nbsp;diComplex)</code>
 <div class="block">Called by Daffodil internals to signify the end of a complex element.</div>
 </td>
 </tr>
@@ -178,12 +178,12 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endSimple-org.apache.daffodil.infoset.DISimple-">endSimple</a></span>(org.apache.daffodil.infoset.DISimple&nbsp;diSimple)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endSimple-org.apache.daffodil.runtime1.infoset.DISimple-">endSimple</a></span>(org.apache.daffodil.runtime1.infoset.DISimple&nbsp;diSimple)</code>
 <div class="block">Called by Daffodil internals to signify the end of a simple element.</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
-<td class="colFirst"><code>protected abstract org.apache.daffodil.infoset.InfosetOutputter</code></td>
+<td class="colFirst"><code>protected abstract org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#infosetOutputter--">infosetOutputter</a></span>()</code>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 </td>
@@ -196,13 +196,13 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startArray-org.apache.daffodil.infoset.DIArray-">startArray</a></span>(org.apache.daffodil.infoset.DIArray&nbsp;diArray)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startArray-org.apache.daffodil.runtime1.infoset.DIArray-">startArray</a></span>(org.apache.daffodil.runtime1.infoset.DIArray&nbsp;diArray)</code>
 <div class="block">Called by Daffodil internals to signify the beginning of an array of elements.</div>
 </td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startComplex-org.apache.daffodil.infoset.DIComplex-">startComplex</a></span>(org.apache.daffodil.infoset.DIComplex&nbsp;diComplex)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">startComplex</a></span>(org.apache.daffodil.runtime1.infoset.DIComplex&nbsp;diComplex)</code>
 <div class="block">Called by Daffodil internals to signify the beginning of a complex element.</div>
 </td>
 </tr>
@@ -214,7 +214,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startSimple-org.apache.daffodil.infoset.DISimple-">startSimple</a></span>(org.apache.daffodil.infoset.DISimple&nbsp;diSimple)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#startSimple-org.apache.daffodil.runtime1.infoset.DISimple-">startSimple</a></span>(org.apache.daffodil.runtime1.infoset.DISimple&nbsp;diSimple)</code>
 <div class="block">Called by Daffodil internals to signify the beginning of a simple element.</div>
 </td>
 </tr>
@@ -227,11 +227,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetOutputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetOutputter">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.InfosetOutputter</h3>
-<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix, org$apache$daffodil$infoset$Inf [...]
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.InfosetOutputter</h3>
+<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$runtime1$infoset$Infoset [...]
 </ul>
 </li>
 </ul>
@@ -264,21 +264,21 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="endArray-org.apache.daffodil.infoset.DIArray-">
+<a name="endArray-org.apache.daffodil.runtime1.infoset.DIArray-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>endArray</h4>
-<pre>public&nbsp;void&nbsp;endArray(org.apache.daffodil.infoset.DIArray&nbsp;diArray)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endArray-org.apache.daffodil.infoset.DIArray-">InfosetOutputter</a></code></span></div>
+<pre>public&nbsp;void&nbsp;endArray(org.apache.daffodil.runtime1.infoset.DIArray&nbsp;diArray)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">InfosetOutputter</a></code></span></div>
 <div class="block">Called by Daffodil internals to signify the end of an array of elements.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>endArray</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>endArray</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
+<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diArray</code> - the array that is ended. Various fields of
                 DIArray can be accessed to determine things like the
@@ -286,21 +286,21 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </dl>
 </li>
 </ul>
-<a name="endComplex-org.apache.daffodil.infoset.DIComplex-">
+<a name="endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>endComplex</h4>
-<pre>public&nbsp;void&nbsp;endComplex(org.apache.daffodil.infoset.DIComplex&nbsp;diComplex)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endComplex-org.apache.daffodil.infoset.DIComplex-">InfosetOutputter</a></code></span></div>
+<pre>public&nbsp;void&nbsp;endComplex(org.apache.daffodil.runtime1.infoset.DIComplex&nbsp;diComplex)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">InfosetOutputter</a></code></span></div>
 <div class="block">Called by Daffodil internals to signify the end of a complex element.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>endComplex</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>endComplex</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
+<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diComplex</code> - the complex element that is ended. Various fields of
                   DIComplex can be accessed to determine things like the
@@ -320,27 +320,27 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>endDocument</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>endDocument</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endDocument--">endDocument</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="endSimple-org.apache.daffodil.infoset.DISimple-">
+<a name="endSimple-org.apache.daffodil.runtime1.infoset.DISimple-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>endSimple</h4>
-<pre>public&nbsp;void&nbsp;endSimple(org.apache.daffodil.infoset.DISimple&nbsp;diSimple)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endSimple-org.apache.daffodil.infoset.DISimple-">InfosetOutputter</a></code></span></div>
+<pre>public&nbsp;void&nbsp;endSimple(org.apache.daffodil.runtime1.infoset.DISimple&nbsp;diSimple)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endSimple-org.apache.daffodil.runtime1.infoset.DISimple-">InfosetOutputter</a></code></span></div>
 <div class="block">Called by Daffodil internals to signify the end of a simple element.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>endSimple</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>endSimple</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endSimple-org.apache.daffodil.infoset.DISimple-">endSimple</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
+<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#endSimple-org.apache.daffodil.runtime1.infoset.DISimple-">endSimple</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diSimple</code> - the simple element that is ended. Various fields of
                  DISimple can be accessed to determine things like the
@@ -354,7 +354,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <ul class="blockList">
 <li class="blockList">
 <h4>infosetOutputter</h4>
-<pre>protected abstract&nbsp;org.apache.daffodil.infoset.InfosetOutputter&nbsp;infosetOutputter()</pre>
+<pre>protected abstract&nbsp;org.apache.daffodil.runtime1.infoset.InfosetOutputter&nbsp;infosetOutputter()</pre>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -374,27 +374,27 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
  inbetween calls to the parse method.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>reset</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>reset</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#reset--">reset</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="startArray-org.apache.daffodil.infoset.DIArray-">
+<a name="startArray-org.apache.daffodil.runtime1.infoset.DIArray-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>startArray</h4>
-<pre>public&nbsp;void&nbsp;startArray(org.apache.daffodil.infoset.DIArray&nbsp;diArray)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startArray-org.apache.daffodil.infoset.DIArray-">InfosetOutputter</a></code></span></div>
+<pre>public&nbsp;void&nbsp;startArray(org.apache.daffodil.runtime1.infoset.DIArray&nbsp;diArray)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startArray-org.apache.daffodil.runtime1.infoset.DIArray-">InfosetOutputter</a></code></span></div>
 <div class="block">Called by Daffodil internals to signify the beginning of an array of elements.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>startArray</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>startArray</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startArray-org.apache.daffodil.infoset.DIArray-">startArray</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
+<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startArray-org.apache.daffodil.runtime1.infoset.DIArray-">startArray</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diArray</code> - the array that is started. Various fields of
                 DIArray can be accessed to determine things like the
@@ -402,21 +402,21 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </dl>
 </li>
 </ul>
-<a name="startComplex-org.apache.daffodil.infoset.DIComplex-">
+<a name="startComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>startComplex</h4>
-<pre>public&nbsp;void&nbsp;startComplex(org.apache.daffodil.infoset.DIComplex&nbsp;diComplex)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startComplex-org.apache.daffodil.infoset.DIComplex-">InfosetOutputter</a></code></span></div>
+<pre>public&nbsp;void&nbsp;startComplex(org.apache.daffodil.runtime1.infoset.DIComplex&nbsp;diComplex)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">InfosetOutputter</a></code></span></div>
 <div class="block">Called by Daffodil internals to signify the beginning of a complex element.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>startComplex</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>startComplex</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startComplex-org.apache.daffodil.infoset.DIComplex-">startComplex</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
+<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">startComplex</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diComplex</code> - the complex element that is started. Various fields of
                   DIComplex can be accessed to determine things like the
@@ -436,27 +436,27 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>startDocument</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>startDocument</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startDocument--">startDocument</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="startSimple-org.apache.daffodil.infoset.DISimple-">
+<a name="startSimple-org.apache.daffodil.runtime1.infoset.DISimple-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>startSimple</h4>
-<pre>public&nbsp;void&nbsp;startSimple(org.apache.daffodil.infoset.DISimple&nbsp;diSimple)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startSimple-org.apache.daffodil.infoset.DISimple-">InfosetOutputter</a></code></span></div>
+<pre>public&nbsp;void&nbsp;startSimple(org.apache.daffodil.runtime1.infoset.DISimple&nbsp;diSimple)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startSimple-org.apache.daffodil.runtime1.infoset.DISimple-">InfosetOutputter</a></code></span></div>
 <div class="block">Called by Daffodil internals to signify the beginning of a simple element.
  <p></div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>startSimple</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.infoset.InfosetOutputter</code></dd>
+<dd><code>startSimple</code>&nbsp;in interface&nbsp;<code>org.apache.daffodil.runtime1.infoset.InfosetOutputter</code></dd>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startSimple-org.apache.daffodil.infoset.DISimple-">startSimple</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
+<dd><code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html#startSimple-org.apache.daffodil.runtime1.infoset.DISimple-">startSimple</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputter</a></code></dd>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>diSimple</code> - the simple element that is started. Various fields of
                  DISimple can be accessed to determine things like the
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JDOMInfosetInputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JDOMInfosetInputter.html
index a8c6958..83c387a 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JDOMInfosetInputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JDOMInfosetInputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>JDOMInfosetInputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>JDOMInfosetInputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="JDOMInfosetInputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="JDOMInfosetInputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.daffodil.infoset.InfosetInputter</li>
+<li>org.apache.daffodil.runtime1.infoset.InfosetInputter</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">org.apache.daffodil.japi.infoset.InfosetInputter</a></li>
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.NextElementResolver, org.apache.daffodil.util.Cursor&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;, org.apache.daffodil.util.CursorImplMixin&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;</dd>
+<dd>org.apache.daffodil.lib.util.Cursor&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.lib.util.CursorImplMixin&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.runtime1.infoset.NextElementResolver</dd>
 </dl>
 <hr>
 <br>
@@ -144,11 +144,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </a>
 <h3>Nested Class Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
-<code>org.apache.daffodil.util.CursorImplMixin.Advance$, org.apache.daffodil.util.CursorImplMixin.Inspect$, org.apache.daffodil.util.CursorImplMixin.OpKind, org.apache.daffodil.util.CursorImplMixin.Unsuccessful$</code></li>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
+<code>org.apache.daffodil.lib.util.CursorImplMixin.Advance$, org.apache.daffodil.lib.util.CursorImplMixin.Inspect$, org.apache.daffodil.lib.util.CursorImplMixin.OpKind, org.apache.daffodil.lib.util.CursorImplMixin.Unsuccessful$</code></li>
 </ul>
 </li>
 </ul>
@@ -182,7 +182,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.JDOMInfosetInputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.JDOMInfosetInputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/JDOMInfosetInputter.html#infosetInputter--">infosetInputter</a></span>()</code>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 </td>
@@ -193,14 +193,14 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetInputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetInputter">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.infoset.InfosetInputter</h3>
-<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$infoset$NextElementResolver$_setter_$org$apache$daffodil$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$infoset$NextElementResolver$$trdStack, org$apache$daffodil$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$util$CursorImplMixin$$isFilled, p [...]
+<h3>Methods inherited from class&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputter</h3>
+<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled, org$apache$daffodil$runtime1$infoset$NextElementResolver$_setter_$org$apache$daffodil$runtime1$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$runtime1$infos [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -210,24 +210,24 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.Cursor">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.Cursor">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.Cursor</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.Cursor</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.NextElementResolver">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.NextElementResolver">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.NextElementResolver</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.NextElementResolver</h3>
 <code>$init$</code></li>
 </ul>
 </li>
@@ -267,7 +267,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetInputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.JDOMInfosetInputter&nbsp;infosetInputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.JDOMInfosetInputter&nbsp;infosetInputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#infosetInputter--">InfosetInputterProxy</a></code></span></div>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 <dl>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JDOMInfosetOutputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JDOMInfosetOutputter.html
index b4ec84c..e660da1 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JDOMInfosetOutputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JDOMInfosetOutputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>JDOMInfosetOutputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>JDOMInfosetOutputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="JDOMInfosetOutputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="JDOMInfosetOutputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.InfosetOutputter</dd>
+<dd>org.apache.daffodil.runtime1.infoset.InfosetOutputter</dd>
 </dl>
 <hr>
 <br>
@@ -166,7 +166,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.JDOMInfosetOutputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.JDOMInfosetOutputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/JDOMInfosetOutputter.html#infosetOutputter--">infosetOutputter</a></span>()</code>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 </td>
@@ -177,7 +177,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterP [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -187,11 +187,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetOutputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetOutputter">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.InfosetOutputter</h3>
-<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix, org$apache$daffodil$infoset$Inf [...]
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.InfosetOutputter</h3>
+<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$runtime1$infoset$Infoset [...]
 </ul>
 </li>
 </ul>
@@ -246,7 +246,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetOutputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.JDOMInfosetOutputter&nbsp;infosetOutputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.JDOMInfosetOutputter&nbsp;infosetOutputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#infosetOutputter--">InfosetOutputterProxy</a></code></span></div>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 <dl>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JsonInfosetInputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JsonInfosetInputter.html
index 88d6345..f4bfd0f 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JsonInfosetInputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JsonInfosetInputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>JsonInfosetInputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>JsonInfosetInputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="JsonInfosetInputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="JsonInfosetInputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.daffodil.infoset.InfosetInputter</li>
+<li>org.apache.daffodil.runtime1.infoset.InfosetInputter</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">org.apache.daffodil.japi.infoset.InfosetInputter</a></li>
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.NextElementResolver, org.apache.daffodil.util.Cursor&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;, org.apache.daffodil.util.CursorImplMixin&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;</dd>
+<dd>org.apache.daffodil.lib.util.Cursor&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.lib.util.CursorImplMixin&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.runtime1.infoset.NextElementResolver</dd>
 </dl>
 <hr>
 <br>
@@ -142,11 +142,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </a>
 <h3>Nested Class Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
-<code>org.apache.daffodil.util.CursorImplMixin.Advance$, org.apache.daffodil.util.CursorImplMixin.Inspect$, org.apache.daffodil.util.CursorImplMixin.OpKind, org.apache.daffodil.util.CursorImplMixin.Unsuccessful$</code></li>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
+<code>org.apache.daffodil.lib.util.CursorImplMixin.Advance$, org.apache.daffodil.lib.util.CursorImplMixin.Inspect$, org.apache.daffodil.lib.util.CursorImplMixin.OpKind, org.apache.daffodil.lib.util.CursorImplMixin.Unsuccessful$</code></li>
 </ul>
 </li>
 </ul>
@@ -166,13 +166,6 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <div class="block">Read in an infoset in the form of json text from a java.io.InputStream</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/JsonInfosetInputter.html#JsonInfosetInputter-java.io.Reader-">JsonInfosetInputter</a></span>(java.io.Reader&nbsp;reader)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use JsonInfosetInputter(java.io.InputStream) instead. Since 2.4.0.</span></div>
-</div>
-</td>
-</tr>
 </table>
 </li>
 </ul>
@@ -189,7 +182,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.JsonInfosetInputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.JsonInfosetInputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/JsonInfosetInputter.html#infosetInputter--">infosetInputter</a></span>()</code>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 </td>
@@ -200,14 +193,14 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetInputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetInputter">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.infoset.InfosetInputter</h3>
-<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$infoset$NextElementResolver$_setter_$org$apache$daffodil$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$infoset$NextElementResolver$$trdStack, org$apache$daffodil$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$util$CursorImplMixin$$isFilled, p [...]
+<h3>Methods inherited from class&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputter</h3>
+<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled, org$apache$daffodil$runtime1$infoset$NextElementResolver$_setter_$org$apache$daffodil$runtime1$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$runtime1$infos [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -217,24 +210,24 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.Cursor">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.Cursor">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.Cursor</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.Cursor</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.NextElementResolver">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.NextElementResolver">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.NextElementResolver</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.NextElementResolver</h3>
 <code>$init$</code></li>
 </ul>
 </li>
@@ -251,22 +244,6 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="JsonInfosetInputter-java.io.Reader-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>JsonInfosetInputter</h4>
-<pre>public&nbsp;JsonInfosetInputter(java.io.Reader&nbsp;reader)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This constructor is deprecated. Use JsonInfosetInputter(java.io.InputStream) instead. Since 2.4.0.</span></div>
-<div class="block">Read in an infoset in the form of json text from a java.io.Reader
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>reader</code> - the java.io.Reader to read the json text from</dd>
-</dl>
-</li>
-</ul>
 <a name="JsonInfosetInputter-java.io.InputStream-">
 <!--   -->
 </a>
@@ -296,7 +273,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetInputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.JsonInfosetInputter&nbsp;infosetInputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.JsonInfosetInputter&nbsp;infosetInputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#infosetInputter--">InfosetInputterProxy</a></code></span></div>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 <dl>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html
index f5273a0..d565fee 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>JsonInfosetOutputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>JsonInfosetOutputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="JsonInfosetOutputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="JsonInfosetOutputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.InfosetOutputter</dd>
+<dd>org.apache.daffodil.runtime1.infoset.InfosetOutputter</dd>
 </dl>
 <hr>
 <br>
@@ -147,21 +147,6 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <div class="block">Output the infoset as json text, written to a java.io.OutputStream</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html#JsonInfosetOutputter-java.io.Writer-">JsonInfosetOutputter</a></span>(java.io.Writer&nbsp;writer)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use JsonInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html#JsonInfosetOutputter-java.io.Writer-boolean-">JsonInfosetOutputter</a></span>(java.io.Writer&nbsp;writer,
-                    boolean&nbsp;pretty)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use JsonInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</div>
-</td>
-</tr>
 </table>
 </li>
 </ul>
@@ -178,7 +163,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.JsonInfosetOutputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.JsonInfosetOutputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/JsonInfosetOutputter.html#infosetOutputter--">infosetOutputter</a></span>()</code>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 </td>
@@ -189,7 +174,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterP [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -199,11 +184,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetOutputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetOutputter">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.InfosetOutputter</h3>
-<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix, org$apache$daffodil$infoset$Inf [...]
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.InfosetOutputter</h3>
+<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$runtime1$infoset$Infoset [...]
 </ul>
 </li>
 </ul>
@@ -219,42 +204,6 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="JsonInfosetOutputter-java.io.Writer-boolean-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>JsonInfosetOutputter</h4>
-<pre>public&nbsp;JsonInfosetOutputter(java.io.Writer&nbsp;writer,
-                            boolean&nbsp;pretty)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This constructor is deprecated. Use JsonInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-<div class="block">Output the infoset as json text, written to a java.io.Writer
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>writer</code> - the java.io.Writer to write the json text to</dd>
-<dd><code>pretty</code> - enable or disable pretty printing. Pretty printing will only
-               insert indentation and newlines where it will not affect the
-               content of the json.</dd>
-</dl>
-</li>
-</ul>
-<a name="JsonInfosetOutputter-java.io.Writer-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>JsonInfosetOutputter</h4>
-<pre>public&nbsp;JsonInfosetOutputter(java.io.Writer&nbsp;writer)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This constructor is deprecated. Use JsonInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-<div class="block">Output the infoset as json text, written to a java.io.Writer
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>writer</code> - the java.io.Writer to write the json text to</dd>
-</dl>
-</li>
-</ul>
 <a name="JsonInfosetOutputter-java.io.OutputStream-boolean-">
 <!--   -->
 </a>
@@ -288,7 +237,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetOutputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.JsonInfosetOutputter&nbsp;infosetOutputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.JsonInfosetOutputter&nbsp;infosetOutputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#infosetOutputter--">InfosetOutputterProxy</a></code></span></div>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 <dl>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/NullInfosetOutputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/NullInfosetOutputter.html
index 64087ba..b5c7b10 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/NullInfosetOutputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/NullInfosetOutputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>NullInfosetOutputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>NullInfosetOutputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NullInfosetOutputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="NullInfosetOutputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.InfosetOutputter</dd>
+<dd>org.apache.daffodil.runtime1.infoset.InfosetOutputter</dd>
 </dl>
 <hr>
 <br>
@@ -161,7 +161,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.NullInfosetOutputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.NullInfosetOutputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/NullInfosetOutputter.html#infosetOutputter--">infosetOutputter</a></span>()</code>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 </td>
@@ -172,7 +172,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterP [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -182,11 +182,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetOutputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetOutputter">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.InfosetOutputter</h3>
-<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix, org$apache$daffodil$infoset$Inf [...]
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.InfosetOutputter</h3>
+<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$runtime1$infoset$Infoset [...]
 </ul>
 </li>
 </ul>
@@ -225,7 +225,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetOutputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.NullInfosetOutputter&nbsp;infosetOutputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.NullInfosetOutputter&nbsp;infosetOutputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#infosetOutputter--">InfosetOutputterProxy</a></code></span></div>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 <dl>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/ScalaXMLInfosetInputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/ScalaXMLInfosetInputter.html
index 623ad08..0e1a12b 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/ScalaXMLInfosetInputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/ScalaXMLInfosetInputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ScalaXMLInfosetInputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>ScalaXMLInfosetInputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ScalaXMLInfosetInputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="ScalaXMLInfosetInputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.daffodil.infoset.InfosetInputter</li>
+<li>org.apache.daffodil.runtime1.infoset.InfosetInputter</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">org.apache.daffodil.japi.infoset.InfosetInputter</a></li>
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.NextElementResolver, org.apache.daffodil.util.Cursor&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;, org.apache.daffodil.util.CursorImplMixin&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;</dd>
+<dd>org.apache.daffodil.lib.util.Cursor&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.lib.util.CursorImplMixin&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.runtime1.infoset.NextElementResolver</dd>
 </dl>
 <hr>
 <br>
@@ -144,11 +144,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </a>
 <h3>Nested Class Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
-<code>org.apache.daffodil.util.CursorImplMixin.Advance$, org.apache.daffodil.util.CursorImplMixin.Inspect$, org.apache.daffodil.util.CursorImplMixin.OpKind, org.apache.daffodil.util.CursorImplMixin.Unsuccessful$</code></li>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
+<code>org.apache.daffodil.lib.util.CursorImplMixin.Advance$, org.apache.daffodil.lib.util.CursorImplMixin.Inspect$, org.apache.daffodil.lib.util.CursorImplMixin.OpKind, org.apache.daffodil.lib.util.CursorImplMixin.Unsuccessful$</code></li>
 </ul>
 </li>
 </ul>
@@ -182,7 +182,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.ScalaXMLInfosetInputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.ScalaXMLInfosetInputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/ScalaXMLInfosetInputter.html#infosetInputter--">infosetInputter</a></span>()</code>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 </td>
@@ -193,14 +193,14 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetInputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetInputter">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.infoset.InfosetInputter</h3>
-<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$infoset$NextElementResolver$_setter_$org$apache$daffodil$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$infoset$NextElementResolver$$trdStack, org$apache$daffodil$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$util$CursorImplMixin$$isFilled, p [...]
+<h3>Methods inherited from class&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputter</h3>
+<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled, org$apache$daffodil$runtime1$infoset$NextElementResolver$_setter_$org$apache$daffodil$runtime1$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$runtime1$infos [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -210,24 +210,24 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.Cursor">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.Cursor">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.Cursor</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.Cursor</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.NextElementResolver">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.NextElementResolver">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.NextElementResolver</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.NextElementResolver</h3>
 <code>$init$</code></li>
 </ul>
 </li>
@@ -267,7 +267,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetInputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.ScalaXMLInfosetInputter&nbsp;infosetInputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.ScalaXMLInfosetInputter&nbsp;infosetInputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#infosetInputter--">InfosetInputterProxy</a></code></span></div>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 <dl>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/ScalaXMLInfosetOutputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/ScalaXMLInfosetOutputter.html
index be2fb2f..f8885a0 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/ScalaXMLInfosetOutputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/ScalaXMLInfosetOutputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ScalaXMLInfosetOutputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>ScalaXMLInfosetOutputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ScalaXMLInfosetOutputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="ScalaXMLInfosetOutputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.InfosetOutputter</dd>
+<dd>org.apache.daffodil.runtime1.infoset.InfosetOutputter</dd>
 </dl>
 <hr>
 <br>
@@ -168,7 +168,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.ScalaXMLInfosetOutputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.ScalaXMLInfosetOutputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/ScalaXMLInfosetOutputter.html#infosetOutputter--">infosetOutputter</a></span>()</code>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 </td>
@@ -179,7 +179,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterP [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -189,11 +189,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetOutputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetOutputter">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.InfosetOutputter</h3>
-<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix, org$apache$daffodil$infoset$Inf [...]
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.InfosetOutputter</h3>
+<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$runtime1$infoset$Infoset [...]
 </ul>
 </li>
 </ul>
@@ -232,7 +232,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <ul class="blockList">
 <li class="blockList">
 <h4>infosetOutputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.ScalaXMLInfosetOutputter&nbsp;infosetOutputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.ScalaXMLInfosetOutputter&nbsp;infosetOutputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#infosetOutputter--">InfosetOutputterProxy</a></code></span></div>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 <dl>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/W3CDOMInfosetInputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/W3CDOMInfosetInputter.html
index e82520a..c47ecdf 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/W3CDOMInfosetInputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/W3CDOMInfosetInputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>W3CDOMInfosetInputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>W3CDOMInfosetInputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="W3CDOMInfosetInputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="W3CDOMInfosetInputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.daffodil.infoset.InfosetInputter</li>
+<li>org.apache.daffodil.runtime1.infoset.InfosetInputter</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">org.apache.daffodil.japi.infoset.InfosetInputter</a></li>
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.NextElementResolver, org.apache.daffodil.util.Cursor&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;, org.apache.daffodil.util.CursorImplMixin&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;</dd>
+<dd>org.apache.daffodil.lib.util.Cursor&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.lib.util.CursorImplMixin&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.runtime1.infoset.NextElementResolver</dd>
 </dl>
 <hr>
 <br>
@@ -149,11 +149,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </a>
 <h3>Nested Class Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
-<code>org.apache.daffodil.util.CursorImplMixin.Advance$, org.apache.daffodil.util.CursorImplMixin.Inspect$, org.apache.daffodil.util.CursorImplMixin.OpKind, org.apache.daffodil.util.CursorImplMixin.Unsuccessful$</code></li>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
+<code>org.apache.daffodil.lib.util.CursorImplMixin.Advance$, org.apache.daffodil.lib.util.CursorImplMixin.Inspect$, org.apache.daffodil.lib.util.CursorImplMixin.OpKind, org.apache.daffodil.lib.util.CursorImplMixin.Unsuccessful$</code></li>
 </ul>
 </li>
 </ul>
@@ -187,7 +187,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.W3CDOMInfosetInputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.W3CDOMInfosetInputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/W3CDOMInfosetInputter.html#infosetInputter--">infosetInputter</a></span>()</code>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 </td>
@@ -198,14 +198,14 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetInputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetInputter">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.infoset.InfosetInputter</h3>
-<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$infoset$NextElementResolver$_setter_$org$apache$daffodil$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$infoset$NextElementResolver$$trdStack, org$apache$daffodil$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$util$CursorImplMixin$$isFilled, p [...]
+<h3>Methods inherited from class&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputter</h3>
+<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled, org$apache$daffodil$runtime1$infoset$NextElementResolver$_setter_$org$apache$daffodil$runtime1$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$runtime1$infos [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -215,24 +215,24 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.Cursor">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.Cursor">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.Cursor</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.Cursor</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.NextElementResolver">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.NextElementResolver">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.NextElementResolver</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.NextElementResolver</h3>
 <code>$init$</code></li>
 </ul>
 </li>
@@ -272,7 +272,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetInputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.W3CDOMInfosetInputter&nbsp;infosetInputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.W3CDOMInfosetInputter&nbsp;infosetInputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#infosetInputter--">InfosetInputterProxy</a></code></span></div>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 <dl>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html
index 9ee809d..5da48c7 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>W3CDOMInfosetOutputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>W3CDOMInfosetOutputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="W3CDOMInfosetOutputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="W3CDOMInfosetOutputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/W3CDOMInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html" target="_top">Frames</a></li>
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.InfosetOutputter</dd>
+<dd>org.apache.daffodil.runtime1.infoset.InfosetOutputter</dd>
 </dl>
 <hr>
 <br>
@@ -166,7 +166,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.W3CDOMInfosetOutputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.W3CDOMInfosetOutputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html#infosetOutputter--">infosetOutputter</a></span>()</code>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 </td>
@@ -177,7 +177,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterP [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -187,11 +187,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetOutputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetOutputter">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.InfosetOutputter</h3>
-<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix, org$apache$daffodil$infoset$Inf [...]
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.InfosetOutputter</h3>
+<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$runtime1$infoset$Infoset [...]
 </ul>
 </li>
 </ul>
@@ -246,7 +246,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetOutputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.W3CDOMInfosetOutputter&nbsp;infosetOutputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.W3CDOMInfosetOutputter&nbsp;infosetOutputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#infosetOutputter--">InfosetOutputterProxy</a></code></span></div>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 <dl>
@@ -285,7 +285,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/W3CDOMInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html" target="_top">Frames</a></li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/LogLevel.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html
similarity index 50%
rename from content/docs/latest/javadoc/org/apache/daffodil/japi/logger/LogLevel.html
rename to content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html
index 74b0fad..d1190ec 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/LogLevel.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>LogLevel (Apache Daffodil 3.4.0 Java API)</title>
+<title>XMLTextEscapeStyle (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,14 +11,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LogLevel (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="XMLTextEscapeStyle (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":41,"i1":41};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -47,12 +47,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/LogLevel.html" target="_top">Frames</a></li>
-<li><a href="LogLevel.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" target="_top">Frames</a></li>
+<li><a href="XMLTextEscapeStyle.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -74,13 +74,13 @@ var activeTableTab = "activeTableTab";
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
@@ -90,18 +90,18 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.apache.daffodil.japi.logger</div>
-<h2 title="Enum LogLevel" class="title">Enum LogLevel</h2>
+<div class="subTitle">org.apache.daffodil.japi.infoset</div>
+<h2 title="Enum XMLTextEscapeStyle" class="title">Enum XMLTextEscapeStyle</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>java.lang.Enum&lt;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&gt;</li>
+<li>java.lang.Enum&lt;<a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.daffodil.japi.logger.LogLevel</li>
+<li>org.apache.daffodil.japi.infoset.XMLTextEscapeStyle</li>
 </ul>
 </li>
 </ul>
@@ -112,22 +112,13 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>java.io.Serializable, java.lang.Comparable&lt;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&gt;</dd>
+<dd>java.io.Serializable, java.lang.Comparable&lt;<a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a>&gt;</dd>
 </dl>
 <hr>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
 <br>
-<pre>@Deprecated
-public enum <span class="typeNameLabel">LogLevel</span>
-extends java.lang.Enum&lt;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&gt;</pre>
-<div class="block">Logging levels.
- <p>
- Error, Warning, and Info are intended for general use. The default is Info.
- <p>
- Levels Resolver Compile, Debug, and OOLAGDebug are intended for Daffodil developer
- use.</div>
+<pre>public enum <span class="typeNameLabel">XMLTextEscapeStyle</span>
+extends java.lang.Enum&lt;<a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a>&gt;</pre>
+<div class="block">XMLTextEscapeStyles for determining whether to wrap info in CDATA tags</div>
 </li>
 </ul>
 </div>
@@ -146,65 +137,17 @@ extends java.lang.Enum&lt;<a href="../../../../../org/apache/daffodil/japi/logge
 <th class="colOne" scope="col">Enum Constant and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#Compile">Compile</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#Debug">Debug</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#DelimDebug">DelimDebug</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#Error">Error</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#Info">Info</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#OOLAGDebug">OOLAGDebug</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#Resolver">Resolver</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html#CDATA">CDATA</a></span></code>
+<div class="block">The text of xs:string elements are wrapped in CDATA tags if the string contains
+ special characters (quotation mark, ampersand, less-than, greater-than) or
+ whitespace</div>
+</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#Warning">Warning</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#id">id</a></span></code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Numeric ID of the log level</div>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html#Standard">Standard</a></span></code>
+<div class="block">Special characters (quotation mark, ampersand, less-than, greater-than) in the
+ text of xs:string elements are escaped, while non-special characters are written
+ as is.</div>
 </td>
 </tr>
 </table>
@@ -217,22 +160,20 @@ extends java.lang.Enum&lt;<a href="../../../../../org/apache/daffodil/japi/logge
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tab [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html#values--">values</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html#values--">values</a></span>()</code>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
@@ -266,103 +207,28 @@ the order they are declared.</div>
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
-<a name="Error">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>Error</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a> Error</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-<a name="Warning">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>Warning</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a> Warning</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-<a name="Info">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>Info</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a> Info</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-<a name="Resolver">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>Resolver</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a> Resolver</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-<a name="Compile">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>Compile</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a> Compile</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-<a name="Debug">
+<a name="Standard">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>Debug</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a> Debug</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-<a name="OOLAGDebug">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>OOLAGDebug</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a> OOLAGDebug</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-<a name="DelimDebug">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>DelimDebug</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a> DelimDebug</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<h4>Standard</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a> Standard</pre>
+<div class="block">Special characters (quotation mark, ampersand, less-than, greater-than) in the
+ text of xs:string elements are escaped, while non-special characters are written
+ as is.</div>
 </li>
 </ul>
-</li>
-</ul>
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="id">
+<a name="CDATA">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>id</h4>
-<pre>public final&nbsp;int id</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Numeric ID of the log level</div>
+<h4>CDATA</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a> CDATA</pre>
+<div class="block">The text of xs:string elements are wrapped in CDATA tags if the string contains
+ special characters (quotation mark, ampersand, less-than, greater-than) or
+ whitespace</div>
 </li>
 </ul>
 </li>
@@ -379,13 +245,12 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>[]&nbsp;values()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<pre>public static&nbsp;<a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a>[]&nbsp;values()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
 <pre>
-for (LogLevel c : LogLevel.values())
+for (XMLTextEscapeStyle c : XMLTextEscapeStyle.values())
 &nbsp;   System.out.println(c);
 </pre></div>
 <dl>
@@ -400,8 +265,7 @@ for (LogLevel c : LogLevel.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<pre>public static&nbsp;<a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
@@ -444,12 +308,12 @@ not permitted.)</div>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/LogLevel.html" target="_top">Frames</a></li>
-<li><a href="LogLevel.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" target="_top">Frames</a></li>
+<li><a href="XMLTextEscapeStyle.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -471,13 +335,13 @@ not permitted.)</div>
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
 <li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
 <li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
 </div>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html
index ef5e14d..68c7285 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>XMLTextInfosetInputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>XMLTextInfosetInputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="XMLTextInfosetInputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="XMLTextInfosetInputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -98,7 +98,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.daffodil.infoset.InfosetInputter</li>
+<li>org.apache.daffodil.runtime1.infoset.InfosetInputter</li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset">org.apache.daffodil.japi.infoset.InfosetInputter</a></li>
@@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.NextElementResolver, org.apache.daffodil.util.Cursor&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;, org.apache.daffodil.util.CursorImplMixin&lt;org.apache.daffodil.infoset.InfosetAccessor&gt;</dd>
+<dd>org.apache.daffodil.lib.util.Cursor&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.lib.util.CursorImplMixin&lt;org.apache.daffodil.runtime1.infoset.InfosetAccessor&gt;, org.apache.daffodil.runtime1.infoset.NextElementResolver</dd>
 </dl>
 <hr>
 <br>
@@ -142,11 +142,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </a>
 <h3>Nested Class Summary</h3>
 <ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
-<code>org.apache.daffodil.util.CursorImplMixin.Advance$, org.apache.daffodil.util.CursorImplMixin.Inspect$, org.apache.daffodil.util.CursorImplMixin.OpKind, org.apache.daffodil.util.CursorImplMixin.Unsuccessful$</code></li>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
+<code>org.apache.daffodil.lib.util.CursorImplMixin.Advance$, org.apache.daffodil.lib.util.CursorImplMixin.Inspect$, org.apache.daffodil.lib.util.CursorImplMixin.OpKind, org.apache.daffodil.lib.util.CursorImplMixin.Unsuccessful$</code></li>
 </ul>
 </li>
 </ul>
@@ -166,13 +166,6 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <div class="block">Read in an infoset in the form of XML text from a java.io.InputStream</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html#XMLTextInfosetInputter-java.io.Reader-">XMLTextInfosetInputter</a></span>(java.io.Reader&nbsp;reader)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetInputter(java.io.InputStream) instead. Since 2.4.0.</span></div>
-</div>
-</td>
-</tr>
 </table>
 </li>
 </ul>
@@ -189,7 +182,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.XMLTextInfosetInputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.XMLTextInfosetInputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetInputter.html#infosetInputter--">infosetInputter</a></span>()</code>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 </td>
@@ -200,14 +193,14 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetInputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#fini--">fini</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getEventType--">getEventType</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getLocalName--">getLocalName</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#getNamespaceURI--">getNamespaceURI</a>, <a href="../../../../../org/ [...]
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetInputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetInputter">
 <!--   -->
 </a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.infoset.InfosetInputter</h3>
-<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$infoset$NextElementResolver$_setter_$org$apache$daffodil$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$infoset$NextElementResolver$$trdStack, org$apache$daffodil$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$util$CursorImplMixin$$isFilled, p [...]
+<h3>Methods inherited from class&nbsp;org.apache.daffodil.runtime1.infoset.InfosetInputter</h3>
+<code>accessor_$eq, accessor, advance, Advance, advanceAccessor, advanceMaybe, documentElement, fill, initialize, inspect, Inspect, inspectAccessor, inspectMaybe, isInitialized, maybeTopTRD, nextElement, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled_$eq, org$apache$daffodil$lib$util$CursorImplMixin$$isFilled, org$apache$daffodil$runtime1$infoset$NextElementResolver$_setter_$org$apache$daffodil$runtime1$infoset$NextElementResolver$$trdStack_$eq, org$apache$daffodil$runtime1$infos [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -217,24 +210,24 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.CursorImplMixin">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.CursorImplMixin">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.CursorImplMixin</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.CursorImplMixin</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.util.Cursor">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.lib.util.Cursor">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.util.Cursor</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.lib.util.Cursor</h3>
 <code>$init$</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.NextElementResolver">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.NextElementResolver">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.NextElementResolver</h3>
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.NextElementResolver</h3>
 <code>$init$</code></li>
 </ul>
 </li>
@@ -251,22 +244,6 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="XMLTextInfosetInputter-java.io.Reader-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>XMLTextInfosetInputter</h4>
-<pre>public&nbsp;XMLTextInfosetInputter(java.io.Reader&nbsp;reader)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetInputter(java.io.InputStream) instead. Since 2.4.0.</span></div>
-<div class="block">Read in an infoset in the form of XML text from a java.io.Reader
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>reader</code> - the java.io.Reader to read the XML text from</dd>
-</dl>
-</li>
-</ul>
 <a name="XMLTextInfosetInputter-java.io.InputStream-">
 <!--   -->
 </a>
@@ -296,7 +273,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetInputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.XMLTextInfosetInputter&nbsp;infosetInputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.XMLTextInfosetInputter&nbsp;infosetInputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputterProxy.html#infosetInputter--">InfosetInputterProxy</a></code></span></div>
 <div class="block">The InfosetInputter to proxy infoset events to</div>
 <dl>
@@ -334,7 +311,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/infoset/W3CDOMInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html
index f2d329c..92bd0f9 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>XMLTextInfosetOutputter (Apache Daffodil 3.4.0 Java API)</title>
+<title>XMLTextInfosetOutputter (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="XMLTextInfosetOutputter (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="XMLTextInfosetOutputter (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>org.apache.daffodil.infoset.InfosetOutputter</dd>
+<dd>org.apache.daffodil.runtime1.infoset.InfosetOutputter</dd>
 </dl>
 <hr>
 <br>
@@ -148,18 +148,10 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.Writer-">XMLTextInfosetOutputter</a></span>(java.io.Writer&nbsp;writer)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.Writer-boolean-">XMLTextInfosetOutputter</a></span>(java.io.Writer&nbsp;writer,
-                       boolean&nbsp;pretty)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-</div>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#XMLTextInfosetOutputter-java.io.OutputStream-boolean-org.apache.daffodil.japi.infoset.XMLTextEscapeStyle-">XMLTextInfosetOutputter</a></span>(java.io.OutputStream&nbsp;os,
+                       boolean&nbsp;pretty,
+                       <a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a>&nbsp;xmlTextEscapeStyle)</code>
+<div class="block">Output the infoset as XML Text, written to a java.io.OutputStream</div>
 </td>
 </tr>
 </table>
@@ -178,7 +170,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>org.apache.daffodil.infoset.XMLTextInfosetOutputter</code></td>
+<td class="colFirst"><code>org.apache.daffodil.runtime1.infoset.XMLTextInfosetOutputter</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextInfosetOutputter.html#infosetOutputter--">infosetOutputter</a></span>()</code>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 </td>
@@ -189,7 +181,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset">InfosetOutputterProxy</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterP [...]
+<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endArray-org.apache.daffodil.runtime1.infoset.DIArray-">endArray</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endComplex-org.apache.daffodil.runtime1.infoset.DIComplex-">endComplex</a>, <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#endDocument--">endDocument</a>, <a href="../../../../../org/apache/daffodil/japi/infoset [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -199,11 +191,11 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.infoset.InfosetOutputter">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.runtime1.infoset.InfosetOutputter">
 <!--   -->
 </a>
-<h3>Methods inherited from interface&nbsp;org.apache.daffodil.infoset.InfosetOutputter</h3>
-<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$infoset$InfosetOutputter$$blobPrefix, org$apache$daffodil$infoset$Inf [...]
+<h3>Methods inherited from interface&nbsp;org.apache.daffodil.runtime1.infoset.InfosetOutputter</h3>
+<code>$init$, getBlobDirectory, getBlobPaths, getBlobPrefix, getBlobSuffix, getStatus, isNilled, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobDirectory, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths_$eq, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPaths, org$apache$daffodil$runtime1$infoset$InfosetOutputter$$blobPrefix_$eq, org$apache$daffodil$runtime1$infoset$Infoset [...]
 </ul>
 </li>
 </ul>
@@ -219,50 +211,34 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="XMLTextInfosetOutputter-java.io.Writer-boolean-">
+<a name="XMLTextInfosetOutputter-java.io.OutputStream-boolean-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>XMLTextInfosetOutputter</h4>
-<pre>public&nbsp;XMLTextInfosetOutputter(java.io.Writer&nbsp;writer,
+<pre>public&nbsp;XMLTextInfosetOutputter(java.io.OutputStream&nbsp;os,
                                boolean&nbsp;pretty)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-<div class="block">Output the infoset as XML Text, written to a java.io.Writer
+<div class="block">Output the infoset as XML Text, written to a java.io.OutputStream
  <p></div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>writer</code> - the java.io.Writer to write the XML text to</dd>
+<dd><code>os</code> - the java.io.OutputStream to write the XML text to</dd>
 <dd><code>pretty</code> - enable or disable pretty printing. Pretty printing will only
                insert indentation and newlines where it will not affect the
                content of the XML.</dd>
 </dl>
 </li>
 </ul>
-<a name="XMLTextInfosetOutputter-java.io.Writer-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>XMLTextInfosetOutputter</h4>
-<pre>public&nbsp;XMLTextInfosetOutputter(java.io.Writer&nbsp;writer)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This constructor is deprecated. Use XMLTextInfosetOutputter(java.io.OutputStream, Boolean) instead. Since 2.4.0.</span></div>
-<div class="block">Output the infoset as XML Text, written to a java.io.Writer
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>writer</code> - the java.io.Writer to write the XML text to</dd>
-</dl>
-</li>
-</ul>
-<a name="XMLTextInfosetOutputter-java.io.OutputStream-boolean-">
+<a name="XMLTextInfosetOutputter-java.io.OutputStream-boolean-org.apache.daffodil.japi.infoset.XMLTextEscapeStyle-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>XMLTextInfosetOutputter</h4>
 <pre>public&nbsp;XMLTextInfosetOutputter(java.io.OutputStream&nbsp;os,
-                               boolean&nbsp;pretty)</pre>
+                               boolean&nbsp;pretty,
+                               <a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a>&nbsp;xmlTextEscapeStyle)</pre>
 <div class="block">Output the infoset as XML Text, written to a java.io.OutputStream
  <p></div>
 <dl>
@@ -271,6 +247,9 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <dd><code>pretty</code> - enable or disable pretty printing. Pretty printing will only
                insert indentation and newlines where it will not affect the
                content of the XML.</dd>
+<dd><code>xmlTextEscapeStyle</code> - determine whether to wrap values of elements of type
+                       xs:string in CDATA tags in order to preserve
+                       whitespace.</dd>
 </dl>
 </li>
 </ul>
@@ -288,7 +267,7 @@ extends <a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputte
 <ul class="blockListLast">
 <li class="blockList">
 <h4>infosetOutputter</h4>
-<pre>public&nbsp;org.apache.daffodil.infoset.XMLTextInfosetOutputter&nbsp;infosetOutputter()</pre>
+<pre>public&nbsp;org.apache.daffodil.runtime1.infoset.XMLTextInfosetOutputter&nbsp;infosetOutputter()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html#infosetOutputter--">InfosetOutputterProxy</a></code></span></div>
 <div class="block">The InfosetOutputter to proxy infoset events to</div>
 <dl>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-frame.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-frame.html
index aec27cb..bc71e1b 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-frame.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.infoset (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi.infoset (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -28,6 +28,10 @@
 <li><a href="XMLTextInfosetInputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">XMLTextInfosetInputter</a></li>
 <li><a href="XMLTextInfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset" target="classFrame">XMLTextInfosetOutputter</a></li>
 </ul>
+<h2 title="Enums">Enums</h2>
+<ul title="Enums">
+<li><a href="XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset" target="classFrame">XMLTextEscapeStyle</a></li>
+</ul>
 </div>
 </body>
 </html>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-summary.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-summary.html
index 46f1a9d..cf7a879 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-summary.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.infoset (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi.infoset (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi.infoset (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.japi.infoset (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -181,6 +181,23 @@
 </tbody>
 </table>
 </li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Summary table, listing enums, and an explanation">
+<caption><span>Enum Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Enum</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset">XMLTextEscapeStyle</a></td>
+<td class="colLast">
+<div class="block">XMLTextEscapeStyles for determining whether to wrap info in CDATA tags</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
 </ul>
 <a name="package.description">
 <!--   -->
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-tree.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-tree.html
index de07139..01af0ed 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-tree.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/infoset/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.infoset Class Hierarchy (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi.infoset Class Hierarchy (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi.infoset Class Hierarchy (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.japi.infoset Class Hierarchy (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -79,7 +79,7 @@
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.apache.daffodil.infoset.InfosetInputter (implements org.apache.daffodil.util.CursorImplMixin&lt;AccessorType&gt;, org.apache.daffodil.infoset.NextElementResolver)
+<li type="circle">org.apache.daffodil.runtime1.infoset.InfosetInputter (implements org.apache.daffodil.lib.util.CursorImplMixin&lt;AccessorType&gt;, org.apache.daffodil.runtime1.infoset.NextElementResolver)
 <ul>
 <li type="circle">org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">InfosetInputter</span></a>
 <ul>
@@ -96,7 +96,7 @@
 </li>
 </ul>
 </li>
-<li type="circle">org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">InfosetOutputter</span></a> (implements org.apache.daffodil.infoset.InfosetOutputter)
+<li type="circle">org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">InfosetOutputter</span></a> (implements org.apache.daffodil.runtime1.infoset.InfosetOutputter)
 <ul>
 <li type="circle">org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">InfosetOutputterProxy</span></a>
 <ul>
@@ -113,6 +113,18 @@
 </ul>
 </li>
 </ul>
+<h2 title="Enum Hierarchy">Enum Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
+<ul>
+<li type="circle">org.apache.daffodil.japi.infoset.<a href="../../../../../org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset"><span class="typeNameLink">XMLTextEscapeStyle</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/io/InputSourceDataInputStream.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/io/InputSourceDataInputStream.html
index 7bd0be6..a042b62 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/io/InputSourceDataInputStream.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/io/InputSourceDataInputStream.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>InputSourceDataInputStream (Apache Daffodil 3.4.0 Java API)</title>
+<title>InputSourceDataInputStream (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InputSourceDataInputStream (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="InputSourceDataInputStream (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-frame.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-frame.html
index 3e0bf8f..d9fa526 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-frame.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.io (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi.io (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-summary.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-summary.html
index bc4fa46..ca54e72 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-summary.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.io (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi.io (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi.io (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.japi.io (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/daffodil/udf/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/daffodil/japi/io/package-summary.html" target="_top">Frames</a></li>
@@ -113,7 +113,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/apache/daffodil/udf/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/daffodil/japi/io/package-summary.html" target="_top">Frames</a></li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-tree.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-tree.html
index 2b93a63..760a4c5 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-tree.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/io/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.io Class Hierarchy (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi.io Class Hierarchy (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi.io Class Hierarchy (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.japi.io Class Hierarchy (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/daffodil/udf/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/daffodil/japi/io/package-tree.html" target="_top">Frames</a></li>
@@ -105,7 +105,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/daffodil/japi/infoset/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/apache/daffodil/udf/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/daffodil/japi/io/package-tree.html" target="_top">Frames</a></li>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/ConsoleLogWriter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/ConsoleLogWriter.html
deleted file mode 100644
index be154fc..0000000
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/ConsoleLogWriter.html
+++ /dev/null
@@ -1,306 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<title>ConsoleLogWriter (Apache Daffodil 3.4.0 Java API)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ConsoleLogWriter (Apache Daffodil 3.4.0 Java API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":42};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/ConsoleLogWriter.html" target="_top">Frames</a></li>
-<li><a href="ConsoleLogWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.daffodil.japi.logger</div>
-<h2 title="Class ConsoleLogWriter" class="title">Class ConsoleLogWriter</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">org.apache.daffodil.japi.logger.LogWriter</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.daffodil.japi.logger.ConsoleLogWriter</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-<br>
-<pre>public final class <span class="typeNameLabel">ConsoleLogWriter</span>
-extends <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></pre>
-<div class="block"><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><code>LogWriter</code></a> that writes log messages to stdout</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/ConsoleLogWriter.html#ConsoleLogWriter--">ConsoleLogWriter</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/ConsoleLogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write</a></span>(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-     java.lang.String&nbsp;logID,
-     java.lang.String&nbsp;msg)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Implement this method to determine how the log message is written.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.japi.logger.LogWriter">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.logger.<a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#log-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-java.util.List-">log</a>, <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#prefix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">prefix</a>, <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#suffix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">suffix</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ConsoleLogWriter--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ConsoleLogWriter</h4>
-<pre>public&nbsp;ConsoleLogWriter()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>write</h4>
-<pre>protected&nbsp;void&nbsp;write(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-                     java.lang.String&nbsp;logID,
-                     java.lang.String&nbsp;msg)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">LogWriter</a></code></span></div>
-<div class="block">Implement this method to determine how the log message is written.
- <p></div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>level</code> - level of the message</dd>
-<dd><code>logID</code> - identification of class that created the log message</dd>
-<dd><code>msg</code> - log message</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/ConsoleLogWriter.html" target="_top">Frames</a></li>
-<li><a href="ConsoleLogWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/FileLogWriter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/FileLogWriter.html
deleted file mode 100644
index 511fc8c..0000000
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/FileLogWriter.html
+++ /dev/null
@@ -1,331 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<title>FileLogWriter (Apache Daffodil 3.4.0 Java API)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FileLogWriter (Apache Daffodil 3.4.0 Java API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":42,"i1":42};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/FileLogWriter.html" target="_top">Frames</a></li>
-<li><a href="FileLogWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.daffodil.japi.logger</div>
-<h2 title="Class FileLogWriter" class="title">Class FileLogWriter</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">org.apache.daffodil.japi.logger.LogWriter</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.daffodil.japi.logger.FileLogWriter</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-<br>
-<pre>public final class <span class="typeNameLabel">FileLogWriter</span>
-extends <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></pre>
-<div class="block"><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><code>LogWriter</code></a> that writes all log messages to a file.
- <p>
- param:  file the file to write log messages to</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html#FileLogWriter-java.io.File-">FileLogWriter</a></span>(java.io.File&nbsp;file)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>java.io.File</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html#getFile--">getFile</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Retrieve the file the log writer writes to</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write</a></span>(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-     java.lang.String&nbsp;logID,
-     java.lang.String&nbsp;msg)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Implement this method to determine how the log message is written.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.japi.logger.LogWriter">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.logger.<a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#log-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-java.util.List-">log</a>, <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#prefix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">prefix</a>, <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#suffix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">suffix</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="FileLogWriter-java.io.File-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>FileLogWriter</h4>
-<pre>public&nbsp;FileLogWriter(java.io.File&nbsp;file)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getFile--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getFile</h4>
-<pre>public&nbsp;java.io.File&nbsp;getFile()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Retrieve the file the log writer writes to
- <p></div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the file the log writer writes to</dd>
-</dl>
-</li>
-</ul>
-<a name="write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>write</h4>
-<pre>protected&nbsp;void&nbsp;write(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-                     java.lang.String&nbsp;logID,
-                     java.lang.String&nbsp;msg)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">LogWriter</a></code></span></div>
-<div class="block">Implement this method to determine how the log message is written.
- <p></div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>level</code> - level of the message</dd>
-<dd><code>logID</code> - identification of class that created the log message</dd>
-<dd><code>msg</code> - log message</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/FileLogWriter.html" target="_top">Frames</a></li>
-<li><a href="FileLogWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/LogWriter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/LogWriter.html
deleted file mode 100644
index dbd90f9..0000000
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/LogWriter.html
+++ /dev/null
@@ -1,394 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<title>LogWriter (Apache Daffodil 3.4.0 Java API)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LogWriter (Apache Daffodil 3.4.0 Java API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":42,"i1":42,"i2":42,"i3":38};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/LogWriter.html" target="_top">Frames</a></li>
-<li><a href="LogWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.daffodil.japi.logger</div>
-<h2 title="Class LogWriter" class="title">Class LogWriter</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.apache.daffodil.japi.logger.LogWriter</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../../org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger">ConsoleLogWriter</a>, <a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger">FileLogWriter</a>, <a href="../../../../../org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger">NullLogWriter</a></dd>
-</dl>
-<hr>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-<br>
-<pre>public abstract class <span class="typeNameLabel">LogWriter</span>
-extends java.lang.Object</pre>
-<div class="block">Abstract log writer, which can be overridden to create a custom log writer.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#LogWriter--">LogWriter</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabE [...]
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#log-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-java.util.List-">log</a></span>(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-   java.lang.String&nbsp;logID,
-   java.lang.String&nbsp;msg,
-   java.util.List&lt;java.lang.Object&gt;&nbsp;args)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Generates a log message as a string and calls the write method.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>protected java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#prefix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">prefix</a></span>(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-      java.lang.String&nbsp;logID)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Override to change the prefix string of the log message.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>protected java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#suffix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">suffix</a></span>(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-      java.lang.String&nbsp;logID)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Override to change the suffix string of the log message.</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>protected abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write</a></span>(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-     java.lang.String&nbsp;logID,
-     java.lang.String&nbsp;msg)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Implement this method to determine how the log message is written.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="LogWriter--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>LogWriter</h4>
-<pre>public&nbsp;LogWriter()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="log-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-java.util.List-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>log</h4>
-<pre>public&nbsp;void&nbsp;log(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-                java.lang.String&nbsp;logID,
-                java.lang.String&nbsp;msg,
-                java.util.List&lt;java.lang.Object&gt;&nbsp;args)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Generates a log message as a string and calls the write method.
- <p>
- The default implementation generates a log message based on the prefix,
- suffix, message string, and log arguments, and passes the generated log
- message, level, and logId to <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-"><code>write(org.apache.daffodil.japi.logger.LogLevel, java.lang.String, java.lang.String)</code></a>.
- <p>
- Can be overridden if more control is needed over the logging mechanism and/or
- log arguments are needed as separate entities.
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>level</code> - level of the message</dd>
-<dd><code>logID</code> - identification of class that created the log message</dd>
-<dd><code>msg</code> - printf-style format string</dd>
-<dd><code>args</code> - arguments passed to the logger, matching the format string</dd>
-</dl>
-</li>
-</ul>
-<a name="prefix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>prefix</h4>
-<pre>protected&nbsp;java.lang.String&nbsp;prefix(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-                                  java.lang.String&nbsp;logID)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Override to change the prefix string of the log message.
- <p>
- By default, the prefix is the empty string.
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>level</code> - level of the message</dd>
-<dd><code>logID</code> - identification of class that created the log message</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the prefix to use for log messages. Defaults to the empty string if not overridden.</dd>
-</dl>
-</li>
-</ul>
-<a name="suffix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>suffix</h4>
-<pre>protected&nbsp;java.lang.String&nbsp;suffix(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-                                  java.lang.String&nbsp;logID)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Override to change the suffix string of the log message.
- <p>
- By default, the suffix is the empty string.
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>level</code> - level of the message</dd>
-<dd><code>logID</code> - identification of class that created the log message</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the suffix to use for log messages. Defaults to the empty string if not overridden.</dd>
-</dl>
-</li>
-</ul>
-<a name="write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>write</h4>
-<pre>protected abstract&nbsp;void&nbsp;write(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-                              java.lang.String&nbsp;logID,
-                              java.lang.String&nbsp;msg)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Implement this method to determine how the log message is written.
- <p></div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>level</code> - level of the message</dd>
-<dd><code>logID</code> - identification of class that created the log message</dd>
-<dd><code>msg</code> - log message</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/LogWriter.html" target="_top">Frames</a></li>
-<li><a href="LogWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/NullLogWriter.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/NullLogWriter.html
deleted file mode 100644
index 1257c3b..0000000
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/NullLogWriter.html
+++ /dev/null
@@ -1,306 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<title>NullLogWriter (Apache Daffodil 3.4.0 Java API)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NullLogWriter (Apache Daffodil 3.4.0 Java API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":42};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/NullLogWriter.html" target="_top">Frames</a></li>
-<li><a href="NullLogWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.apache.daffodil.japi.logger</div>
-<h2 title="Class NullLogWriter" class="title">Class NullLogWriter</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">org.apache.daffodil.japi.logger.LogWriter</a></li>
-<li>
-<ul class="inheritance">
-<li>org.apache.daffodil.japi.logger.NullLogWriter</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">Use Log4j for logging. Since 3.2.0.</span></div>
-</div>
-<br>
-<pre>public final class <span class="typeNameLabel">NullLogWriter</span>
-extends <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></pre>
-<div class="block"><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><code>LogWriter</code></a> that drops all log messages</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/NullLogWriter.html#NullLogWriter--">NullLogWriter</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/daffodil/japi/logger/NullLogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write</a></span>(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-     java.lang.String&nbsp;logID,
-     java.lang.String&nbsp;msg)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block">Implement this method to determine how the log message is written.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.apache.daffodil.japi.logger.LogWriter">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.apache.daffodil.japi.logger.<a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></h3>
-<code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#log-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-java.util.List-">log</a>, <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#prefix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">prefix</a>, <a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#suffix-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-">suffix</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="NullLogWriter--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>NullLogWriter</h4>
-<pre>public&nbsp;NullLogWriter()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>write</h4>
-<pre>protected&nbsp;void&nbsp;write(<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a>&nbsp;level,
-                     java.lang.String&nbsp;logID,
-                     java.lang.String&nbsp;msg)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">LogWriter</a></code></span></div>
-<div class="block">Implement this method to determine how the log message is written.
- <p></div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html#write-org.apache.daffodil.japi.logger.LogLevel-java.lang.String-java.lang.String-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>level</code> - level of the message</dd>
-<dd><code>logID</code> - identification of class that created the log message</dd>
-<dd><code>msg</code> - log message</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/NullLogWriter.html" target="_top">Frames</a></li>
-<li><a href="NullLogWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/package-frame.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/package-frame.html
deleted file mode 100644
index 0f255f6..0000000
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/package-frame.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.logger (Apache Daffodil 3.4.0 Java API)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../../../../../org/apache/daffodil/japi/logger/package-summary.html" target="classFrame">org.apache.daffodil.japi.logger</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger" target="classFrame">ConsoleLogWriter</a></li>
-<li><a href="FileLogWriter.html" title="class in org.apache.daffodil.japi.logger" target="classFrame">FileLogWriter</a></li>
-<li><a href="LogWriter.html" title="class in org.apache.daffodil.japi.logger" target="classFrame">LogWriter</a></li>
-<li><a href="NullLogWriter.html" title="class in org.apache.daffodil.japi.logger" target="classFrame">NullLogWriter</a></li>
-</ul>
-<h2 title="Enums">Enums</h2>
-<ul title="Enums">
-<li><a href="LogLevel.html" title="enum in org.apache.daffodil.japi.logger" target="classFrame">LogLevel</a></li>
-</ul>
-</div>
-</body>
-</html>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/package-summary.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/package-summary.html
deleted file mode 100644
index 63fbe1d..0000000
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/package-summary.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.logger (Apache Daffodil 3.4.0 Java API)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi.logger (Apache Daffodil 3.4.0 Java API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/io/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/apache/daffodil/udf/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Package" class="title">Package&nbsp;org.apache.daffodil.japi.logger</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
-<caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Class</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger">ConsoleLogWriter</a></td>
-<td class="colLast">Deprecated
-<div class="block"><span class="deprecationComment">Use Log4j for logging.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger">FileLogWriter</a></td>
-<td class="colLast">Deprecated
-<div class="block"><span class="deprecationComment">Use Log4j for logging.</span></div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger">LogWriter</a></td>
-<td class="colLast">Deprecated
-<div class="block"><span class="deprecationComment">Use Log4j for logging.</span></div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger">NullLogWriter</a></td>
-<td class="colLast">Deprecated
-<div class="block"><span class="deprecationComment">Use Log4j for logging.</span></div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Summary table, listing enums, and an explanation">
-<caption><span>Enum Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Enum</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger">LogLevel</a></td>
-<td class="colLast">Deprecated
-<div class="block"><span class="deprecationComment">Use Log4j for logging.</span></div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li class="navBarCell1Rev">Package</li>
-<li>Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/io/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/apache/daffodil/udf/package-summary.html">Next&nbsp;Package</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/package-summary.html" target="_top">Frames</a></li>
-<li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/package-tree.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/package-tree.html
deleted file mode 100644
index cf1f85a..0000000
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/logger/package-tree.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi.logger Class Hierarchy (Apache Daffodil 3.4.0 Java API)</title>
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi.logger Class Hierarchy (Apache Daffodil 3.4.0 Java API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/io/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/daffodil/udf/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 class="title">Hierarchy For Package org.apache.daffodil.japi.logger</h1>
-<span class="packageHierarchyLabel">Package Hierarchies:</span>
-<ul class="horizontal">
-<li><a href="../../../../../overview-tree.html">All Packages</a></li>
-</ul>
-</div>
-<div class="contentContainer">
-<h2 title="Class Hierarchy">Class Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="../../../../../org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">LogWriter</span></a>
-<ul>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="../../../../../org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">ConsoleLogWriter</span></a></li>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="../../../../../org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">FileLogWriter</span></a></li>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="../../../../../org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">NullLogWriter</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<h2 title="Enum Hierarchy">Enum Hierarchy</h2>
-<ul>
-<li type="circle">java.lang.Object
-<ul>
-<li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
-<ul>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="../../../../../org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger"><span class="typeNameLink">LogLevel</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Tree</li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/apache/daffodil/japi/io/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/apache/daffodil/udf/package-tree.html">Next</a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/apache/daffodil/japi/logger/package-tree.html" target="_top">Frames</a></li>
-<li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/package-frame.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/package-frame.html
index 6fb355f..2f49001 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/package-frame.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/package-summary.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/package-summary.html
index 3ebf352..08f7191 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/package-summary.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.japi (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -145,7 +145,7 @@
 <tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/daffodil/japi/ParseResult.html" title="class in org.apache.daffodil.japi">ParseResult</a></td>
 <td class="colLast">
-<div class="block">Result of calling <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#parse-java.nio.channels.ReadableByteChannel-org.apache.daffodil.japi.infoset.InfosetOutputter-long-"><code>DataProcessor.parse(java.nio.channels.ReadableByteChannel, InfosetOutputter, long)</code></a>, containing
+<div class="block">Result of calling <a href="../../../../org/apache/daffodil/japi/DataProcessor.html#parse-org.apache.daffodil.japi.io.InputSourceDataInputStream-org.apache.daffodil.japi.infoset.InfosetOutputter-"><code>DataProcessor.parse(InputSourceDataInputStream, InfosetOutputter)</code></a>, containing
  the diagnostic information, and the final data location</div>
 </td>
 </tr>
@@ -199,13 +199,15 @@
 <tr class="altColor">
 <td class="colFirst"><a href="../../../../org/apache/daffodil/japi/DaffodilUnhandledSAXException.html" title="class in org.apache.daffodil.japi">DaffodilUnhandledSAXException</a></td>
 <td class="colLast">
-<div class="block">This exception will be thrown when an unexpected error occurs during the SAX unparse</div>
+<div class="block">This exception is thrown when and unexpected error occurs while unparsing an
+ infoset with an XMLReader and a DaffodilUnparseContentHandler.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/apache/daffodil/japi/DaffodilUnparseErrorSAXException.html" title="class in org.apache.daffodil.japi">DaffodilUnparseErrorSAXException</a></td>
 <td class="colLast">
-<div class="block">This exception will be thrown when unparseResult.isError returns true during a SAX Unparse</div>
+<div class="block">This exception is thrown when UnparseResult.isError returns true while
+ unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.</div>
 </td>
 </tr>
 <tr class="altColor">
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/japi/package-tree.html b/content/docs/latest/javadoc/org/apache/daffodil/japi/package-tree.html
index 1358f2e..15e9de7 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/japi/package-tree.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/japi/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.japi Class Hierarchy (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.japi Class Hierarchy (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.japi Class Hierarchy (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.japi Class Hierarchy (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunction.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunction.html
index 08764d5..f659f2e 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunction.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunction.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>UserDefinedFunction (Apache Daffodil 3.4.0 Java API)</title>
+<title>UserDefinedFunction (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UserDefinedFunction (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="UserDefinedFunction (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunctionIdentification.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunctionIdentification.html
index 60629a2..47043ad 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunctionIdentification.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunctionIdentification.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>UserDefinedFunctionIdentification (Apache Daffodil 3.4.0 Java API)</title>
+<title>UserDefinedFunctionIdentification (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UserDefinedFunctionIdentification (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="UserDefinedFunctionIdentification (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunctionProvider.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunctionProvider.html
index f0cd6a4..303c072 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunctionProvider.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/UserDefinedFunctionProvider.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>UserDefinedFunctionProvider (Apache Daffodil 3.4.0 Java API)</title>
+<title>UserDefinedFunctionProvider (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UserDefinedFunctionProvider (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="UserDefinedFunctionProvider (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/UserDefinedFunctionFatalException.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/UserDefinedFunctionFatalException.html
index 70a039a..e1c257f 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/UserDefinedFunctionFatalException.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/UserDefinedFunctionFatalException.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>UserDefinedFunctionFatalException (Apache Daffodil 3.4.0 Java API)</title>
+<title>UserDefinedFunctionFatalException (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UserDefinedFunctionFatalException (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="UserDefinedFunctionFatalException (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/UserDefinedFunctionProcessingError.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/UserDefinedFunctionProcessingError.html
index d7642a8..794e3ff 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/UserDefinedFunctionProcessingError.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/UserDefinedFunctionProcessingError.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>UserDefinedFunctionProcessingError (Apache Daffodil 3.4.0 Java API)</title>
+<title>UserDefinedFunctionProcessingError (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="UserDefinedFunctionProcessingError (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="UserDefinedFunctionProcessingError (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-frame.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-frame.html
index 15a234a..bb3c9b2 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-frame.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.udf.exceptions (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.udf.exceptions (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-summary.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-summary.html
index 554fb3f..604164e 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-summary.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.udf.exceptions (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.udf.exceptions (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.udf.exceptions (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.udf.exceptions (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-tree.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-tree.html
index 03a520f..9270451 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-tree.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/exceptions/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.udf.exceptions Class Hierarchy (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.udf.exceptions Class Hierarchy (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.udf.exceptions Class Hierarchy (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.udf.exceptions Class Hierarchy (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/package-frame.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/package-frame.html
index c576a05..51cfcd0 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/package-frame.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/package-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.udf (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.udf (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/package-summary.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/package-summary.html
index a19777d..c1d2ff9 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/package-summary.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/package-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.udf (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.udf (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.udf (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.udf (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -41,7 +41,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/daffodil/japi/logger/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/daffodil/japi/io/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/apache/daffodil/udf/exceptions/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
@@ -146,7 +146,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/daffodil/japi/logger/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/apache/daffodil/japi/io/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/apache/daffodil/udf/exceptions/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
diff --git a/content/docs/latest/javadoc/org/apache/daffodil/udf/package-tree.html b/content/docs/latest/javadoc/org/apache/daffodil/udf/package-tree.html
index 38daf9b..1830f58 100644
--- a/content/docs/latest/javadoc/org/apache/daffodil/udf/package-tree.html
+++ b/content/docs/latest/javadoc/org/apache/daffodil/udf/package-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>org.apache.daffodil.udf Class Hierarchy (Apache Daffodil 3.4.0 Java API)</title>
+<title>org.apache.daffodil.udf Class Hierarchy (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.apache.daffodil.udf Class Hierarchy (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="org.apache.daffodil.udf Class Hierarchy (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -41,7 +41,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/daffodil/japi/logger/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/daffodil/japi/io/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/apache/daffodil/udf/exceptions/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
@@ -116,7 +116,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/apache/daffodil/japi/logger/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/apache/daffodil/japi/io/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/apache/daffodil/udf/exceptions/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
diff --git a/content/docs/latest/javadoc/overview-frame.html b/content/docs/latest/javadoc/overview-frame.html
index 051d102..95c09ab 100644
--- a/content/docs/latest/javadoc/overview-frame.html
+++ b/content/docs/latest/javadoc/overview-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview List (Apache Daffodil 3.4.0 Java API)</title>
+<title>Overview List (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -16,7 +16,6 @@
 <li><a href="org/apache/daffodil/japi/debugger/package-frame.html" target="packageFrame">org.apache.daffodil.japi.debugger</a></li>
 <li><a href="org/apache/daffodil/japi/infoset/package-frame.html" target="packageFrame">org.apache.daffodil.japi.infoset</a></li>
 <li><a href="org/apache/daffodil/japi/io/package-frame.html" target="packageFrame">org.apache.daffodil.japi.io</a></li>
-<li><a href="org/apache/daffodil/japi/logger/package-frame.html" target="packageFrame">org.apache.daffodil.japi.logger</a></li>
 <li><a href="org/apache/daffodil/udf/package-frame.html" target="packageFrame">org.apache.daffodil.udf</a></li>
 <li><a href="org/apache/daffodil/udf/exceptions/package-frame.html" target="packageFrame">org.apache.daffodil.udf.exceptions</a></li>
 </ul>
diff --git a/content/docs/latest/javadoc/overview-summary.html b/content/docs/latest/javadoc/overview-summary.html
index 6c24b7f..3c26572 100644
--- a/content/docs/latest/javadoc/overview-summary.html
+++ b/content/docs/latest/javadoc/overview-summary.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Overview (Apache Daffodil 3.4.0 Java API)</title>
+<title>Overview (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="Overview (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -68,7 +68,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title"><h1>Apache Daffodil 3.4.0 Java API</h1></h1>
+<h1 class="title"><h1>Apache Daffodil 3.5.0 Java API</h1></h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
@@ -104,14 +104,10 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="org/apache/daffodil/japi/logger/package-summary.html">org.apache.daffodil.japi.logger</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="org/apache/daffodil/udf/package-summary.html">org.apache.daffodil.udf</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="org/apache/daffodil/udf/exceptions/package-summary.html">org.apache.daffodil.udf.exceptions</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/content/docs/latest/javadoc/overview-tree.html b/content/docs/latest/javadoc/overview-tree.html
index 1dfd21c..f0fa969 100644
--- a/content/docs/latest/javadoc/overview-tree.html
+++ b/content/docs/latest/javadoc/overview-tree.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Class Hierarchy (Apache Daffodil 3.4.0 Java API)</title>
+<title>Class Hierarchy (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="Class Hierarchy (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -75,7 +75,6 @@
 <li><a href="org/apache/daffodil/japi/debugger/package-tree.html">org.apache.daffodil.japi.debugger</a>, </li>
 <li><a href="org/apache/daffodil/japi/infoset/package-tree.html">org.apache.daffodil.japi.infoset</a>, </li>
 <li><a href="org/apache/daffodil/japi/io/package-tree.html">org.apache.daffodil.japi.io</a>, </li>
-<li><a href="org/apache/daffodil/japi/logger/package-tree.html">org.apache.daffodil.japi.logger</a>, </li>
 <li><a href="org/apache/daffodil/udf/package-tree.html">org.apache.daffodil.udf</a>, </li>
 <li><a href="org/apache/daffodil/udf/exceptions/package-tree.html">org.apache.daffodil.udf.exceptions</a></li>
 </ul>
@@ -97,7 +96,7 @@
 </ul>
 </li>
 <li type="circle">org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/Diagnostic.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">Diagnostic</span></a></li>
-<li type="circle">org.apache.daffodil.infoset.InfosetInputter (implements org.apache.daffodil.util.CursorImplMixin&lt;AccessorType&gt;, org.apache.daffodil.infoset.NextElementResolver)
+<li type="circle">org.apache.daffodil.runtime1.infoset.InfosetInputter (implements org.apache.daffodil.lib.util.CursorImplMixin&lt;AccessorType&gt;, org.apache.daffodil.runtime1.infoset.NextElementResolver)
 <ul>
 <li type="circle">org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetInputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">InfosetInputter</span></a>
 <ul>
@@ -114,7 +113,7 @@
 </li>
 </ul>
 </li>
-<li type="circle">org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">InfosetOutputter</span></a> (implements org.apache.daffodil.infoset.InfosetOutputter)
+<li type="circle">org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputter.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">InfosetOutputter</span></a> (implements org.apache.daffodil.runtime1.infoset.InfosetOutputter)
 <ul>
 <li type="circle">org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/InfosetOutputterProxy.html" title="class in org.apache.daffodil.japi.infoset"><span class="typeNameLink">InfosetOutputterProxy</span></a>
 <ul>
@@ -130,13 +129,6 @@
 </li>
 <li type="circle">org.apache.daffodil.japi.io.<a href="org/apache/daffodil/japi/io/InputSourceDataInputStream.html" title="class in org.apache.daffodil.japi.io"><span class="typeNameLink">InputSourceDataInputStream</span></a></li>
 <li type="circle">org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/LocationInSchemaFile.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">LocationInSchemaFile</span></a></li>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">LogWriter</span></a>
-<ul>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/ConsoleLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">ConsoleLogWriter</span></a></li>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/FileLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">FileLogWriter</span></a></li>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/NullLogWriter.html" title="class in org.apache.daffodil.japi.logger"><span class="typeNameLink">NullLogWriter</span></a></li>
-</ul>
-</li>
 <li type="circle">org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ProcessorFactory.ExperimentalWrapper.html" title="class in org.apache.daffodil.japi"><span class="typeNameLink">ProcessorFactory.ExperimentalWrapper</span></a></li>
 <li type="circle">java.lang.Throwable (implements java.io.Serializable)
 <ul>
@@ -188,7 +180,7 @@
 <li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <ul>
 <li type="circle">org.apache.daffodil.japi.<a href="org/apache/daffodil/japi/ValidationMode.html" title="enum in org.apache.daffodil.japi"><span class="typeNameLink">ValidationMode</span></a></li>
-<li type="circle">org.apache.daffodil.japi.logger.<a href="org/apache/daffodil/japi/logger/LogLevel.html" title="enum in org.apache.daffodil.japi.logger"><span class="typeNameLink">LogLevel</span></a></li>
+<li type="circle">org.apache.daffodil.japi.infoset.<a href="org/apache/daffodil/japi/infoset/XMLTextEscapeStyle.html" title="enum in org.apache.daffodil.japi.infoset"><span class="typeNameLink">XMLTextEscapeStyle</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/content/docs/latest/javadoc/package-list b/content/docs/latest/javadoc/package-list
index 5327c77..39b9bb5 100644
--- a/content/docs/latest/javadoc/package-list
+++ b/content/docs/latest/javadoc/package-list
@@ -2,6 +2,5 @@ org.apache.daffodil.japi
 org.apache.daffodil.japi.debugger
 org.apache.daffodil.japi.infoset
 org.apache.daffodil.japi.io
-org.apache.daffodil.japi.logger
 org.apache.daffodil.udf
 org.apache.daffodil.udf.exceptions
diff --git a/content/docs/latest/javadoc/serialized-form.html b/content/docs/latest/javadoc/serialized-form.html
index acea7d4..7851c75 100644
--- a/content/docs/latest/javadoc/serialized-form.html
+++ b/content/docs/latest/javadoc/serialized-form.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Serialized Form (Apache Daffodil 3.4.0 Java API)</title>
+<title>Serialized Form (Apache Daffodil 3.5.0 Java API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (Apache Daffodil 3.4.0 Java API)";
+            parent.document.title="Serialized Form (Apache Daffodil 3.5.0 Java API)";
         }
     }
     catch(err) {
@@ -129,264 +129,6 @@
 </li>
 <li class="blockList">
 <h2 title="Package">Package&nbsp;org.apache.daffodil.udf</h2>
-<ul class="blockList">
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionFatalErrorException">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionFatalErrorException extends org.apache.daffodil.exceptions.Abort implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialized Fields</h3>
-<ul class="blockList">
-<li class="blockList">
-<h4>description</h4>
-<pre>java.lang.String description</pre>
-</li>
-<li class="blockList">
-<h4>cause</h4>
-<pre>java.lang.Throwable cause</pre>
-</li>
-<li class="blockList">
-<h4>udfOfInterest</h4>
-<pre>java.lang.String udfOfInterest</pre>
-</li>
-<li class="blockList">
-<h4>providerOfInterest</h4>
-<pre>java.lang.String providerOfInterest</pre>
-</li>
-<li class="blockListLast">
-<h4>classesOfInterest</h4>
-<pre>scala.collection.immutable.List&lt;A&gt; classesOfInterest</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionFatalErrorException:D">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionFatalErrorException$ extends scala.runtime.AbstractFunction4&lt;java.lang.String,java.lang.Throwable,java.lang.String,java.lang.String,org.apache.daffodil.udf.UserDefinedFunctionFatalErrorException&gt; implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialization Methods</h3>
-<ul class="blockList">
-<li class="blockListLast">
-<h4>readResolve</h4>
-<pre>private&nbsp;java.lang.Object&nbsp;readResolve()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionProcessingErrorException">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionProcessingErrorException extends org.apache.daffodil.processors.ProcessingError implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialized Fields</h3>
-<ul class="blockList">
-<li class="blockList">
-<h4>schemaContext</h4>
-<pre>java.lang.Object schemaContext</pre>
-</li>
-<li class="blockListLast">
-<h4>dataContext</h4>
-<pre>java.lang.Object dataContext</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionProcessingErrorException:D">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionProcessingErrorException$ extends scala.runtime.AbstractFunction5&lt;java.lang.String,org.apache.daffodil.util.Maybe&lt;org.apache.daffodil.exceptions.SchemaFileLocation&gt;,org.apache.daffodil.util.Maybe&lt;org.apache.daffodil.api.DataLocation&gt;,org.apache.daffodil.util.Maybe&lt;java.lang.Throwable&gt;,org.apache.daffodil.util.Maybe&lt;java.lang.String&gt;,org.apache.daffodil.udf.UserDefinedFunctionProcessingErrorException&gt; imple [...]
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialization Methods</h3>
-<ul class="blockList">
-<li class="blockListLast">
-<h4>readResolve</h4>
-<pre>private&nbsp;java.lang.Object&nbsp;readResolve()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionService.EvaluateMethodInfo">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionService.EvaluateMethodInfo extends java.lang.Object implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialized Fields</h3>
-<ul class="blockList">
-<li class="blockList">
-<h4>evaluateMethod</h4>
-<pre>org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionMethod evaluateMethod</pre>
-</li>
-<li class="blockList">
-<h4>parameterTypes</h4>
-<pre>scala.collection.immutable.List&lt;A&gt; parameterTypes</pre>
-</li>
-<li class="blockListLast">
-<h4>returnType</h4>
-<pre>org.apache.daffodil.dpath.NodeInfo.Kind returnType</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionService.EvaluateMethodInfo:D">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionService.EvaluateMethodInfo$ extends scala.runtime.AbstractFunction3&lt;org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionMethod,scala.collection.immutable.List&lt;org.apache.daffodil.dpath.NodeInfo.Kind&gt;,org.apache.daffodil.dpath.NodeInfo.Kind,org.apache.daffodil.udf.UserDefinedFunctionService.EvaluateMethodInfo&gt; implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialization Methods</h3>
-<ul class="blockList">
-<li class="blockListLast">
-<h4>readResolve</h4>
-<pre>private&nbsp;java.lang.Object&nbsp;readResolve()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionCallingInfo">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionCallingInfo extends java.lang.Object implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialized Fields</h3>
-<ul class="blockList">
-<li class="blockList">
-<h4>udf</h4>
-<pre><a href="org/apache/daffodil/udf/UserDefinedFunction.html" title="interface in org.apache.daffodil.udf">UserDefinedFunction</a> udf</pre>
-</li>
-<li class="blockListLast">
-<h4>evalInfo</h4>
-<pre>org.apache.daffodil.udf.UserDefinedFunctionService.EvaluateMethodInfo evalInfo</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionCallingInfo:D">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionCallingInfo$ extends scala.runtime.AbstractFunction2&lt;<a href="org/apache/daffodil/udf/UserDefinedFunction.html" title="interface in org.apache.daffodil.udf">UserDefinedFunction</a>,org.apache.daffodil.udf.UserDefinedFunctionService.EvaluateMethodInfo,org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionCallingInfo&gt; implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialization Methods</h3>
-<ul class="blockList">
-<li class="blockListLast">
-<h4>readResolve</h4>
-<pre>private&nbsp;java.lang.Object&nbsp;readResolve()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionInfo">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionInfo extends java.lang.Object implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialized Fields</h3>
-<ul class="blockList">
-<li class="blockList">
-<h4>udfClass</h4>
-<pre>java.lang.Class&lt;T&gt; udfClass</pre>
-</li>
-<li class="blockList">
-<h4>provider</h4>
-<pre><a href="org/apache/daffodil/udf/UserDefinedFunctionProvider.html" title="class in org.apache.daffodil.udf">UserDefinedFunctionProvider</a> provider</pre>
-</li>
-<li class="blockListLast">
-<h4>evaluateMethodInfo</h4>
-<pre>org.apache.daffodil.udf.UserDefinedFunctionService.EvaluateMethodInfo evaluateMethodInfo</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionInfo:D">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionInfo$ extends scala.runtime.AbstractFunction3&lt;java.lang.Class&lt;?&gt;,<a href="org/apache/daffodil/udf/UserDefinedFunctionProvider.html" title="class in org.apache.daffodil.udf">UserDefinedFunctionProvider</a>,org.apache.daffodil.udf.UserDefinedFunctionService.EvaluateMethodInfo,org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionInfo&gt; implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialization Methods</h3>
-<ul class="blockList">
-<li class="blockListLast">
-<h4>readResolve</h4>
-<pre>private&nbsp;java.lang.Object&nbsp;readResolve()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionMethod">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionMethod extends java.lang.Object implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialization Methods</h3>
-<ul class="blockList">
-<li class="blockListLast">
-<h4>readObject</h4>
-<pre>private&nbsp;void&nbsp;readObject(java.io.ObjectInputStream&nbsp;arg0)
-                 throws java.io.IOException,
-                        java.lang.ClassNotFoundException</pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-<dd><code>java.lang.ClassNotFoundException</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-<li class="blockList">
-<h3>Serialized Fields</h3>
-<ul class="blockList">
-<li class="blockList">
-<h4>decClass</h4>
-<pre>java.lang.Class&lt;T&gt; decClass</pre>
-</li>
-<li class="blockList">
-<h4>methodName</h4>
-<pre>java.lang.String methodName</pre>
-</li>
-<li class="blockListLast">
-<h4>paramTypes</h4>
-<pre>java.lang.Class&lt;T&gt;[] paramTypes</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-<li class="blockList"><a name="org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionMethod:D">
-<!--   -->
-</a>
-<h3>Class org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionMethod$ extends scala.runtime.AbstractFunction3&lt;java.lang.Class&lt;?&gt;,java.lang.String,java.lang.Class&lt;?&gt;[],org.apache.daffodil.udf.UserDefinedFunctionService.UserDefinedFunctionMethod&gt; implements Serializable</h3>
-<ul class="blockList">
-<li class="blockList">
-<h3>Serialization Methods</h3>
-<ul class="blockList">
-<li class="blockListLast">
-<h4>readResolve</h4>
-<pre>private&nbsp;java.lang.Object&nbsp;readResolve()</pre>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
 </li>
 <li class="blockList">
 <h2 title="Package">Package&nbsp;org.apache.daffodil.udf.exceptions</h2>
diff --git a/content/docs/latest/scaladoc/index.html b/content/docs/latest/scaladoc/index.html
index fff2bc7..db5bea8 100644
--- a/content/docs/latest/scaladoc/index.html
+++ b/content/docs/latest/scaladoc/index.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API </title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API " />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API " />
+          <title>Apache Daffodil 3.5.0 Scala API </title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API " />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API " />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
diff --git a/content/docs/latest/scaladoc/index.js b/content/docs/latest/scaladoc/index.js
index 2a0e325..b3dd5b8 100644
--- a/content/docs/latest/scaladoc/index.js
+++ b/content/docs/latest/scaladoc/index.js
@@ -1 +1 @@
-Index.PACKAGES = {"org.apache.daffodil.sapi.logger" : [{"name" : "org.apache.daffodil.sapi.logger.ConsoleLogWriter", "shortDescription" : "LogWriter that writes log messages to stdout", "members_class" : [{"label" : "write", "tail" : "(level: LogLevel.Value, logID: String, msg: String): Unit", "member" : "org.apache.daffodil.sapi.logger.ConsoleLogWriter.write", "link" : "org\/apache\/daffodil\/sapi\/logger\/ConsoleLogWriter.html#write(level:org.apache.daffodil.sapi.logger.LogLevel.Value, [...]
\ No newline at end of file
+Index.PACKAGES = {"org.apache.daffodil.sapi" : [{"name" : "org.apache.daffodil.sapi.Compiler", "shortDescription" : "Compile DFDL schemas into ProcessorFactory's or reload saved parsers into DataProcessor's.", "members_class" : [{"label" : "withTunables", "tail" : "(tunables: Map[String, String]): Compiler", "member" : "org.apache.daffodil.sapi.Compiler.withTunables", "link" : "org\/apache\/daffodil\/sapi\/Compiler.html#withTunables(tunables:Map[String,String]):org.apache.daffodil.sapi.C [...]
\ No newline at end of file
diff --git a/content/docs/latest/scaladoc/lib/jquery.min.js b/content/docs/latest/scaladoc/lib/jquery.min.js
index c4c6022..0de648e 100644
--- a/content/docs/latest/scaladoc/lib/jquery.min.js
+++ b/content/docs/latest/scaladoc/lib/jquery.min.js
@@ -1,2 +1,2 @@
-/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l= [...]
+/*! jQuery v3.6.4 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,y=n.hasOwnProperty,a=y.toString,l= [...]
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/index.html b/content/docs/latest/scaladoc/org/apache/daffodil/index.html
index 82d19cd..b6bd5bb 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/index.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/index.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/Compiler.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/Compiler.html
index 132b80d..b5052a1 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/Compiler.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/Compiler.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.Compiler</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.Compiler" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.Compiler" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.Compiler</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.Compiler" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.Compiler" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="DaffodilParseXMLReader.html" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="DaffodilXMLEntityResolver$.html" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
@@ -993,164 +977,7 @@ a java.nio.channels.ReadableByteChannel for a saved parser.
 
         
 
-        <div class="values members">
-              <h3>Deprecated Value Members</h3>
-              <ol><li name="org.apache.daffodil.sapi.Compiler#setDistinguishedRootNode" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="setDistinguishedRootNode(name:String,namespace:String):Unit"></a><a id="setDistinguishedRootNode(String,String):Unit"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/Compiler.html#setDistinguishedRootNode(name:String,namespace:String):Unit" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 2.6.0) Pass arguments to compileSource, or compileFile.">setDistinguishedRootNode</span><span class="params">(<span name="name">name: <span class="extype" name="scala.Predef.String">String</span></span>, <span name="namespace">namespace: <span class="extype" name="scala.Predef.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Specify a global element to be the root of DFDL Schema to start parsing
-</p><div class="fullcomment"><div class="comment cmt"><p>Specify a global element to be the root of DFDL Schema to start parsing
-</p></div><dl class="paramcmts block"><dt class="param">name</dt><dd class="cmt"><p>name of the root node</p></dd><dt class="param">namespace</dt><dd class="cmt"><p>namespace of the root node. Set to empty string to specify
-                 no namespace. Set to to NULL to figure out the namespace.</p></dd></dl><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 2.6.0)</i> Pass arguments to compileSource, or compileFile.</p></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.Compiler#setExternalDFDLVariable" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="setExternalDFDLVariable(name:String,namespace:String,value:String):Unit"></a><a id="setExternalDFDLVariable(String,String,String):Unit"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/Compiler.html#setExternalDFDLVariable(name:String,namespace:String,value:String):Unit" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 2.6.0) Use DataProcessor.setExternalVariables">setExternalDFDLVariable</span><span class="params">(<span name="name">name: <span class="extype" name="scala.Predef.String">String</span></span>, <span name="namespace">namespace: <span class="extype" name="scala.Predef.String">String</span></span>, <span name="value">value: <span class="extype" name="scala.Predef.String">String</span></span>)</span><span class="result"> [...]
-      </span>
-      
-      <p class="shortcomment cmt">Set the value of a DFDL variable
-</p><div class="fullcomment"><div class="comment cmt"><p>Set the value of a DFDL variable
-</p></div><dl class="paramcmts block"><dt class="param">name</dt><dd class="cmt"><p>name of the variable</p></dd><dt class="param">namespace</dt><dd class="cmt"><p>namespace of the variable. Set to empty string to specify
-                 no namespace. Set to to NULL to figure out the namespace.</p></dd><dt class="param">value</dt><dd class="cmt"><p>value to so the variable to</p></dd></dl><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 2.6.0)</i> Use DataProcessor.setExternalVariables</p></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.Compiler#setExternalDFDLVariables" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="setExternalDFDLVariables(extVarsFile:java.io.File):Unit"></a><a id="setExternalDFDLVariables(File):Unit"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/Compiler.html#setExternalDFDLVariables(extVarsFile:java.io.File):Unit" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 2.6.0) Use DataProcessor.setExternalVariables">setExternalDFDLVariables</span><span class="params">(<span name="extVarsFile">extVarsFile: <span class="extype" name="java.io.File">File</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Read external variables from a Daffodil configuration file
-</p><div class="fullcomment"><div class="comment cmt"><p>Read external variables from a Daffodil configuration file
-</p></div><dl class="paramcmts block"><dt class="param">extVarsFile</dt><dd class="cmt"><p>file to read DFDL variables from.</p></dd></dl><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 2.6.0)</i> Use DataProcessor.setExternalVariables</p></dd><dt>See also</dt><dd><span class="cmt"><p><a target="_blank" href='https://daffodil.apache.org/configuration/'>Daffodil Configuration File</a> - Daffodil configuration file format</p></span></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.Compiler#setExternalDFDLVariables" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="setExternalDFDLVariables(extVarsMap:Map[String,String]):Unit"></a><a id="setExternalDFDLVariables(Map[String,String]):Unit"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/Compiler.html#setExternalDFDLVariables(extVarsMap:Map[String,String]):Unit" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 2.6.0) Use DataProcessor.setExternalVariables">setExternalDFDLVariables</span><span class="params">(<span name="extVarsMap">extVarsMap: <span class="extype" name="scala.Predef.Map">Map</span>[<span class="extype" name="scala.Predef.String">String</span>, <span class="extype" name="scala.Predef.String">String</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Set the value of multiple DFDL variables
-</p><div class="fullcomment"><div class="comment cmt"><p>Set the value of multiple DFDL variables
-</p></div><dl class="paramcmts block"><dt class="param">extVarsMap</dt><dd class="cmt"><p>a may of key/value pairs, where the key is the variable
-                  name, and the value is the value of the variable. The key
-                  may be preceded by a string of the form &quot;{namespace}&quot; to
-                  define a namespace for the variable. If preceded with &quot;{}&quot;,
-                  then no namespace is used. With not preceded by &quot;{namespace}&quot;,
-                  then Daffodil will figure out the namespace.</p></dd></dl><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 2.6.0)</i> Use DataProcessor.setExternalVariables</p></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.Compiler#setTunable" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="setTunable(tunable:String,value:String):Unit"></a><a id="setTunable(String,String):Unit"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/Compiler.html#setTunable(tunable:String,value:String):Unit" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 2.6.0) Use withTunable.">setTunable</span><span class="params">(<span name="tunable">tunable: <span class="extype" name="scala.Predef.String">String</span></span>, <span name="value">value: <span class="extype" name="scala.Predef.String">String</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Set a Daffodil tunable parameter
-</p><div class="fullcomment"><div class="comment cmt"><p>Set a Daffodil tunable parameter
-</p></div><dl class="paramcmts block"><dt class="param">tunable</dt><dd class="cmt"><p>name of the tunable parameter to set.</p></dd><dt class="param">value</dt><dd class="cmt"><p>value of the tunable parameter to set</p></dd></dl><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 2.6.0)</i> Use withTunable.</p></dd><dt>See also</dt><dd><span class="cmt"><p><a target="_blank" href='https://daffodil.apache.org/configuration/#tunable-parameters'>Tunable Parameters</a> - list of tunables names of default values</p></span></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.Compiler#setTunables" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="setTunables(tunables:Map[String,String]):Unit"></a><a id="setTunables(Map[String,String]):Unit"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/Compiler.html#setTunables(tunables:Map[String,String]):Unit" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 2.6.0) Use withTunables.">setTunables</span><span class="params">(<span name="tunables">tunables: <span class="extype" name="scala.Predef.Map">Map</span>[<span class="extype" name="scala.Predef.String">String</span>, <span class="extype" name="scala.Predef.String">String</span>]</span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Set the value of multiple tunable parameters
-</p><div class="fullcomment"><div class="comment cmt"><p>Set the value of multiple tunable parameters
-</p></div><dl class="paramcmts block"><dt class="param">tunables</dt><dd class="cmt"><p>a map of key/value pairs, where the key is the tunable name and the value is the value to set it to</p></dd></dl><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 2.6.0)</i> Use withTunables.</p></dd><dt>See also</dt><dd><span class="cmt"><p><a target="_blank" href='https://daffodil.apache.org/configuration/#tunable-parameters'>Tunable Parameters</a> - list of tunables names of default values</p></span></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.Compiler#setValidateDFDLSchemas" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="setValidateDFDLSchemas(value:Boolean):Unit"></a><a id="setValidateDFDLSchemas(Boolean):Unit"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/Compiler.html#setValidateDFDLSchemas(value:Boolean):Unit" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 2.6.0) Do not use this method. DFDL schema validation should be performed.">setValidateDFDLSchemas</span><span class="params">(<span name="value">value: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Enable/disable DFDL validation of resulting infoset with the DFDL schema
-</p><div class="fullcomment"><div class="comment cmt"><p>Enable/disable DFDL validation of resulting infoset with the DFDL schema
-</p></div><dl class="paramcmts block"><dt class="param">value</dt><dd class="cmt"><p>true to enable validation, false to disabled</p></dd></dl><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 2.6.0)</i> Do not use this method. DFDL schema validation should be performed.</p></dd></dl></div>
-    </li></ol>
-            </div>
+        
         </div>
 
         <div id="inheritedMembers">
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/Daffodil$.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/Daffodil$.html
index 47150b0..265076a 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/Daffodil$.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/Daffodil$.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.Daffodil</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.Daffodil" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.Daffodil" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.Daffodil</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.Daffodil" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.Daffodil" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="DaffodilParseXMLReader.html" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="DaffodilXMLEntityResolver$.html" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
@@ -883,48 +867,7 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
 
         
 
-        <div class="values members">
-              <h3>Deprecated Value Members</h3>
-              <ol><li name="org.apache.daffodil.sapi.Daffodil#setLogWriter" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="setLogWriter(lw:org.apache.daffodil.sapi.logger.LogWriter):Unit"></a><a id="setLogWriter(LogWriter):Unit"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/Daffodil$.html#setLogWriter(lw:org.apache.daffodil.sapi.logger.LogWriter):Unit" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 3.2.0) Use Log4j for logging">setLogWriter</span><span class="params">(<span name="lw">lw: <a href="logger/LogWriter.html" class="extype" name="org.apache.daffodil.sapi.logger.LogWriter">LogWriter</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Set the LogWriter to use to capture logging messages from Daffodil</p><div class="fullcomment"><div class="comment cmt"><p>Set the LogWriter to use to capture logging messages from Daffodil</p></div><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 3.2.0)</i> Use Log4j for logging</p></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.Daffodil#setLoggingLevel" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="setLoggingLevel(lvl:org.apache.daffodil.sapi.logger.LogLevel.Value):Unit"></a><a id="setLoggingLevel(logger.LogLevel.Value):Unit"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/Daffodil$.html#setLoggingLevel(lvl:org.apache.daffodil.sapi.logger.LogLevel.Value):Unit" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 3.2.0) Use Log4j for logging">setLoggingLevel</span><span class="params">(<span name="lvl">lvl: <a href="logger/LogLevel$.html#ValueextendsOrdered[Enumeration.this.Value]withSerializable" class="extmbr" name="org.apache.daffodil.sapi.logger.LogLevel.Value">logger.LogLevel.Value</a></span>)</span><span class="result">: <span class="extype" name="scala.Unit">Unit</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Set the maximum logging level</p><div class="fullcomment"><div class="comment cmt"><p>Set the maximum logging level</p></div><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 3.2.0)</i> Use Log4j for logging</p></dd></dl></div>
-    </li></ol>
-            </div>
+        
         </div>
 
         <div id="inheritedMembers">
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilParseXMLReader$.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilParseXMLReader$.html
index 8f5730b..532c437 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilParseXMLReader$.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilParseXMLReader$.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.DaffodilParseXMLReader</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.DaffodilParseXMLReader" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.DaffodilParseXMLReader" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.DaffodilParseXMLReader</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.DaffodilParseXMLReader" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.DaffodilParseXMLReader" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="DaffodilParseXMLReader.html" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="DaffodilXMLEntityResolver$.html" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilParseXMLReader.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilParseXMLReader.html
index faff8f9..2c37bd8 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilParseXMLReader.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilParseXMLReader.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.DaffodilParseXMLReader</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.DaffodilParseXMLReader" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.DaffodilParseXMLReader" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.DaffodilParseXMLReader</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.DaffodilParseXMLReader" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.DaffodilParseXMLReader" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="DaffodilXMLEntityResolver$.html" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnhandledSAXException.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnhandledSAXException.html
index 935c919..6b04b8b 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnhandledSAXException.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnhandledSAXException.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.DaffodilUnhandledSAXException</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.DaffodilUnhandledSAXException" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.DaffodilUnhandledSAXException" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.DaffodilUnhandledSAXException</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.DaffodilUnhandledSAXException" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.DaffodilUnhandledSAXException" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="DaffodilParseXMLReader.html" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="DaffodilXMLEntityResolver$.html" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
@@ -453,7 +437,10 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
       </h4>
 
       
-          <div id="comment" class="fullcommenttop"><div class="comment cmt"><p>This exception will be thrown when an unexpected error occurs during the SAX unparse
+          <div id="comment" class="fullcommenttop"><div class="comment cmt"><p>This exception is thrown when and unexpected error occurs while unparsing an
+infoset with an XMLReader and a DaffodilUnparseContentHandler. If caught,
+the DaffodilUnparseContentHandler.getUnparseResult returns null. This most
+likely represents a bug in Daffodil.
 </p></div><div class="toggleContainer block">
           <span class="toggle">
             Linear Supertypes
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnparseContentHandler.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnparseContentHandler.html
index 2262bc3..16cef76 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnparseContentHandler.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnparseContentHandler.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.DaffodilUnparseContentHandler</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.DaffodilUnparseContentHandler" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.DaffodilUnparseContentHandler" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.DaffodilUnparseContentHandler</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.DaffodilUnparseContentHandler" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.DaffodilUnparseContentHandler" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="DaffodilParseXMLReader.html" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="DaffodilXMLEntityResolver$.html" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnparseErrorSAXException.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnparseErrorSAXException.html
index 63d54a0..c350b97 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnparseErrorSAXException.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilUnparseErrorSAXException.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.DaffodilUnparseErrorSAXException</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.DaffodilUnparseErrorSAXException" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.DaffodilUnparseErrorSAXException" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.DaffodilUnparseErrorSAXException</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.DaffodilUnparseErrorSAXException" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.DaffodilUnparseErrorSAXException" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="DaffodilParseXMLReader.html" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="DaffodilXMLEntityResolver$.html" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
@@ -453,7 +437,10 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
       </h4>
 
       
-          <div id="comment" class="fullcommenttop"><div class="comment cmt"><p>This exception will be thrown when unparseResult.isError returns true during a SAX Unparse
+          <div id="comment" class="fullcommenttop"><div class="comment cmt"><p>This exception is thrown when UnparseResult.isError returns true while
+unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler. If
+caught, the DaffodilUnparseContentHandler.getUnparseResult function can be
+used to get the UnparseResult and error diagnostics
 </p></div><div class="toggleContainer block">
           <span class="toggle">
             Linear Supertypes
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilXMLEntityResolver$.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilXMLEntityResolver$.html
index 227c1c8..7c35847 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilXMLEntityResolver$.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DaffodilXMLEntityResolver$.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.DaffodilXMLEntityResolver</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.DaffodilXMLEntityResolver" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.DaffodilXMLEntityResolver" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.DaffodilXMLEntityResolver</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.DaffodilXMLEntityResolver" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.DaffodilXMLEntityResolver" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="DaffodilParseXMLReader.html" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DataLocation.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DataLocation.html
index fdaf461..742719a 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DataLocation.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DataLocation.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.DataLocation</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.DataLocation" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.DataLocation" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.DataLocation</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.DataLocation" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.DataLocation" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="DaffodilParseXMLReader.html" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="DaffodilXMLEntityResolver$.html" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
@@ -901,34 +885,7 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
 
         
 
-        <div class="values members">
-              <h3>Deprecated Value Members</h3>
-              <ol><li name="org.apache.daffodil.sapi.DataLocation#isAtEnd" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="isAtEnd():Boolean"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/DataLocation.html#isAtEnd():Boolean" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 3.1.0) Use comparison of bitPos1b() with expected position instead.">isAtEnd</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Determine if we're positioned at the end of data.</p><div class="fullcomment"><div class="comment cmt"><p>Determine if we're positioned at the end of data.</p><p>Blocks until either one byte of data can be read, or end-of-data
-is encountered.</p><p>It is generally not advised to use this on network TCP data streams
-as it will block waiting for the sender of data to provide more data
-or close the stream.
-</p></div><dl class="paramcmts block"><dt>returns</dt><dd class="cmt"><p>boolean indicating whether we are known to be positioned at
-        the end of data.</p></dd></dl><dl class="attributes block"> <dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 3.1.0)</i> Use comparison of bitPos1b() with expected position instead.</p></dd></dl></div>
-    </li></ol>
-            </div>
+        
         </div>
 
         <div id="inheritedMembers">
diff --git a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DataProcessor.html b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DataProcessor.html
index effebc4..7f13af7 100644
--- a/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DataProcessor.html
+++ b/content/docs/latest/scaladoc/org/apache/daffodil/sapi/DataProcessor.html
@@ -3,9 +3,9 @@
         <head>
           <meta http-equiv="X-UA-Compatible" content="IE=edge" />
           <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-          <title>Apache Daffodil 3.4.0 Scala API  - org.apache.daffodil.sapi.DataProcessor</title>
-          <meta name="description" content="Apache Daffodil 3.4.0 Scala API - org.apache.daffodil.sapi.DataProcessor" />
-          <meta name="keywords" content="Apache Daffodil 3.4.0 Scala API org.apache.daffodil.sapi.DataProcessor" />
+          <title>Apache Daffodil 3.5.0 Scala API  - org.apache.daffodil.sapi.DataProcessor</title>
+          <meta name="description" content="Apache Daffodil 3.5.0 Scala API - org.apache.daffodil.sapi.DataProcessor" />
+          <meta name="keywords" content="Apache Daffodil 3.5.0 Scala API org.apache.daffodil.sapi.DataProcessor" />
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
           
       
@@ -28,7 +28,7 @@
         </head>
         <body>
       <div id="search">
-        <span id="doc-title">Apache Daffodil 3.4.0 Scala API<span id="doc-version"></span></span>
+        <span id="doc-title">Apache Daffodil 3.5.0 Scala API<span id="doc-version"></span></span>
         <span class="close-results"><span class="left">&lt;</span> Back</span>
         <div id="textfilter">
           <span class="input">
@@ -332,22 +332,6 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <a title="" href="io/index.html"><span class="name">io</span></a>
       </span>
       
-      <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.logger" visbl="pub" class="indented5 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="logger"></a><a id="logger:logger"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/logger/index.html" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">package</span>
-      </span>
-      <span class="symbol">
-        <a title="" href="logger/index.html"><span class="name">logger</span></a>
-      </span>
-      
       <div class="fullcomment"><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="index.html" class="extype" name="org.apache.daffodil.sapi">sapi</a></dd></dl></div>
     </li><li class="current-entities indented4">
                         <span class="separator"></span>
@@ -363,16 +347,16 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
                         <a href="DaffodilParseXMLReader.html" title="SAX Method of parsing schema and getting the DFDL Infoset via designated org.xml.sax.ContentHandler, based on the org.xml.sax.XMLReader interface">DaffodilParseXMLReader</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse"></a>
-                        <a href="DaffodilUnhandledSAXException.html" title="This exception will be thrown when an unexpected error occurs during the SAX unparse">DaffodilUnhandledSAXException</a>
+                        <a class="class" href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnhandledSAXException.html" title="This exception is thrown when and unexpected error occurs while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnhandledSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="class" href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing"></a>
                         <a href="DaffodilUnparseContentHandler.html" title="Accepts SAX callback events from any SAX XMLReader for unparsing">DaffodilUnparseContentHandler</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
-                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse"></a>
-                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception will be thrown when unparseResult.isError returns true during a SAX Unparse">DaffodilUnparseErrorSAXException</a>
+                        <a class="class" href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler."></a>
+                        <a href="DaffodilUnparseErrorSAXException.html" title="This exception is thrown when UnparseResult.isError returns true while unparsing an infoset with an XMLReader and a DaffodilUnparseContentHandler.">DaffodilUnparseErrorSAXException</a>
                       </li><li class="current-entities indented4">
                         <span class="separator"></span>
                         <a class="object" href="DaffodilXMLEntityResolver$.html" title="Returns the EntityResolver used by Daffodil to resolve import/include schemaLocations."></a>
@@ -979,9 +963,9 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
               
         </dd></dl></div>
     </li><li name="org.apache.daffodil.sapi.DataProcessor#withDebugger" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="withDebugger(dbg:org.apache.daffodil.debugger.Debugger):org.apache.daffodil.sapi.DataProcessor"></a><a id="withDebugger(Debugger):DataProcessor"></a>
+      <a id="withDebugger(dbg:org.apache.daffodil.runtime1.debugger.Debugger):org.apache.daffodil.sapi.DataProcessor"></a><a id="withDebugger(Debugger):DataProcessor"></a>
       <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/DataProcessor.html#withDebugger(dbg:org.apache.daffodil.debugger.Debugger):org.apache.daffodil.sapi.DataProcessor" title="Permalink">
+      <a href="../../../../org/apache/daffodil/sapi/DataProcessor.html#withDebugger(dbg:org.apache.daffodil.runtime1.debugger.Debugger):org.apache.daffodil.sapi.DataProcessor" title="Permalink">
         <i class="material-icons"></i>
       </a>
     </span>
@@ -990,7 +974,7 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <span class="kind">def</span>
       </span>
       <span class="symbol">
-        <span class="name">withDebugger</span><span class="params">(<span name="dbg">dbg: <span class="extype" name="org.apache.daffodil.debugger.Debugger">Debugger</span></span>)</span><span class="result">: <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a></span>
+        <span class="name">withDebugger</span><span class="params">(<span name="dbg">dbg: <span class="extype" name="org.apache.daffodil.runtime1.debugger.Debugger">Debugger</span></span>)</span><span class="result">: <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a></span>
       </span>
       
       <p class="shortcomment cmt">Obtain a new <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a> with a specified debugger.</p><div class="fullcomment"><div class="comment cmt"><p>Obtain a new <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a> with a specified debugger.
@@ -1027,7 +1011,7 @@ an infoset. A new InfosetOutputter is required for each call to unparse().
         <span class="name">withDebugging</span><span class="params">(<span name="flag">flag: <span class="extype" name="scala.Boolean">Boolean</span></span>)</span><span class="result">: <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a></span>
       </span>
       
-      <p class="shortcomment cmt">Obtain a new <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a> instance with debugging enabled or disabled.</p><div class="fullcomment"><div class="comment cmt"><p>Obtain a new <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a> instance with debugging enabled or disabled.</p><p>Before enabling, <a href="#withDebugger(dbg:org.apache.daffodil.debugger.Debugger):org.apache.daffod [...]
+      <p class="shortcomment cmt">Obtain a new <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a> instance with debugging enabled or disabled.</p><div class="fullcomment"><div class="comment cmt"><p>Obtain a new <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a> instance with debugging enabled or disabled.</p><p>Before enabling, <a href="#withDebugger(dbg:org.apache.daffodil.runtime1.debugger.Debugger):org.apac [...]
 a <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a> with a non-null debugger.
 </p></div><dl class="paramcmts block"><dt class="param">flag</dt><dd class="cmt"><p>true to enable debugging, false to disabled</p></dd></dl></div>
     </li><li name="org.apache.daffodil.sapi.DataProcessor#withExternalVariables" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
@@ -1107,9 +1091,9 @@ a <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataPr
               
         </dd><dt>Exceptions thrown</dt><dd><span class="cmt"><p><a href="InvalidUsageException.html" class="extype" name="org.apache.daffodil.sapi.InvalidUsageException"><code>InvalidUsageException</code></a> if mode is not a valid ValidateMode value</p></span></dd></dl></div>
     </li><li name="org.apache.daffodil.sapi.DataProcessor#withValidator" visbl="pub" class="indented0 " data-isabs="false" fullComment="no" group="Ungrouped">
-      <a id="withValidator(validator:org.apache.daffodil.api.Validator):org.apache.daffodil.sapi.DataProcessor"></a><a id="withValidator(Validator):DataProcessor"></a>
+      <a id="withValidator(validator:org.apache.daffodil.lib.api.Validator):org.apache.daffodil.sapi.DataProcessor"></a><a id="withValidator(Validator):DataProcessor"></a>
       <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/DataProcessor.html#withValidator(validator:org.apache.daffodil.api.Validator):org.apache.daffodil.sapi.DataProcessor" title="Permalink">
+      <a href="../../../../org/apache/daffodil/sapi/DataProcessor.html#withValidator(validator:org.apache.daffodil.lib.api.Validator):org.apache.daffodil.sapi.DataProcessor" title="Permalink">
         <i class="material-icons"></i>
       </a>
     </span>
@@ -1118,7 +1102,7 @@ a <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataPr
         <span class="kind">def</span>
       </span>
       <span class="symbol">
-        <span class="name">withValidator</span><span class="params">(<span name="validator">validator: <span class="extype" name="org.apache.daffodil.api.Validator">Validator</span></span>)</span><span class="result">: <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a></span>
+        <span class="name">withValidator</span><span class="params">(<span name="validator">validator: <span class="extype" name="org.apache.daffodil.lib.api.Validator">Validator</span></span>)</span><span class="result">: <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataProcessor</a></span>
       </span>
       
       
@@ -1128,260 +1112,7 @@ a <a href="" class="extype" name="org.apache.daffodil.sapi.DataProcessor">DataPr
 
         
 
-        <div class="values members">
-              <h3>Deprecated Value Members</h3>
-              <ol><li name="org.apache.daffodil.sapi.WithDiagnostics#canProceed" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="canProceed():Boolean"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/DataProcessor.html#canProceed():Boolean" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
-    </span>
-      <span class="modifier_kind">
-        <span class="modifier"></span>
-        <span class="kind">def</span>
-      </span>
-      <span class="symbol">
-        <span class="name deprecated" title="Deprecated: (Since version 2.0.0) Use !isError() to determine if it is safe to proceed">canProceed</span><span class="params">()</span><span class="result">: <span class="extype" name="scala.Boolean">Boolean</span></span>
-      </span>
-      
-      <p class="shortcomment cmt">Determine if this object can be used in any future parse activities
-</p><div class="fullcomment"><div class="comment cmt"><p>Determine if this object can be used in any future parse activities
-</p></div><dl class="paramcmts block"><dt>returns</dt><dd class="cmt"><p>true it is safe to proceed, false otherwise</p></dd></dl><dl class="attributes block"> <dt>Definition Classes</dt><dd><a href="WithDiagnostics.html" class="extype" name="org.apache.daffodil.sapi.WithDiagnostics">WithDiagnostics</a></dd><dt>Annotations</dt><dd>
-                <span class="name">@deprecated</span>
-              
-        </dd><dt>Deprecated</dt><dd class="cmt"><p><i>(Since version 2.0.0)</i> Use !isError() to determine if it is safe to proceed</p></dd></dl></div>
-    </li><li name="org.apache.daffodil.sapi.DataProcessor#parse" visbl="pub" class="indented0 " data-isabs="false" fullComment="yes" group="Ungrouped">
-      <a id="parse(input:java.nio.channels.ReadableByteChannel,output:org.apache.daffodil.sapi.infoset.InfosetOutputter):org.apache.daffodil.sapi.ParseResult"></a><a id="parse(ReadableByteChannel,InfosetOutputter):ParseResult"></a>
-      <span class="permalink">
-      <a href="../../../../org/apache/daffodil/sapi/DataProcessor.html#parse(input:java.nio.channels.ReadableByteChannel,output:org.apache.daffodil.sapi.infoset.InfosetOutputter):org.apache.daffodil.sapi.ParseResult" title="Permalink">
-        <i class="material-icons"></i>
-      </a>
... 13433 lines suppressed ...