This is an automated email from the ASF dual-hosted git repository.
olabusayo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/main by this push:
new ed70d60a4 Remove UDF module and migrate content to core module
ed70d60a4 is described below
commit ed70d60a4fe3abb049b387baa21db82ad77893a9
Author: olabusayoT <[email protected]>
AuthorDate: Mon Aug 11 17:07:24 2025 -0400
Remove UDF module and migrate content to core module
- delete `daffodil-udf` module
- move UDF-related code and documentation to `daffodil-core`
- update build definitions and dependencies
- adjust tests, paths, and references to align with the migration
- clean up redundant files and update documentation
DAFFODIL-2994
---
.sonar-project.properties | 2 +-
DEVELOP.md | 7 +-
build.sbt | 15 +-
.../daffodil/api/udf/UserDefinedFunction.java | 0
.../api/udf/UserDefinedFunctionIdentification.java | 0
.../api/udf/UserDefinedFunctionProvider.java | 0
.../UserDefinedFunctionFatalException.java | 0
.../UserDefinedFunctionProcessingError.java | 0
.../org/apache/daffodil/api/udf/package-info.java | 147 +++++++++++++++
.../annotations/StringFunctions/Compare.java | 0
.../badudfs/annotations/StringFunctions/FuncB.java | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../annotations/StringFunctions/Replace.java | 0
.../StringFunctions/StringFunctionsProvider.java | 0
.../badudfs/evaluate/StringFunctions/FuncA.java | 0
.../badudfs/evaluate/StringFunctions/FuncB.java | 0
.../badudfs/evaluate/StringFunctions/FuncC.java | 0
.../badudfs/evaluate/StringFunctions/FuncD.java | 0
.../badudfs/evaluate/StringFunctions/FuncE.java | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../badudfs/evaluate/StringFunctions/Replace.java | 0
.../StringFunctions/StringFunctionsProvider.java | 0
.../functionclasses1/StringFunctions/FuncA.java | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../functionclasses1/StringFunctions/Replace.java | 0
.../StringFunctions/StringFunctionsProvider.java | 0
.../functionclasses2/StringFunctions/FuncA.java | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../functionclasses2/StringFunctions/Replace.java | 0
.../StringFunctions/StringFunctionsProvider.java | 0
.../org/badudfs/nonUDF/StringFunctions/FuncA.java | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../badudfs/nonUDF/StringFunctions/Replace.java | 0
.../StringFunctions/StringFunctionsProvider.java | 0
.../jgoodudfs/example/StringFunctions/Compare.java | 0
.../jgoodudfs/example/StringFunctions/Replace.java | 0
.../StringFunctions/StringFunctionsProvider.java | 0
.../org/apache/daffodil/udf/genericUdfSchema.xsd | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../StringFunctions/StringFunctionsProvider.scala | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../StringFunctions/StringFunctionsProvider.scala | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../StringFunctions/StringFunctionsProvider.scala | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../StringFunctions/StringFunctionsProvider.scala | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../StringFunctions/StringFunctionsProvider.scala | 0
...he.daffodil.api.udf.UserDefinedFunctionProvider | 0
.../StringFunctions/StringFunctionsProvider.scala | 0
.../IntegerFunctionsProvider.scala | 0
.../StringFunctions/StringFunctionsProvider.scala | 0
.../SupportedTypesFunctionsProvider.scala | 0
daffodil-layers/README.md | 21 ---
.../apache/daffodil/cliTest/TestCLIPlugins.scala | 4 +-
.../org/apache/daffodil/cliTest/TestCLIUdfs.scala | 68 +++----
daffodil-udf/README.md | 149 ---------------
daffodil-udf/src/main/resources/META-INF/LICENSE | 202 ---------------------
daffodil-udf/src/main/resources/META-INF/NOTICE | 10 -
62 files changed, 190 insertions(+), 435 deletions(-)
diff --git a/.sonar-project.properties b/.sonar-project.properties
index 67ef3cf11..1ece3a3d1 100644
--- a/.sonar-project.properties
+++ b/.sonar-project.properties
@@ -14,7 +14,7 @@
# limitations under the License.
sonar.organization=apache
sonar.projectKey=apache-daffodil
-sonar.modules=daffodil-cli,daffodil-codegen-c,daffodil-core,daffodil-macro-lib,daffodil-propgen,daffodil-schematron,daffodil-slf4j-logger,daffodil-tdml-lib,daffodil-tdml-processor,daffodil-test,daffodil-test-ibm1,daffodil-test-integration,daffodil-udf
+sonar.modules=daffodil-cli,daffodil-codegen-c,daffodil-core,daffodil-macro-lib,daffodil-propgen,daffodil-schematron,daffodil-slf4j-logger,daffodil-tdml-lib,daffodil-tdml-processor,daffodil-test,daffodil-test-ibm1,daffodil-test-integration
sonar.sources=src/main
sonar.tests=src/test
sonar.c.file.suffixes=-
diff --git a/DEVELOP.md b/DEVELOP.md
index 81a110344..eb0062f23 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -227,7 +227,7 @@ daffodil/
├── daffodil-codegen-c/ - Contains Daffodil's C code generator
├── daffodil-macro-lib/ - Defines Daffodil's Scala 2.x macros
├── daffodil-propgen/ - Contains generators to generate more source
code
-├── daffodil-core/ - Contains Daffodil's input/output/charsets,
Scala parser, schema compiler, utilities, layers, unparsers and the API
+├── daffodil-core/ - Contains Daffodil's input/output/charsets,
Scala parser, schema compiler, utilities, layers, udfs, unparsers and the API
├── daffodil-schematron/
│ ├── README.md - Explains how to validate with Schematron
rules
│ └── src/ - Contains Daffodil's Schematron validator
@@ -235,9 +235,6 @@ daffodil/
├── daffodil-tdml-processor/ - Contains Daffodil's Scala & C TDML
implementations
├── daffodil-test/ - Contains Daffodil's TDML tests
├── daffodil-test-ibm1/ - Contains more TDML tests from IBM & Tresys
-├── daffodil-udf/
-│ ├── README.md - Explains how to implement user defined
functions
-│ └── src/ - Contains Daffodil's UDF interfaces
├── project/
│ ├── Dependencies.scala - Defines third party dependencies
│ ├── Rat.scala - Lists files to be ignored by license audit
tool
@@ -273,7 +270,7 @@ Daffodil's API from Maven or sbt:
<dependency>
<groupId>org.apache.daffodil</groupId>
- <artifactId>daffodil-core_3.3</artifactId>
+ <artifactId>daffodil-core_3</artifactId>
<version>4.0.0</version>
</dependency>
```
diff --git a/build.sbt b/build.sbt
index f3ce75145..8656a51b1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -44,8 +44,7 @@ lazy val daffodil = project
testIBM1,
// testIntegration, // integration tests must be run manually
testStdLayout,
- tutorials,
- udf
+ tutorials
)
.settings(
commonSettings,
@@ -69,7 +68,6 @@ lazy val slf4jLogger = Project("daffodil-slf4j-logger",
file("daffodil-slf4j-log
lazy val core = Project("daffodil-core", file("daffodil-core"))
.dependsOn(
- udf,
macroLib % "compile-internal, test-internal",
slf4jLogger % "test"
)
@@ -132,17 +130,13 @@ lazy val cli = Project("daffodil-cli",
file("daffodil-cli"))
.settings(libraryDependencies ++= Dependencies.cli)
.settings(libraryDependencies ++= Dependencies.exi)
-lazy val udf = Project("daffodil-udf", file("daffodil-udf"))
- .dependsOn(slf4jLogger % "test")
- .settings(commonSettings)
-
lazy val schematron = Project("daffodil-schematron",
file("daffodil-schematron"))
.dependsOn(core, core % Test, slf4jLogger % "test")
.settings(commonSettings)
.settings(libraryDependencies ++= Dependencies.schematron)
lazy val testDaf = Project("daffodil-test", file("daffodil-test"))
- .dependsOn(tdmlJunit % "test", codeGenC % "test->test", udf % "test->test")
+ .dependsOn(tdmlJunit % "test", codeGenC % "test->test", core % "test->test")
.settings(commonSettings, nopublish)
//
// Uncomment the following line to run these tests
@@ -161,7 +155,7 @@ lazy val testIBM1 = Project("daffodil-test-ibm1",
file("daffodil-test-ibm1"))
lazy val testIntegration =
Project("daffodil-test-integration", file("daffodil-test-integration"))
- .dependsOn(cli % "test->test", udf % "test->test", testDaf % "test->test")
+ .dependsOn(cli % "test->test", core % "test->test", testDaf % "test->test")
.settings(commonSettings, nopublish)
.settings(
// CLI integration tests fork a new process which requires extra memory,
so these should
@@ -411,12 +405,11 @@ lazy val ratSettings = Seq(
lazy val unidocSettings =
Seq(
ScalaUnidoc / unidoc / unidocAllClasspaths := Seq(
- (udf / Compile / fullClasspath).value,
(core / Compile / fullClasspath).value,
(Compile / fullClasspath).value
),
ScalaUnidoc / unidoc / unidocProjectFilter :=
- inProjects(udf, core),
+ inProjects(core),
ScalaUnidoc / unidoc / javacOptions := Seq(
"-windowtitle",
"Apache Daffodil " + version.value + " API",
diff --git
a/daffodil-udf/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunction.java
b/daffodil-core/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunction.java
similarity index 100%
rename from
daffodil-udf/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunction.java
rename to
daffodil-core/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunction.java
diff --git
a/daffodil-udf/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunctionIdentification.java
b/daffodil-core/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunctionIdentification.java
similarity index 100%
rename from
daffodil-udf/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunctionIdentification.java
rename to
daffodil-core/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunctionIdentification.java
diff --git
a/daffodil-udf/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunctionProvider.java
b/daffodil-core/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunctionProvider.java
similarity index 100%
rename from
daffodil-udf/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunctionProvider.java
rename to
daffodil-core/src/main/java/org/apache/daffodil/api/udf/UserDefinedFunctionProvider.java
diff --git
a/daffodil-udf/src/main/java/org/apache/daffodil/api/udf/exceptions/UserDefinedFunctionFatalException.java
b/daffodil-core/src/main/java/org/apache/daffodil/api/udf/exceptions/UserDefinedFunctionFatalException.java
similarity index 100%
rename from
daffodil-udf/src/main/java/org/apache/daffodil/api/udf/exceptions/UserDefinedFunctionFatalException.java
rename to
daffodil-core/src/main/java/org/apache/daffodil/api/udf/exceptions/UserDefinedFunctionFatalException.java
diff --git
a/daffodil-udf/src/main/java/org/apache/daffodil/api/udf/exceptions/UserDefinedFunctionProcessingError.java
b/daffodil-core/src/main/java/org/apache/daffodil/api/udf/exceptions/UserDefinedFunctionProcessingError.java
similarity index 100%
rename from
daffodil-udf/src/main/java/org/apache/daffodil/api/udf/exceptions/UserDefinedFunctionProcessingError.java
rename to
daffodil-core/src/main/java/org/apache/daffodil/api/udf/exceptions/UserDefinedFunctionProcessingError.java
diff --git
a/daffodil-core/src/main/java/org/apache/daffodil/api/udf/package-info.java
b/daffodil-core/src/main/java/org/apache/daffodil/api/udf/package-info.java
new file mode 100644
index 000000000..36d20ea5f
--- /dev/null
+++ b/daffodil-core/src/main/java/org/apache/daffodil/api/udf/package-info.java
@@ -0,0 +1,147 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */
+/**
+ * <h2>User Defined Functions</h2>
+ *
+ * <h3>Introduction</h3>
+ * <p>
+ * Apache Daffodil allows execution of Java/Scala external (user defined)
functions in DFDL expressions.
+ * </p>
+ *
+ * <h3>Getting Started</h3>
+ * <p>
+ * Provide a JAR on the classpath (or Daffodil classpath) that contains at
least two kinds of classes:
+ * a <em>provider</em> class and its associated user-defined function (UDF)
class(es). All providers must be
+ * registered in the file
+ * {@code
META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider},
regardless of how many
+ * providers or UDFs are included.
+ * </p>
+ *
+ * <h4>UDF Implementation</h4>
+ *
+ * <h5>User Defined Function Provider Classes</h5>
+ * <p>
+ * The provider class must extend Daffodil's {@code
UserDefinedFunctionProvider}. It must implement the
+ * {@code getUserDefinedFunctionClasses()} abstract method and return every
User Defined Function the provider supplies. The base provider offers
+ * {@code createUserDefinedFunction(namespaceURI, name)} to look up and
instantiate UDFs that have a no‑argument
+ * constructor. If a UDF requires constructor arguments, override the lookup
to construct it appropriately.
+ * </p>
+ * <p>
+ * Providers participate in Java’s {@link java.util.ServiceLoader} mechanism
and therefore <strong>must</strong> include
+ * a file named {@code
META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider}
listing the
+ * fully qualified names of the provider class(es) contained in the JAR.
Without this file, neither the provider nor
+ * its UDFs will be visible to Daffodil.
+ * </p>
+ *
+ * <h5>User Defined Function Classes</h5>
+ * <p>
+ * Each UDF class must extend Daffodil's {@code UserDefinedFunction}. It
contains the functionality to be used in DFDL
+ * expressions and must be annotated with {@code
UserDefinedFunctionIdentification}, supplying the UDF invocation
+ * {@code name} and {@code namespaceURI}. A method named {@code evaluate(...)}
must be implemented; it is what Daffodil
+ * calls to execute the UDF. <strong>Overloaded</strong> or
<strong>void</strong> {@code evaluate} methods are not
+ * supported.
+ * </p>
+ *
+ * <h5>User Defined Function Exceptions</h5>
+ * <ul>
+ * <li>{@code UserDefinedFunctionProcessingError}: throw to request
backtracking during parsing.</li>
+ * <li>{@code UserDefinedFunctionFatalException}: throw to abort processing
entirely.</li>
+ * </ul>
+ * <p>
+ * Any other exception type is treated as {@code
UserDefinedFunctionFatalException}.
+ * </p>
+ *
+ * <h4>UDF Registration</h4>
+ * <p>Typical project layouts:</p>
+ *
+ * <p><strong>Scala (sbt-style):</strong></p>
+ * <pre>{@code
+ * src/
+ * main/
+ * scala/
+ * org/
+ * sgoodudfs/
+ * example/
+ * StringFunctions/
+ * StringFunctionsProvider.scala // UDF provider (may contain
UDF classes or define them separately)
+ * resources/
+ * META-INF/
+ * services/
+ * org.apache.daffodil.api.udf.UserDefinedFunctionProvider
+ * }</pre>
+ *
+ * <p><strong>Java (generic):</strong></p>
+ * <pre>{@code
+ * src/
+ * org/
+ * jgoodudfs/
+ * example/
+ * StringFunctions/
+ * StringFunctionsProvider.java // UDF provider
+ * Compare.java // UDF class
+ * Replace.java // UDF class
+ * META-INF/
+ * services/
+ * org.apache.daffodil.api.udf.UserDefinedFunctionProvider
+ * }</pre>
+ *
+ * <p>
+ * Each UDF is registered by listing the provider’s fully qualified class name
in the text file
+ *
<code>META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider</code>.
The <code>META-INF</code>
+ * folder must be discoverable from the classpath root or the ServiceLoader
will not find it.
+ * </p>
+ *
+ * <h4>UDF Usage</h4>
+ * <p>
+ * In your DFDL schema, define an xsd namespace or set the default namespace
to match the UDF’s annotation {@code namespaceURI}, then
+ * invoke using the annotated {@code name}. For example:
+ * </p>
+ * <pre><code>
+ * // annotation on the UDF class
+ * UserDefinedFunctionIdentification(
+ * name = "replace",
+ * namespaceURI = "http://example.com/ext/stringfunctions";)
+ *
+ * // within the schema tag
+ * xmlns:sdf="http://example.com/ext/stringfunctions";
+ *
+ * // within the DFDL expression
+ * ..."{ sdf:replace(., ' ', '_') }"...
+ * </code></pre>
+ *
+ *
+ * <h3>Supported Types</h3>
+ * <ul>
+ * <li>BigDecimal (Java)</li>
+ * <li>BigInteger (Java)</li>
+ * <li>Boolean (boxed and primitive)</li>
+ * <li>Byte (boxed, primitive, array of primitive)</li>
+ * <li>Double (boxed and primitive)</li>
+ * <li>Float (boxed and primitive)</li>
+ * <li>Integer (boxed and primitive)</li>
+ * <li>Long (boxed and primitive)</li>
+ * <li>Short (boxed and primitive)</li>
+ * <li>String</li>
+ * </ul>
+ *
+ * <h3>Restrictions</h3>
+ * <ul>
+ * <li>Overloading unsupported</li>
+ * <li>Void {@code evaluate} functions unsupported</li>
+ * </ul>
+ */
+package org.apache.daffodil.api.udf;
diff --git
a/daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/Compare.java
b/daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/Compare.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/Compare.java
rename to
daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/Compare.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/FuncB.java
b/daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/FuncB.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/FuncB.java
rename to
daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/FuncB.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/Replace.java
b/daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/Replace.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/Replace.java
rename to
daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/Replace.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/StringFunctionsProvider.java
b/daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/StringFunctionsProvider.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/StringFunctionsProvider.java
rename to
daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/StringFunctionsProvider.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncA.java
b/daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncA.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncA.java
rename to
daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncA.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncB.java
b/daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncB.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncB.java
rename to
daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncB.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncC.java
b/daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncC.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncC.java
rename to
daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncC.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncD.java
b/daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncD.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncD.java
rename to
daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncD.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncE.java
b/daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncE.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/FuncE.java
rename to
daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/FuncE.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/Replace.java
b/daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/Replace.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/Replace.java
rename to
daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/Replace.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/StringFunctionsProvider.java
b/daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/StringFunctionsProvider.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/StringFunctionsProvider.java
rename to
daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/StringFunctionsProvider.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/functionclasses1/StringFunctions/FuncA.java
b/daffodil-core/src/test/java/org/badudfs/functionclasses1/StringFunctions/FuncA.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/functionclasses1/StringFunctions/FuncA.java
rename to
daffodil-core/src/test/java/org/badudfs/functionclasses1/StringFunctions/FuncA.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/functionclasses1/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/java/org/badudfs/functionclasses1/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/functionclasses1/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/java/org/badudfs/functionclasses1/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/java/org/badudfs/functionclasses1/StringFunctions/Replace.java
b/daffodil-core/src/test/java/org/badudfs/functionclasses1/StringFunctions/Replace.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/functionclasses1/StringFunctions/Replace.java
rename to
daffodil-core/src/test/java/org/badudfs/functionclasses1/StringFunctions/Replace.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/functionclasses1/StringFunctions/StringFunctionsProvider.java
b/daffodil-core/src/test/java/org/badudfs/functionclasses1/StringFunctions/StringFunctionsProvider.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/functionclasses1/StringFunctions/StringFunctionsProvider.java
rename to
daffodil-core/src/test/java/org/badudfs/functionclasses1/StringFunctions/StringFunctionsProvider.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/functionclasses2/StringFunctions/FuncA.java
b/daffodil-core/src/test/java/org/badudfs/functionclasses2/StringFunctions/FuncA.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/functionclasses2/StringFunctions/FuncA.java
rename to
daffodil-core/src/test/java/org/badudfs/functionclasses2/StringFunctions/FuncA.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/functionclasses2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/java/org/badudfs/functionclasses2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/functionclasses2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/java/org/badudfs/functionclasses2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/java/org/badudfs/functionclasses2/StringFunctions/Replace.java
b/daffodil-core/src/test/java/org/badudfs/functionclasses2/StringFunctions/Replace.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/functionclasses2/StringFunctions/Replace.java
rename to
daffodil-core/src/test/java/org/badudfs/functionclasses2/StringFunctions/Replace.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/functionclasses2/StringFunctions/StringFunctionsProvider.java
b/daffodil-core/src/test/java/org/badudfs/functionclasses2/StringFunctions/StringFunctionsProvider.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/functionclasses2/StringFunctions/StringFunctionsProvider.java
rename to
daffodil-core/src/test/java/org/badudfs/functionclasses2/StringFunctions/StringFunctionsProvider.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/nonUDF/StringFunctions/FuncA.java
b/daffodil-core/src/test/java/org/badudfs/nonUDF/StringFunctions/FuncA.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/nonUDF/StringFunctions/FuncA.java
rename to
daffodil-core/src/test/java/org/badudfs/nonUDF/StringFunctions/FuncA.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/nonUDF/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/java/org/badudfs/nonUDF/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/nonUDF/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/java/org/badudfs/nonUDF/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/java/org/badudfs/nonUDF/StringFunctions/Replace.java
b/daffodil-core/src/test/java/org/badudfs/nonUDF/StringFunctions/Replace.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/nonUDF/StringFunctions/Replace.java
rename to
daffodil-core/src/test/java/org/badudfs/nonUDF/StringFunctions/Replace.java
diff --git
a/daffodil-udf/src/test/java/org/badudfs/nonUDF/StringFunctions/StringFunctionsProvider.java
b/daffodil-core/src/test/java/org/badudfs/nonUDF/StringFunctions/StringFunctionsProvider.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/badudfs/nonUDF/StringFunctions/StringFunctionsProvider.java
rename to
daffodil-core/src/test/java/org/badudfs/nonUDF/StringFunctions/StringFunctionsProvider.java
diff --git
a/daffodil-udf/src/test/java/org/jgoodudfs/example/StringFunctions/Compare.java
b/daffodil-core/src/test/java/org/jgoodudfs/example/StringFunctions/Compare.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/jgoodudfs/example/StringFunctions/Compare.java
rename to
daffodil-core/src/test/java/org/jgoodudfs/example/StringFunctions/Compare.java
diff --git
a/daffodil-udf/src/test/java/org/jgoodudfs/example/StringFunctions/Replace.java
b/daffodil-core/src/test/java/org/jgoodudfs/example/StringFunctions/Replace.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/jgoodudfs/example/StringFunctions/Replace.java
rename to
daffodil-core/src/test/java/org/jgoodudfs/example/StringFunctions/Replace.java
diff --git
a/daffodil-udf/src/test/java/org/jgoodudfs/example/StringFunctions/StringFunctionsProvider.java
b/daffodil-core/src/test/java/org/jgoodudfs/example/StringFunctions/StringFunctionsProvider.java
similarity index 100%
rename from
daffodil-udf/src/test/java/org/jgoodudfs/example/StringFunctions/StringFunctionsProvider.java
rename to
daffodil-core/src/test/java/org/jgoodudfs/example/StringFunctions/StringFunctionsProvider.java
diff --git
a/daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd
b/daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd
similarity index 100%
rename from
daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd
rename to
daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd
diff --git
a/daffodil-udf/src/test/resources/org/badmetainf/nonexistentclass/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/resources/org/badmetainf/nonexistentclass/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/resources/org/badmetainf/nonexistentclass/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/resources/org/badmetainf/nonexistentclass/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/resources/org/goodmetainf/IntegerFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/resources/org/goodmetainf/IntegerFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/resources/org/goodmetainf/IntegerFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/resources/org/goodmetainf/IntegerFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/resources/org/goodmetainf/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/resources/org/goodmetainf/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/resources/org/goodmetainf/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/resources/org/goodmetainf/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/StringFunctionsProvider.scala
b/daffodil-core/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/StringFunctionsProvider.scala
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/StringFunctionsProvider.scala
rename to
daffodil-core/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/StringFunctionsProvider.scala
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/StringFunctionsProvider.scala
b/daffodil-core/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/StringFunctionsProvider.scala
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/StringFunctionsProvider.scala
rename to
daffodil-core/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/StringFunctionsProvider.scala
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/StringFunctionsProvider.scala
b/daffodil-core/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/StringFunctionsProvider.scala
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/StringFunctionsProvider.scala
rename to
daffodil-core/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/StringFunctionsProvider.scala
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/StringFunctionsProvider.scala
b/daffodil-core/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/StringFunctionsProvider.scala
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/StringFunctionsProvider.scala
rename to
daffodil-core/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/StringFunctionsProvider.scala
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/StringFunctionsProvider.scala
b/daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/StringFunctionsProvider.scala
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/StringFunctionsProvider.scala
rename to
daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/StringFunctionsProvider.scala
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
b/daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
rename to
daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider
diff --git
a/daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/StringFunctionsProvider.scala
b/daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/StringFunctionsProvider.scala
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/StringFunctionsProvider.scala
rename to
daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/StringFunctionsProvider.scala
diff --git
a/daffodil-udf/src/test/scala/org/sgoodudfs/example/IntegerFunctions/IntegerFunctionsProvider.scala
b/daffodil-core/src/test/scala/org/sgoodudfs/example/IntegerFunctions/IntegerFunctionsProvider.scala
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sgoodudfs/example/IntegerFunctions/IntegerFunctionsProvider.scala
rename to
daffodil-core/src/test/scala/org/sgoodudfs/example/IntegerFunctions/IntegerFunctionsProvider.scala
diff --git
a/daffodil-udf/src/test/scala/org/sgoodudfs/example/StringFunctions/StringFunctionsProvider.scala
b/daffodil-core/src/test/scala/org/sgoodudfs/example/StringFunctions/StringFunctionsProvider.scala
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sgoodudfs/example/StringFunctions/StringFunctionsProvider.scala
rename to
daffodil-core/src/test/scala/org/sgoodudfs/example/StringFunctions/StringFunctionsProvider.scala
diff --git
a/daffodil-udf/src/test/scala/org/sgoodudfs/example/SupportedTypesFunctions/SupportedTypesFunctionsProvider.scala
b/daffodil-core/src/test/scala/org/sgoodudfs/example/SupportedTypesFunctions/SupportedTypesFunctionsProvider.scala
similarity index 100%
rename from
daffodil-udf/src/test/scala/org/sgoodudfs/example/SupportedTypesFunctions/SupportedTypesFunctionsProvider.scala
rename to
daffodil-core/src/test/scala/org/sgoodudfs/example/SupportedTypesFunctions/SupportedTypesFunctionsProvider.scala
diff --git a/daffodil-layers/README.md b/daffodil-layers/README.md
deleted file mode 100644
index a6679f41e..000000000
--- a/daffodil-layers/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-# Daffodil Layers
-
-See the <a href="http://daffodil.apache.org/layers";>Layer Usage
Documentation</a> for how a layer is
-used from a Daffodil DFDL schema.
\ No newline at end of file
diff --git
a/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIPlugins.scala
b/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIPlugins.scala
index 4c66df356..976a469ce 100644
---
a/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIPlugins.scala
+++
b/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIPlugins.scala
@@ -105,10 +105,10 @@ class TestCLIPlugins {
*/
@Test def test_reload_missing_udf(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = testClasspath(
- s"daffodil-udf/target/$scalaVersionForTargetPath/test-classes/"
+ s"daffodil-core/target/$scalaVersionForTargetPath/test-classes/"
)
withTempFile { parser =>
diff --git
a/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIUdfs.scala
b/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIUdfs.scala
index b5d31a901..87a72a304 100644
---
a/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIUdfs.scala
+++
b/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIUdfs.scala
@@ -33,7 +33,7 @@ class TestCLIUdfs {
* the directory containing the META-INF dir needed for the test.
*/
private def udfClasspath(extra: String*): Seq[Path] = {
- val classes =
path(s"daffodil-udf/target/$scalaVersionForTargetPath/test-classes/")
+ val classes =
path(s"daffodil-core/target/$scalaVersionForTargetPath/test-classes/")
val paths = extra.map(path(_))
classes +: paths
}
@@ -44,7 +44,7 @@ class TestCLIUdfs {
*/
@Test def test_noUdfsLoaded_regular_schema(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
runCLI(args"-v parse -s $schema -r fn_func", fork = true) { cli =>
@@ -62,7 +62,7 @@ class TestCLIUdfs {
*/
@Test def test_noUdfsLoaded_udf_schema(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
runCLI(args"-v parse -s $schema -r user_func1", fork = true) { cli =>
@@ -80,10 +80,10 @@ class TestCLIUdfs {
*/
@Test def test_noUdfsLoaded_MissingClassInMetaInfFile(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
- "daffodil-udf/src/test/resources/org/badmetainf/nonexistentclass/"
+ "daffodil-core/src/test/resources/org/badmetainf/nonexistentclass/"
)
runCLI(args"-v parse -s $schema -r user_func1", classpath) { cli =>
@@ -104,7 +104,7 @@ class TestCLIUdfs {
*/
@Test def test_noUdfsLoaded_MissingMetaInfFile(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath()
@@ -119,10 +119,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFPClass_NoUdfClasses(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/java/org/badudfs/functionclasses1/StringFunctions/"
+
"daffodil-core/src/test/java/org/badudfs/functionclasses1/StringFunctions/"
)
runCLI(args"-v parse -s $schema -r user_func1", classpath) { cli =>
@@ -141,10 +141,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFPClass_emptyUdfClasses(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/java/org/badudfs/functionclasses2/StringFunctions/"
+
"daffodil-core/src/test/java/org/badudfs/functionclasses2/StringFunctions/"
)
runCLI(args"-v parse -s $schema -r user_func1", classpath) { cli =>
@@ -164,10 +164,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFClass_nonUDF(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
- "daffodil-udf/src/test/java/org/badudfs/nonUDF/StringFunctions/"
+ "daffodil-core/src/test/java/org/badudfs/nonUDF/StringFunctions/"
)
runCLI(args"-v parse -s $schema -r user_func1", classpath) { cli =>
@@ -191,10 +191,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFClass_nonAnn(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
- "daffodil-udf/src/test/java/org/badudfs/annotations/StringFunctions/"
+ "daffodil-core/src/test/java/org/badudfs/annotations/StringFunctions/"
)
runCLI(args"-v parse -s $schema -r user_func1", classpath) { cli =>
@@ -226,10 +226,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFClass_noEvaluate(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
- "daffodil-udf/src/test/java/org/badudfs/evaluate/StringFunctions/"
+ "daffodil-core/src/test/java/org/badudfs/evaluate/StringFunctions/"
)
runCLI(args"-v parse -s $schema -r user_func1", classpath) { cli =>
@@ -273,10 +273,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFClass_CustomExceptionOnEvaluate(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/"
+
"daffodil-core/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/"
)
runCLI(args"parse -s $schema -r user_func2", classpath) { cli =>
@@ -296,10 +296,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFClass_ProcessingErrorOnEvaluate(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/"
+
"daffodil-core/src/test/scala/org/sbadudfs/udfexceptions/evaluating/StringFunctions/"
)
runCLI(args"parse -s $schema -r user_func3", classpath) { cli =>
@@ -315,10 +315,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFClass_exceptionOnLoad(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/"
+
"daffodil-core/src/test/scala/org/sbadudfs/udfexceptions2/StringFunctions/"
)
runCLI(args"-v parse -s $schema -r user_func3", classpath) { cli =>
@@ -340,10 +340,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFPClass_exceptionOnLoadingUDFs(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/"
+
"daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions/StringFunctions/"
)
runCLI(args"-v parse -s $schema -r user_func3", classpath) { cli =>
@@ -363,10 +363,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFPClass_exceptionOnLoad(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/"
+
"daffodil-core/src/test/scala/org/sbadudfs/udfpexceptions2/StringFunctions/"
)
runCLI(args"-vv parse -s $schema -r user_func3", classpath) { cli =>
@@ -390,10 +390,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFPClass_incorrectUDFObject(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/"
+
"daffodil-core/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/"
)
runCLI(args"-v parse -s $schema -r user_func3", classpath) { cli =>
@@ -412,10 +412,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFPClass_incorrectUDFCreateImplementation(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/"
+
"daffodil-core/src/test/scala/org/sbadudfs/functionclasses/StringFunctions/"
)
runCLI(args"-v parse -s $schema -r user_func2", classpath) { cli =>
@@ -437,10 +437,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFClass_serializability(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/"
+
"daffodil-core/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/"
)
runCLI(args"-vv save-parser -s $schema -r user_func4", classpath) { cli =>
@@ -468,10 +468,10 @@ class TestCLIUdfs {
*/
@Test def test_UDFClass_serializability2(): Unit = {
val schema = path(
-
"daffodil-udf/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
+
"daffodil-core/src/test/resources/org/apache/daffodil/udf/genericUdfSchema.xsd"
)
val classpath = udfClasspath(
-
"daffodil-udf/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/"
+
"daffodil-core/src/test/scala/org/sbadudfs/functionclasses2/StringFunctions/"
)
withTempFile { parser =>
diff --git a/daffodil-udf/README.md b/daffodil-udf/README.md
deleted file mode 100644
index f4dad15c4..000000000
--- a/daffodil-udf/README.md
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-# User Defined Functions
-
-## Introduction
-
-Apache Daffodil allows execution of Java/Scala external/user defined functions
in DFDL Expressions.
-
-## Getting Started
-
-The implementer will be expected to provide a JAR via the classpath or
Daffodil classpath containing at least two
-classes:
-a provider class and its associated function class(es).
-
-All providers must be registered in the
*META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider*
-file, regardless of how many are provided.
-
-### UDF Implementation
-
-#### User Defined Function Provider Classes
-
-The provider class must extend Daffodil's `UserDefinedFuntionProvider` class.
This class must implement the
-`getUserDefinedFunctionClasses` abstract method, and ensure it returns all the
User Defined Functions this class is
-providing. The `UserDefinedFunctionProvider` class provides a
`createUserDefinedFunction` to lookup and initialize User
-Defined Functions that have no-argument constructors, based on a supplied name
and namespaceURI. If the User Defined
-Function has a constructor that takes arguments, then the default lookup
function cannot be used, and the class must
-override the look up function with its own implementation for such UDFs.
-
-This class will act as a traditional service provider as explained in the
ServiceLoader API, and must have a
-*META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider*
file in its project. This file must contain
-the fully qualified name(s) of the **provider class(es)** in the JAR. Without
that file, neither this class nor any of
-the User Defined Function classes it provides will be visible to Daffodil.
-
-The class can provide as many User Defined Function classes as it wishes, as
long as they are made available by the
-`getUserDefinedFunctionClasses` function.
-
-#### User Defined Function Classes
-
-The User Defined Function class must extend Daffodil's `UserDefinedFunction`
class. This class will contain the actual
-functionality implementers wish to add to DFDL Expressions. It must be
annotated with the
-`UserDefinedFunctionIdentification` annotation class, with the name and
namespaceURI fields filled in with how the UDF
-will be called from the schema. It must also implement a function named
*evaluate* that Daffodil will call to execute
-the desired UDF functionality. *There is no support for overloaded or void
evaluate functions*.
-
-#### User Defined Function Exceptions
-
-Daffodil proves two exception classes for users that wish to throw an error
from within their UDFs.
-
-* `UserDefinedFunctionProcessingError` can be thrown when the implementer
wishes to cause backtracking during parsing
-* `UserDefinedFunctionFatalException` can be thrown when the implementer
wishes processing to be aborted all together
-
-All other exceptions are treated as `UserDefinedFunctionFatalException`.
-
-### UDF Registration
-
-Once implemented, a UDF can be expected to have one of the following structures
-
-```
-// sample scala UDF with sbt structure
-// based on sample UDF in daffodil-udf/src/test/scala
-src/
- main/
- scala/
- org/
- sgoodudfs/
- example/
- StringFunctions/
- StringFunctionsProvider.scala //UDF Provider with UDF classes
declared within
- resources/
- META-INF/
- services/
- org.apache.daffodil.api.udf.UserDefinedFunctionProvider
-```
-
-or
-
-```
-// sample java UDF with generic structure
-// based on sample UDF in daffodil-udf/src/test/java
-src/
- org/
- jgoodudfs/
- example/
- StringFunctions/
- StringFunctionsProvider.java //UDF Provider
- Compare.java //UDF class
- Replace.java //UDF class
- META-INF/
- services/
- org.apache.daffodil.api.udf.UserDefinedFunctionProvider
-```
-
-Each UDF is registered by including the fully qualified name of its provider
in a text file named
-`META-INF/services/org.apache.daffodil.api.udf.UserDefinedFunctionProvider`.
The META-INF folder must be accessible from
-the root of whatever paths are on the classpath, otherwise it won't be picked
up by ServiceLoader.
-
-### UDF Usage
-
-To use within a DFDL expression, you will need to either define an xsd
namespace or set as your default namespace a
-value that matches the namespaceURI of the UDF's annotation. Then you can call
the function with the name field of the
-function class's annotation. For example:
-
-```xml
-<!--
-For a UDF with the following annotation
-@UserDefinedFunctionIdentification(
- name = "replace",
- namespaceURI = "http://example.com/ext/stringfunctions";)
--->
-
-<!-- within the schema tag -->
- xmlns:sdf="http://example.com/ext/stringfunctions";
-
- <!-- within the DFDL expression -->
- ..."{ sdf:replace(., ' ', '_') }"...
-```
-
-## Supported Types
-
-* BigDecimal: Java
-* BigInteger: Java
-* Boolean: Boxed and Primitive
-* Byte: Boxed, Primitive, Array of Primitive
-* Double: Boxed and Primitive
-* Float: Boxed and Primitive
-* Integer: Boxed and Primitive
-* Long: Boxed and Primitive
-* Short: Boxed and Primitive
-* String
-
-## Restrictions
-
-- Overloading unsupported
-- Void functions unsupported
diff --git a/daffodil-udf/src/main/resources/META-INF/LICENSE
b/daffodil-udf/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d64569567..000000000
--- a/daffodil-udf/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/daffodil-udf/src/main/resources/META-INF/NOTICE
b/daffodil-udf/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index e1332c0ac..000000000
--- a/daffodil-udf/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,10 +0,0 @@
-Apache Daffodil
-Copyright 2025 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-Based on source code originally developed by
-- The Univerisity of Illinois National Center for Supercomputing Applications
(http://www.ncsa.illinois.edu/)
-- Tresys Technology (http://www.tresys.com/)
-- International Business Machines Corporation (http://www.ibm.com)
