This is an automated email from the ASF dual-hosted git repository. slawrence pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-daffodil-site.git
commit 709923a11c278e3a6736d74cd72b62f284523eae Author: Steve Lawrence <[email protected]> AuthorDate: Tue Feb 6 11:29:44 2018 -0500 Release 2.1.0 - Update 2.1.0.md page to link to released files - Change the latest link to javadoc/scaladoc - Update standard DFDL layout to include new version and fix org.apache consistency --- site/_releases/2.1.0.md | 13 +++++-------- site/dfdl-layout.md | 13 ++++--------- site/docs/latest | 2 +- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/site/_releases/2.1.0.md b/site/_releases/2.1.0.md index 75a4a8b..cd0eb21 100644 --- a/site/_releases/2.1.0.md +++ b/site/_releases/2.1.0.md @@ -1,19 +1,16 @@ --- -released: false +released: true apache: true title: 2.1.0 -date: 2018-01-26 +date: 2018-05-14 summary: > Apache incubation/relicensing, packed decimal support, ambiguous expression support, refactoring for future performance improvements -artifact-root: "https://dist.apache.org/repos/dist/dev/incubator/daffodil/2.1.0-rc3/"; -checksum-root: "https://dist.apache.org/repos/dist/dev/incubator/daffodil/2.1.0-rc3/"; -key-file: "https://dist.apache.org/repos/dist/dev/incubator/daffodil/KEYS"; -#artifact-root: "http://www.apache.org/dyn/closer.lua/incubator/daffodil/2.1.0/"; -#checksum-root: "http://www.apache.org/dist/incubator/daffodil/2.1.0/"; -#key-file: "http://www.apache.org/dist/incubator/daffodil/KEYS"; +artifact-root: "http://www.apache.org/dyn/closer.lua/incubator/daffodil/2.1.0/"; +checksum-root: "http://www.apache.org/dist/incubator/daffodil/2.1.0/"; +key-file: "http://www.apache.org/dist/incubator/daffodil/KEYS"; source-dist: - "apache-daffodil-2.1.0-incubating-src.zip" diff --git a/site/dfdl-layout.md b/site/dfdl-layout.md index e75b613..000d084 100644 --- a/site/dfdl-layout.md +++ b/site/dfdl-layout.md @@ -94,13 +94,8 @@ crossPaths := false testOptions in ThisBuild += Tests.Argument(TestFrameworks.JUnit, "-v") -resolvers in ThisBuild ++= Seq( - "NCSA Sonatype Releases" at "https://opensource.ncsa.illinois.edu/nexus/content/repositories/releases";, - "NCSA Sonatype Snapshots" at "https://opensource.ncsa.illinois.edu/nexus/content/repositories/snapshots"; -) - libraryDependencies in ThisBuild := Seq( - "edu.illinois.ncsa" %% "daffodil-tdml" % "2.0.0" % "test" + "org.apache.daffodil" %% "daffodil-tdml" % "2.1.0" % "test", "junit" % "junit" % "4.11" % "test", "com.novocode" % "junit-interface" % "0.10" % "test", ) @@ -125,7 +120,7 @@ Stylistically, the XSD ``elementFormDefault="unqualified"`` is the preferred sty The ``xs:include`` or ``xs:import`` elements of a DFDL Schema can import/include a DFDL schema that follows these conventions like this: ``` xml -<xs:import namespace="urn:tresys.com/RFormat" schemaLocation="com/tresys/RFormat/xsd/main.dfdl.xsd"/> +<xs:import namespace="urn:apache.org/RFormat" schemaLocation="org/apache/RFormat/xsd/main.dfdl.xsd"/> ``` The above is for using a DFDL schema as a library, from another different DFDL schema. @@ -136,9 +131,9 @@ Within a DFDL schema, one DFDL schema file can reference another peer file that <xs:include schemaLocation="format.dfdl.xsd"/> ``` -That is, peer files need not carry the long ``com/tresys/RFormat/xsd/`` prefix that makes the reference globally unique. +That is, peer files need not carry the long ``org/apache/RFormat/xsd/`` prefix that makes the reference globally unique. -However, if one schema wants to include another different schema, then this standard way of organizing schema projects ensures that when packaged into jar files, the ``/src/main/resources`` directory contents are at the "root" of the jar file so that the ``schemaLocation`` of the ``xs:import`` or ``xs:include`` containing the fully qualified path (``com/tresys/RFormat/xsd/main.dfdl.xsd``) will be found on the ``CLASSPATH`` unambiguously. This convention is what allows the schema files th [...] +However, if one schema wants to include another different schema, then this standard way of organizing schema projects ensures that when packaged into jar files, the ``/src/main/resources`` directory contents are at the "root" of the jar file so that the ``schemaLocation`` of the ``xs:import`` or ``xs:include`` containing the fully qualified path (``org/apache/RFormat/xsd/main.dfdl.xsd``) will be found on the ``CLASSPATH`` unambiguously. This convention is what allows the schema files th [...] ### Git Revision Control diff --git a/site/docs/latest b/site/docs/latest index 5133bb7..5308748 120000 --- a/site/docs/latest +++ b/site/docs/latest @@ -1 +1 @@ -2.0.0/ \ No newline at end of file +2.1.0/ \ No newline at end of file
