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/daffodil-site.git
commit 92fd6fe46ecfd99960093b1a945b58505922a712 Author: Steve Lawrence <[email protected]> AuthorDate: Tue Feb 16 09:02:36 2021 -0500 Remove incuating identifier - Removes all instances of "incubating", except for those in filenames/docs of previous releases. This makes it clear that those releases are considered incubating releases. Future releases will not have this identifier. - Removes the disclaimer file and footer text DAFFODIL-2470 --- .github/workflows/main.yml | 2 +- DISCLAIMER | 7 ------- README.md | 4 ++-- site/_includes/themes/apache/_navigation.html | 6 +++--- site/_includes/themes/apache/default.html | 2 +- site/_includes/themes/apache/footer.html | 21 ++----------------- site/_layouts/release.html | 2 +- .../apache/img/incubator_feather_egg_logo.png | Bin 30207 -> 0 bytes site/community.md | 4 ++-- site/configuration.md | 2 +- site/doap.rdf | 10 ++++----- site/eclipse-configuration.md | 14 ++++++------- site/releases.md | 2 +- site/tdml.md | 2 +- site/tutorials/DFDLTutorialStylesheet.xsl | 23 +++------------------ 15 files changed, 30 insertions(+), 71 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8d299ad..8d9544f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,7 +54,7 @@ jobs: jekyll build --source site - name: Publish - if: github.repository == 'apache/incubator-daffodil-site' + if: github.repository == 'apache/daffodil-site' run: | git checkout asf-site rm -rf content diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index d2696a9..0000000 --- a/DISCLAIMER +++ /dev/null @@ -1,7 +0,0 @@ -Apache Daffodil is an effort undergoing incubation at The Apache Software -Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required -of all newly accepted projects until a further review indicates that the -infrastructure, communications, and decision making process have stabilized in -a manner consistent with other successful ASF projects. While incubation status -is not necessarily a reflection of the completeness or stability of the code, -it does indicate that the project has yet to be fully endorsed by the ASF. diff --git a/README.md b/README.md index 55ceb5d..d184c8b 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ limitations under the License. {% endcomment %} --> -# Apache Daffodil (incubating) Website +# Apache Daffodil Website -The Apache Daffodil (incubating) web site is based off of the [Apache Website Template](https://github.com/apache/apache-website-template). +The Apache Daffodil website is based off of the [Apache Website Template](https://github.com/apache/apache-website-template). The website is generated using [Jekyll](https://jekyllrb.com/) and some plug-ins for it. diff --git a/site/_includes/themes/apache/_navigation.html b/site/_includes/themes/apache/_navigation.html index 54476c7..fdcfeea 100644 --- a/site/_includes/themes/apache/_navigation.html +++ b/site/_includes/themes/apache/_navigation.html @@ -27,7 +27,7 @@ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Development<b class="caret"></b></a> <ul class="dropdown-menu dropdown-left"> <li><a class="external" href="https://cwiki.apache.org/confluence/display/DAFFODIL/";>Wiki</a></li> - <li><a class="external" href="https://github.com/search?q=repo%3Aapache%2Fincubator-daffodil+repo%3Aapache%2Fincubator-daffodil-site&type=Repositories";>GitHub</a></li> + <li><a class="external" href="https://github.com/search?q=repo%3Aapache%2Fdaffodil+repo%3Aapache%2Fdaffodil-site&type=Repositories";>GitHub</a></li> <li><a class="external" href="https://issues.apache.org/jira/projects/DAFFODIL/";>JIRA</a></li> </ul> </li> @@ -50,8 +50,8 @@ {% if page.title == "Home" %} <div class="title jumbotron"> <div class="container"> - <h1>Apache Daffodil <small>(incubating)</small></h1> - <p>Open-source implementation of the Data Format Description Language to convert between fixed format data and XML/JSON.</p> + <h1>Apache Daffodil</h1> + <p>Open-source implementation of the Data Format Description Language to convert between fixed format data and XML, JSON, and other data structures.</p> {% assign latest = site.releases | where: 'released', 'true' | sort: 'date' | last %} <a href="{{ latest.url }}" class="btn btn-primary btn-lg bigFingerButton" role="button"> diff --git a/site/_includes/themes/apache/default.html b/site/_includes/themes/apache/default.html index 3fd1584..3adc99a 100644 --- a/site/_includes/themes/apache/default.html +++ b/site/_includes/themes/apache/default.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>Apache Daffodil (incubating) | {{ page.title }}</title> + <title>Apache Daffodil | {{ page.title }}</title> {% if page.description %}<meta name="description" content="{{ page.description }}">{% endif %} <meta name="author" content="{{ site.author.name }}"> diff --git a/site/_includes/themes/apache/footer.html b/site/_includes/themes/apache/footer.html index db528d3..06f97fa 100644 --- a/site/_includes/themes/apache/footer.html +++ b/site/_includes/themes/apache/footer.html @@ -2,31 +2,14 @@ <div class="wrapper"> <div class="footer-col-wrapper" style="font-size: .85em;"> <hr> - <div class="container"> - <div class="row"> - <div class="col-xs-3" style="margin-top: 15px;"> - <a href="https://incubator.apache.org";><img src="/assets/themes/apache/img/incubator_feather_egg_logo.png" - alt="Apache Incubator" style="width:100%;"/></a> - </div> - <div class="col-xs-9"> - Apache Daffodil is an effort undergoing <a href="https://incubator.apache.org/index.html";>Incubation</a> - at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly - accepted projects until a further review indicates that the infrastructure, communications, and decision - making process have stabilized in a manner consistent with other successful ASF projects. While incubation - status is not necessarily a reflection of the completeness or stability of the code, it does indicate that - the project has yet to be fully endorsed by the ASF. - </div> - </div> - </div> - <hr> <div> <div style="text-align: center;"> Copyright © 2021 <a href="https://www.apache.org";>The Apache Software Foundation</a>. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0</a>. <br> - Apache, the Apache Incubator project logo, Apache Daffodil, Daffodil, and the - Apache Daffodil logo are trademarks of The Apache Software Foundation. + Apache, Apache Daffodil, Daffodil, and the Apache Daffodil logo + are trademarks of The Apache Software Foundation. </div> </div> </div> diff --git a/site/_layouts/release.html b/site/_layouts/release.html index 0dd7cef..c01ac78 100644 --- a/site/_layouts/release.html +++ b/site/_layouts/release.html @@ -13,7 +13,7 @@ permalink: /release/release-notes-:title {% unless page.apache %} <div class="alert alert-warning"> - This release is from prior to Daffodil's acceptance into the Apache Incubator. + This release is from prior to Daffodil's acceptance into the Apache Software Foundation. It is not an Apache Software Foundation release, and is licensed under the <a href="https://opensource.org/licenses/NCSA";>NCSA license</a>. </div> diff --git a/site/assets/themes/apache/img/incubator_feather_egg_logo.png b/site/assets/themes/apache/img/incubator_feather_egg_logo.png deleted file mode 100644 index 338169e..0000000 Binary files a/site/assets/themes/apache/img/incubator_feather_egg_logo.png and /dev/null differ diff --git a/site/community.md b/site/community.md index 6100649..3130f3a 100644 --- a/site/community.md +++ b/site/community.md @@ -76,8 +76,8 @@ Enhancement requests for new features are also welcome. The more concrete and ra ### Source Code -The project sources are accessible via [GitHub](https://github.com/apache/incubator-daffodil) and [ASF](https://gitbox.apache.org/repos/asf?p=incubator-daffodil.git). +The project sources are accessible via [GitHub](https://github.com/apache/daffodil) and [ASF](https://gitbox.apache.org/repos/asf?p=daffodil.git). ### Website Source Code -The project website sources are accessible via [GitHub](https://github.com/apache/incubator-daffodil-site) and [ASF](https://gitbox.apache.org/repos/asf?p=incubator-daffodil-site.git). +The project website sources are accessible via [GitHub](https://github.com/apache/daffodil-site) and [ASF](https://gitbox.apache.org/repos/asf?p=daffodil-site.git). diff --git a/site/configuration.md b/site/configuration.md index 291bbde..c8a8f98 100644 --- a/site/configuration.md +++ b/site/configuration.md @@ -22,7 +22,7 @@ limitations under the License. {% endcomment %} --> -Daffodil has the capability to read in parameters via an external XML file, defined by the [dafext.xsd](https://github.com/apache/incubator-daffodil/blob/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd) schema. Below are the parameters that can be defined. +Daffodil has the capability to read in parameters via an external XML file, defined by the [dafext.xsd](https://github.com/apache/daffodil/blob/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd) schema. Below are the parameters that can be defined. ### External Variables diff --git a/site/doap.rdf b/site/doap.rdf index 5cb3849..5d8e3c3 100644 --- a/site/doap.rdf +++ b/site/doap.rdf @@ -26,7 +26,7 @@ <name>Apache Daffodil</name> <created>2017-08-27</created> <license rdf:resource="http://spdx.org/licenses/Apache-2.0"; /> - <asfext:pmc rdf:resource="https://incubator.apache.org"; /> + <asfext:pmc rdf:resource="https://daffodil.apache.org"; /> <shortdesc>Apache Daffodil is an open-source implementation of the Data Format Description Language to convert between fixed format @@ -57,14 +57,14 @@ <repository> <GitRepository> - <location rdf:resource="https://github.com/apache/incubator-daffodil"/> - <browse rdf:resource="https://github.com/apache/incubator-daffodil"/> + <location rdf:resource="https://github.com/apache/daffodil"/> + <browse rdf:resource="https://github.com/apache/daffodil"/> </GitRepository> </repository> <repository> <GitRepository> - <location rdf:resource="https://github.com/apache/incubator-daffodil-site"/> - <browse rdf:resource="https://github.com/apache/incubator-daffodil-site"/> + <location rdf:resource="https://github.com/apache/daffodil-site"/> + <browse rdf:resource="https://github.com/apache/daffodil-site"/> </GitRepository> </repository> diff --git a/site/eclipse-configuration.md b/site/eclipse-configuration.md index 7b9ecc7..4b5f32a 100644 --- a/site/eclipse-configuration.md +++ b/site/eclipse-configuration.md @@ -61,13 +61,13 @@ If also editing TDML file in Eclipse, repeat the above steps, replacing all inst Download the following files to a local directory. Alternatively, these files are included in the Daffodil source code in the ``src/main/resources/org/apache/daffodil/xsd/`` directory in either ``daffodil-lib/`` or ``daffodil-propgen/``. -* [datatypes.dtd](https://raw.githubusercontent.com/apache/incubator-daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd) -* [tdml.xsd](https://raw.githubusercontent.com/apache/incubator-daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd) -* [XMLSchema.dtd](https://raw.githubusercontent.com/apache/incubator-daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd) -* [XMLSchema_for_DFDL.xsd](https://raw.githubusercontent.com/apache/incubator-daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd) -* [DFDL_part1_simpletypes.xsd](https://raw.githubusercontent.com/apache/incubator-daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd) -* [DFDL_part2_attributes.xsd](https://raw.githubusercontent.com/apache/incubator-daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd) -* [DFDL_part3_model.xsd](https://raw.githubusercontent.com/apache/incubator-daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part3_model.xsd) +* [datatypes.dtd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd) +* [tdml.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd) +* [XMLSchema.dtd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd) +* [XMLSchema_for_DFDL.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd) +* [DFDL_part1_simpletypes.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd) +* [DFDL_part2_attributes.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd) +* [DFDL_part3_model.xsd](https://raw.githubusercontent.com/apache/daffodil/master/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/DFDL_part3_model.xsd) Modify the Eclipse settings to reference these files: diff --git a/site/releases.md b/site/releases.md index a3444d7..8bc5168 100644 --- a/site/releases.md +++ b/site/releases.md @@ -54,7 +54,7 @@ No official Apache releases have been made yet. <a href="/community">Get involve <div class="alert alert-warning"> All releases below are from prior to Daffodil's acceptance into - the Incubator. They are not Apache Software Foundation releases, + the Apache Software Foundation. They are not Apache Software Foundation releases, and are licensed under the <a href="https://opensource.org/licenses/NCSA";>NCSA license</a>. </div> diff --git a/site/tdml.md b/site/tdml.md index afa6a16..45946d5 100644 --- a/site/tdml.md +++ b/site/tdml.md @@ -40,7 +40,7 @@ absolutely best way to demonstrate a problem. By convention, a TDML file uses the file extension ``.tdml``, or ``.tdml.xml`` when used with the TDML "tutorial" feature. -The schema for a TDML file is available on [GitHub](https://github.com/apache/incubator-daffodil/blob/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd). +The schema for a TDML file is available on [GitHub](https://github.com/apache/daffodil/blob/master/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/tdml.xsd). Below is an annotated TDML file for a very simple example: diff --git a/site/tutorials/DFDLTutorialStylesheet.xsl b/site/tutorials/DFDLTutorialStylesheet.xsl index 918cb3d..50087e2 100644 --- a/site/tutorials/DFDLTutorialStylesheet.xsl +++ b/site/tutorials/DFDLTutorialStylesheet.xsl @@ -189,7 +189,7 @@ <a href="#" data-toggle="dropdown" class="dropdown-toggle">Development<b class="caret"></b></a> <ul class="dropdown-menu dropdown-left"> <li><a class="external" href="https://cwiki.apache.org/confluence/display/DAFFODIL/";>Wiki</a></li> - <li><a class="external" href="https://github.com/search?q=repo%3Aapache%2Fincubator-daffodil+repo%3Aapache%2Fincubator-daffodil-site&type=Repositories";>GitHub</a></li> + <li><a class="external" href="https://github.com/search?q=repo%3Aapache%2Fdaffodil+repo%3Aapache%2Fdaffodil-site&type=Repositories";>GitHub</a></li> <li><a class="external" href="https://issues.apache.org/jira/projects/DAFFODIL/";>JIRA</a></li> </ul> </li> @@ -241,31 +241,14 @@ <div class="wrapper"> <div class="footer-col-wrapper" style="font-size: .85em;"> <hr/> - <div class="container"> - <div class="row"> - <div class="col-xs-3" style="margin-top: 15px;"> - <a href="https://incubator.apache.org";><img src="https://daffodil.apache.org/assets/themes/apache/img/incubator_feather_egg_logo.png"; - alt="Apache Incubator" style="width:100%;"/></a> - </div> - <div class="col-xs-9"> - Apache Daffodil is an effort undergoing <a href="https://incubator.apache.org/index.html";>Incubation</a> - at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly - accepted projects until a further review indicates that the infrastructure, communications, and decision - making process have stabilized in a manner consistent with other successful ASF projects. While incubation - status is not necessarily a reflection of the completeness or stability of the code, it does indicate that - the project has yet to be fully endorsed by the ASF. - </div> - </div> - </div> - <hr/> <div> <div style="text-align: center;"> Copyright © 2021 <a href="https://www.apache.org";>The Apache Software Foundation</a>. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 2.0</a>. <br/> - Apache, the Apache Incubator project logo, Apache Daffodil, Daffodil, and the - Apache Daffodil logo are trademarks of The Apache Software Foundation. + Apache, Apache Daffodil, Daffodil, and the Apache Daffodil logo + are trademarks of The Apache Software Foundation. </div> </div> </div>
![https://daffodil.apache.org/assets/themes/apache/img/incubator_feather_egg_logo.png"](https://daffodil.apache.org/assets/themes/apache/img/incubator_feather_egg_logo.png"){kind=link}