You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sl...@apache.org on 2022/01/18 13:32:47 UTC
[daffodil-schema.g8] branch main updated (c125d39 -> d888377)
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-schema.g8.git.
from c125d39 Add Daffodil schema template
new a93decf Add 'namespaced' property to support flat vs deep directory structure
new ece1c56 Update to latest versions of dependencies
new 467aece Remove data and infoset directories
new 2eb3543 Add property for specifying test file extensions
new d888377 Update github actions to match Daffodil actions
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/main.yml | 28 +++++++++++++++-------
.gitignore | 1 +
README.md | 16 +++++++++++++
build.sbt | 8 +++----
project/build.properties | 2 +-
.../$name__camel$.dfdl.xsd | 0
.../Test$name__Camel$.tdml | 6 ++---
.../test_01.$extension$} | 0
.../test_01.$extension$.xml} | 0
.../Test$name__Camel$.scala | 4 ++--
src/main/g8/.gitattributes | 6 ++++-
src/main/g8/.gitignore | 1 +
src/main/g8/build.sbt | 21 +++++++++++++---
src/main/g8/default.properties | 2 ++
src/main/g8/project/build.properties | 2 +-
15 files changed, 73 insertions(+), 24 deletions(-)
rename src/main/g8/{src/main/resources/$package$/$name__camel$/xsd => $if(namespaced.truthy)$src$else$.$endif$/$if(namespaced.truthy)$main$else$src$endif$/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/$if(namespaced.truthy)$xsd$else$.$endif$}/$name__camel$.dfdl.xsd (100%)
rename src/main/g8/{src/test/resources/$package$/$name__camel$ => $if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$}/Test$name__Camel$.tdml (77%)
rename src/main/g8/{src/test/resources/$package$/$name__camel$/data/test_01.$name__camel$ => $if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$extension$} (100%)
rename src/main/g8/{src/test/resources/$package$/$name__camel$/infosets/test_01.$name__camel$.xml => $if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$extension$.xml} (100%)
rename src/main/g8/{src/test/scala/$package$/$name__camel$ => $if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$scala$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$}/Test$name__Camel$.scala (86%)
[daffodil-schema.g8] 01/05: Add 'namespaced' property to support flat vs deep directory structure
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-schema.g8.git
commit a93decfc4e54ac92e47a728b156170ddcb74be94
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Thu Jan 13 08:54:16 2022 -0500
Add 'namespaced' property to support flat vs deep directory structure
Defaults to 'no' to use the preferred flat directory structure.
---
README.md | 12 ++++++++++++
.../$name__camel$.dfdl.xsd | 0
.../Test$name__Camel$.tdml | 6 +++---
.../data/test_01.$name__camel$ | 0
.../infosets/test_01.$name__camel$.xml | 0
.../Test$name__Camel$.scala | 2 +-
src/main/g8/.gitattributes | 2 +-
src/main/g8/build.sbt | 14 ++++++++++++++
src/main/g8/default.properties | 1 +
9 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index c763a38..010a070 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,18 @@ The following properties are used to configure the generated DFDL schema project
<dd>
the package namespace, for example "com.example"
</dd>
+ <dt>namespaced</dt>
+ <dd>
+ if 'no', uses a flattened directory structure with no package
+ directories and mixed source and resource files in src/ and test/
+ directories (default)
+ </dd>
+ <dd>
+ if 'yes', uses a deep directory structure with package directories and
+ separate directories for source and resource files. This should
+ only be used when namespacing is required to avoid file name
+ ambiguities.
+ </dd>
<dt>daffodil_version</dt>
<dd>
the version of Apache Daffodil to add as a dependency, defaults to the
diff --git a/src/main/g8/src/main/resources/$package$/$name__camel$/xsd/$name__camel$.dfdl.xsd b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/$if(namespaced.truthy)$main$else$src$endif$/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/$if(namespaced.truthy)$xsd$else$.$endif$/$name__camel$.dfdl.xsd
similarity index 100%
rename from src/main/g8/src/main/resources/$package$/$name__camel$/xsd/$name__camel$.dfdl.xsd
rename to src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/$if(namespaced.truthy)$main$else$src$endif$/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/$if(namespaced.truthy)$xsd$else$.$endif$/$name__camel$.dfdl.xsd
diff --git a/src/main/g8/src/test/resources/$package$/$name__camel$/Test$name__Camel$.tdml b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml
similarity index 73%
rename from src/main/g8/src/test/resources/$package$/$name__camel$/Test$name__Camel$.tdml
rename to src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml
index 3654cd3..d897b72 100644
--- a/src/main/g8/src/test/resources/$package$/$name__camel$/Test$name__Camel$.tdml
+++ b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml
@@ -26,12 +26,12 @@ limitations under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
defaultRoundTrip="onePass">
- <tdml:parserTestCase name="test_$name;format="camel"$_01" root="$name;format="Camel"$" model="$package;format="packaged"$/$name;format="camel"$/xsd/$name;format="camel"$.dfdl.xsd">
+ <tdml:parserTestCase name="test_$name;format="camel"$_01" root="$name;format="Camel"$" model="$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/xsd/$endif$$name;format="camel"$.dfdl.xsd">
<tdml:document>
- <tdml:documentPart type="file">$package;format="packaged"$/$name;format="camel"$/data/test_01.$name;format="camel"$</tdml:documentPart>
+ <tdml:documentPart type="file">$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/$endif$data/test_01.$name;format="camel"$</tdml:documentPart>
</tdml:document>
<tdml:infoset>
- <tdml:dfdlInfoset type="file">$package;format="packaged"$/$name;format="camel"$/infosets/test_01.$name;format="camel"$.xml</tdml:dfdlInfoset>
+ <tdml:dfdlInfoset type="file">$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/$endif$infosets/test_01.$name;format="camel"$.xml</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
diff --git a/src/main/g8/src/test/resources/$package$/$name__camel$/data/test_01.$name__camel$ b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/data/test_01.$name__camel$
similarity index 100%
rename from src/main/g8/src/test/resources/$package$/$name__camel$/data/test_01.$name__camel$
rename to src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/data/test_01.$name__camel$
diff --git a/src/main/g8/src/test/resources/$package$/$name__camel$/infosets/test_01.$name__camel$.xml b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/infosets/test_01.$name__camel$.xml
similarity index 100%
rename from src/main/g8/src/test/resources/$package$/$name__camel$/infosets/test_01.$name__camel$.xml
rename to src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/infosets/test_01.$name__camel$.xml
diff --git a/src/main/g8/src/test/scala/$package$/$name__camel$/Test$name__Camel$.scala b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$scala$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.scala
similarity index 89%
rename from src/main/g8/src/test/scala/$package$/$name__camel$/Test$name__Camel$.scala
rename to src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$scala$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.scala
index d14d617..83135ce 100644
--- a/src/main/g8/src/test/scala/$package$/$name__camel$/Test$name__Camel$.scala
+++ b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$scala$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.scala
@@ -22,7 +22,7 @@ import org.junit.Test
import org.apache.daffodil.tdml.Runner
object Test$name;format="Camel"$ {
- lazy val runner = Runner("/$package;format="packaged"$/$name;format="camel"$/", "Test$name;format="Camel"$.tdml")
+ lazy val runner = Runner("/$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/$endif$", "Test$name;format="Camel"$.tdml")
@AfterClass def shutDown {
runner.reset
diff --git a/src/main/g8/.gitattributes b/src/main/g8/.gitattributes
index b2b04d0..0120b8e 100644
--- a/src/main/g8/.gitattributes
+++ b/src/main/g8/.gitattributes
@@ -14,4 +14,4 @@ $if(false)$
# See the License for the specific language governing permissions and
# limitations under the License.
$endif$
-src/test/resources/**/data/** text=false
+$if(namespaced.truthy)$src/test/resources/**/$else$test/$endif$data/** text=false
diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
index e71786a..b6f4c78 100644
--- a/src/main/g8/build.sbt
+++ b/src/main/g8/build.sbt
@@ -31,3 +31,17 @@ libraryDependencies ++= Seq(
testOptions += Tests.Argument(TestFrameworks.JUnit, "-v")
crossPaths := false
+
+$if(!namespaced.truthy)$
+// Use flat folder structure. This means *.java and *.scala files are in the
+// same directory as resources files, and source/resource files are only
+// differentiated by their file extension.
+Compile / unmanagedSourceDirectories := Seq(baseDirectory.value / "src")
+Compile / unmanagedResourceDirectories := Seq(baseDirectory.value / "src")
+Compile / unmanagedSources / includeFilter := "*.java" | "*.scala"
+Compile / unmanagedResources / excludeFilter := "*.java" | "*.scala"
+Test / unmanagedSourceDirectories := Seq(baseDirectory.value / "test")
+Test / unmanagedResourceDirectories := Seq(baseDirectory.value / "test")
+Test / unmanagedSources / includeFilter := "*.java" | "*.scala"
+Test / unmanagedResources / excludeFilter := "*.java" | "*.scala"
+$endif$
diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties
index 2f03142..bdf02f4 100644
--- a/src/main/g8/default.properties
+++ b/src/main/g8/default.properties
@@ -15,4 +15,5 @@
name=format
package=com.example
+namespaced=no
daffodil_version=maven(org.apache.daffodil, daffodil-tdml-processor_2.12)
[daffodil-schema.g8] 05/05: Update github actions to match Daffodil actions
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-schema.g8.git
commit d888377efcc9256d635862b61ad1fa207af72118
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Tue Jan 18 08:17:32 2022 -0500
Update github actions to match Daffodil actions
---
.github/workflows/main.yml | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b3e72dd..7fcccce 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,9 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-name: Daffodil DFDL Schema Template CI
+name: CI
-on: [push, pull_request]
+on:
+ push:
+ branches-ignore: [ 'dependabot/**' ]
+ pull_request:
+ types: [opened, synchronize, reopened]
jobs:
test:
@@ -23,10 +27,13 @@ jobs:
strategy:
fail-fast: false
matrix:
- java_version: [ 8, 11, 15 ]
- scala_version: [ 2.12.11 ]
- os: [ ubuntu-latest ]
+ distribution: [ temurin ]
+ java_version: [ 8, 11, 17 ]
+ scala_version: [ 2.12.15 ]
+ os: [ ubuntu-20.04 ]
runs-on: ${{ matrix.os }}
+ env:
+ SBT: sbt -J-Xms1024m -J-Xmx5120m -J-XX:ReservedCodeCacheSize=512m -J-XX:MaxMetaspaceSize=1024m ++${{ matrix.scala_version }}
steps:
@@ -35,11 +42,14 @@ jobs:
############################################################
- name: Checkout Repository
- uses: actions/checkout@v2.0.0
+ uses: actions/checkout@v2.4.0
+ with:
+ fetch-depth: 0
- name: Install Java
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2.5.0
with:
+ distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java_version }}
############################################################
@@ -47,7 +57,7 @@ jobs:
############################################################
- name: Run Rat Check
- run: sbt ++${{ matrix.scala_version }} ratCheck
+ run: $SBT ratCheck
- name: Run Tests
- run: sbt ++${{ matrix.scala_version }} test
+ run: $SBT test
[daffodil-schema.g8] 02/05: Update to latest versions of dependencies
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-schema.g8.git
commit ece1c56dcbca3cbf3b6affaafcac91520ec8bfd4
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Thu Jan 13 09:04:32 2022 -0500
Update to latest versions of dependencies
---
.gitignore | 1 +
build.sbt | 8 ++++----
project/build.properties | 2 +-
.../Test$name__Camel$.scala | 2 +-
src/main/g8/.gitignore | 1 +
src/main/g8/build.sbt | 7 ++++---
src/main/g8/project/build.properties | 2 +-
7 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 967513c..18bc158 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+.bsp
target
diff --git a/build.sbt b/build.sbt
index 42a3f23..c042d41 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,10 +17,10 @@ lazy val root = (project in file("."))
.enablePlugins(ScriptedPlugin)
.settings(
name := "daffodil-schema.g8",
- scalaVersion := "2.12.11",
- crossScalaVersions := Seq("2.12.11"),
- test in Test := {
- val _ = (g8Test in Test).toTask("").value
+ scalaVersion := "2.12.15",
+ crossScalaVersions := Seq("2.12.15"),
+ Test / test := {
+ val _ = (Test / g8Test).toTask("").value
},
ratFailBinaries := true,
ratExcludes := Seq(
diff --git a/project/build.properties b/project/build.properties
index 68f0755..98655aa 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-sbt.version=1.3.9
+sbt.version=1.6.1
diff --git a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$scala$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.scala b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$scala$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.scala
index 83135ce..7aa19b7 100644
--- a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$scala$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.scala
+++ b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$scala$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.scala
@@ -24,7 +24,7 @@ import org.apache.daffodil.tdml.Runner
object Test$name;format="Camel"$ {
lazy val runner = Runner("/$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/$endif$", "Test$name;format="Camel"$.tdml")
- @AfterClass def shutDown {
+ @AfterClass def shutDown: Unit = {
runner.reset
}
}
diff --git a/src/main/g8/.gitignore b/src/main/g8/.gitignore
index 5c0c8e8..2645a10 100644
--- a/src/main/g8/.gitignore
+++ b/src/main/g8/.gitignore
@@ -14,4 +14,5 @@ $!
# See the License for the specific language governing permissions and
# limitations under the License.
!$
+.bsp
target
diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
index b6f4c78..32dd11c 100644
--- a/src/main/g8/build.sbt
+++ b/src/main/g8/build.sbt
@@ -20,12 +20,13 @@ organization := "$package$"
version := "0.1.0-SNAPSHOT"
-scalaVersion := "2.12.11"
+scalaVersion := "2.12.15"
libraryDependencies ++= Seq(
+ "com.github.sbt" % "junit-interface" % "0.13.2" % "test",
+ "junit" % "junit" % "4.13.2" % "test",
"org.apache.daffodil" %% "daffodil-tdml-processor" % "$daffodil_version$" % "test",
- "com.novocode" % "junit-interface" % "0.11" % "test",
- "junit" % "junit" % "4.12" % "test",
+ "org.apache.logging.log4j" % "log4j-core" % "2.17.1" % "test",
)
testOptions += Tests.Argument(TestFrameworks.JUnit, "-v")
diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties
index 0f32320..0f20dc5 100644
--- a/src/main/g8/project/build.properties
+++ b/src/main/g8/project/build.properties
@@ -14,4 +14,4 @@ $!
# See the License for the specific language governing permissions and
# limitations under the License.
!$
-sbt.version=1.3.9
+sbt.version=1.6.1
[daffodil-schema.g8] 03/05: Remove data and infoset directories
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-schema.g8.git
commit 467aece330391ec6aeb1f63777e594da24073c02
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Fri Jan 14 07:53:52 2022 -0500
Remove data and infoset directories
Test files are generally easier to manage/inspect when tdml, data, and
infoset files all live side by side, especially for smaller
repositories. This should be the default.
With the data directory removed, the .gitattributes file is updated to
consider only *.scala, *.tdml, *.xml, and *.xsd test files as text. Any
other test files are considered non-text and will have auto-crlf
disabled. This prevents Git from modifying test files that look like
text if auto-crlf is enabled.
---
.../Test$name__Camel$.tdml | 4 ++--
.../{data => }/test_01.$name__camel$ | 0
.../{infosets => }/test_01.$name__camel$.xml | 0
src/main/g8/.gitattributes | 6 +++++-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml
index d897b72..75d1a4f 100644
--- a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml
+++ b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml
@@ -28,10 +28,10 @@ limitations under the License.
<tdml:parserTestCase name="test_$name;format="camel"$_01" root="$name;format="Camel"$" model="$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/xsd/$endif$$name;format="camel"$.dfdl.xsd">
<tdml:document>
- <tdml:documentPart type="file">$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/$endif$data/test_01.$name;format="camel"$</tdml:documentPart>
+ <tdml:documentPart type="file">test_01.$name;format="camel"$</tdml:documentPart>
</tdml:document>
<tdml:infoset>
- <tdml:dfdlInfoset type="file">$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/$endif$infosets/test_01.$name;format="camel"$.xml</tdml:dfdlInfoset>
+ <tdml:dfdlInfoset type="file">test_01.$name;format="camel"$.xml</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
diff --git a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/data/test_01.$name__camel$ b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$name__camel$
similarity index 100%
rename from src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/data/test_01.$name__camel$
rename to src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$name__camel$
diff --git a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/infosets/test_01.$name__camel$.xml b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$name__camel$.xml
similarity index 100%
rename from src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/infosets/test_01.$name__camel$.xml
rename to src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$name__camel$.xml
diff --git a/src/main/g8/.gitattributes b/src/main/g8/.gitattributes
index 0120b8e..959cd25 100644
--- a/src/main/g8/.gitattributes
+++ b/src/main/g8/.gitattributes
@@ -14,4 +14,8 @@ $if(false)$
# See the License for the specific language governing permissions and
# limitations under the License.
$endif$
-$if(namespaced.truthy)$src/test/resources/**/$else$test/$endif$data/** text=false
+$if(namespaced.truthy)$src/test/resources$else$test$endif$/** text=false
+$if(namespaced.truthy)$src/test/resources$else$test$endif$/**/*.tdml text=true
+$if(namespaced.truthy)$src/test/resources$else$test$endif$/**/*.xsd text=true
+$if(namespaced.truthy)$src/test/resources$else$test$endif$/**/*.xml text=true
+$if(namespaced.truthy)$src/test/scala$else$test$endif$/**/*.scala text=true
[daffodil-schema.g8] 04/05: Add property for specifying test file extensions
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-schema.g8.git
commit 2eb35430ed76785aeb9a7e6d140cce4093919a9c
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Fri Jan 14 09:16:11 2022 -0500
Add property for specifying test file extensions
---
README.md | 4 ++++
.../Test$name__Camel$.tdml | 4 ++--
.../{test_01.$name__camel$ => test_01.$extension$} | 0
.../{test_01.$name__camel$.xml => test_01.$extension$.xml} | 0
src/main/g8/default.properties | 1 +
5 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 010a070..e4816c5 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,10 @@ The following properties are used to configure the generated DFDL schema project
<dd>
the name of the file format, for example "jpeg" or "png"
</dd>
+ <dt>extension</dt>
+ <dd>
+ extension used for test files, for example "dat", or "png"
+ </dd>
<dt>package</dt>
<dd>
the package namespace, for example "com.example"
diff --git a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml
index 75d1a4f..04db58c 100644
--- a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml
+++ b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/Test$name__Camel$.tdml
@@ -28,10 +28,10 @@ limitations under the License.
<tdml:parserTestCase name="test_$name;format="camel"$_01" root="$name;format="Camel"$" model="$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/xsd/$endif$$name;format="camel"$.dfdl.xsd">
<tdml:document>
- <tdml:documentPart type="file">test_01.$name;format="camel"$</tdml:documentPart>
+ <tdml:documentPart type="file">test_01.$extension$</tdml:documentPart>
</tdml:document>
<tdml:infoset>
- <tdml:dfdlInfoset type="file">test_01.$name;format="camel"$.xml</tdml:dfdlInfoset>
+ <tdml:dfdlInfoset type="file">test_01.$extension$.xml</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
diff --git a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$name__camel$ b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$extension$
similarity index 100%
rename from src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$name__camel$
rename to src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$extension$
diff --git a/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$name__camel$.xml b/src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$extension$.xml
similarity index 100%
rename from src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$name__camel$.xml
rename to src/main/g8/$if(namespaced.truthy)$src$else$.$endif$/test/$if(namespaced.truthy)$resources$else$.$endif$/$if(namespaced.truthy)$$package$$else$.$endif$/$if(namespaced.truthy)$$name__camel$$else$.$endif$/test_01.$extension$.xml
diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties
index bdf02f4..002ef3f 100644
--- a/src/main/g8/default.properties
+++ b/src/main/g8/default.properties
@@ -14,6 +14,7 @@
# limitations under the License.
name=format
+extension=dat
package=com.example
namespaced=no
daffodil_version=maven(org.apache.daffodil, daffodil-tdml-processor_2.12)