Skip to content
Permalink
Browse files
Updates to LICENSE/NOTICE
- Add explicit paths to files that are not Apache licensed
- Append -bin to LICENSE/NOTICE in daffodil-cli to clarify that it is
  for binary release files
- Add acknowledgments to UoI NCSA, Tresys, and IBM for their pre-ASF
  contributions
- Remove content from NOTICE files that is not legally required to be
  there (e.g. BSD copyrights)
- Remove Utility.scala. This was copied from the Scala library and we
  only use the most basic of features that are already accessible in scala
  lib. This file isn't needed.
- Move the PrettyPrinter.scala file out of the scalaLib directory. This
  file was originally based off of a file in the scala library. Since
  then, this file was essentially rewritten with completely different
  behavior. Since it is no longer looks anything like the scala lib
  version except for some function names, move it out of the directory
  to make this clear.
- Correct the short notice for W3C documents

DAFFODIL-1906
  • Loading branch information
stevedlawrence committed Apr 5, 2018
1 parent f23602a commit a9965181bfd558019b820f425d2d7603736476e6
Showing 30 changed files with 339 additions and 866 deletions.
64 LICENSE
@@ -208,8 +208,14 @@ The Apache Daffodil (incubating) project contains subcomponents with separate
copyright notices and license terms. Your use of the source code for the these
subcomponents is subject to the terms and conditions of the following licenses.

This product bundles source from 'Passera'. The source is available under a BSD
LICENSE.
This product bundles source from 'Passera', including all files under the
following directories:
- daffodil-lib/src/test/scala/passera/
- daffodil-lib/src/main/scala/passera/
These files are available under the BSD-2-Clause license:

Copyright (c) 2011-2013, Nate Nystrom
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -232,8 +238,14 @@ subcomponents is subject to the terms and conditions of the following licenses.
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

This product bundles source from 'Scala'. Specifically 'Utility.scala' and
'UniquenessCache.scala' The source is available under a BSD LICENSE.
This product bundles source from 'Scala', including the following files:
- daffodil-lib/src/main/scala/org/apache/daffodil/util/UniquenessCache.scala
These files are available under the BSD-3-Clause licnese:

Copyright (c) 2002- EPFL
Copyright (c) 2011- Lightbend, Inc.

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -261,14 +273,14 @@ subcomponents is subject to the terms and conditions of the following licenses.
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

This product bundles material copied or derived from W3C. Specific files
include:
- XMLSchema.dtd (https://www.w3.org/2001/XMLSchema.dtd)
- XMLSchema.xsd (https://www.w3.org/2001/XMLSchema.xsd)
- xml.xsd (https://www.w3.org/2001/xml.xsd)
- datatypes.dtd (https://www.w3.org/2001/datatypes.dtd)
- XMLSchema_for_DFDL.xsd (https://www.w3.org/2001/XMLSchema.dtd)
The source is available under the following license:
This product bundles material copied or derived from W3C, including the
following files:
- daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd (https://www.w3.org/2001/XMLSchema.dtd)
- daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.xsd (https://www.w3.org/2001/XMLSchema.xsd)
- daffodil-lib/src/main/resources/org/apache/daffodil/xsd/xml.xsd (https://www.w3.org/2001/xml.xsd)
- daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd (https://www.w3.org/2001/datatypes.dtd)
- daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd (https://www.w3.org/2001/XMLSchema.dtd)
These files are available under the W3C Software and Document Licnese:

By obtaining and/or copying this work, you (the licensee) agree that you have
read, understood, and will comply with the following terms and conditions.
@@ -306,9 +318,23 @@ subcomponents is subject to the terms and conditions of the following licenses.
permission. Title to copyright in this work will at all times remain with
copyright holders.

This product bundles source from the Open Grid Forum Data Format Description
Language (DFDL) v1.0 Specification. The source is available under the following
license:
This product bundles content from the Open Grid Forum Data Format Description
Language (DFDL) v1.0 Specification, including the following files:
- daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132.dfdl.xsd
- daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7131.dfdl.xsd
- daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc121_02.dfdl.xsd
- daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132_2.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_02.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_01.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_02.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc81_01.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_01.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_01.dfdl.xsd
- daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_03.dfdl.xsd
The content is available under the Open Grid Format license:

Intellectual Property Statement

@@ -339,6 +365,8 @@ subcomponents is subject to the terms and conditions of the following licenses.

Full Copyright Notice

Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.

This document and translations of it may be copied and furnished to others,
and derivative works that comment on or otherwise explain it or assist in
its implementation may be prepared, copied, published and distributed, in
@@ -357,3 +385,9 @@ subcomponents is subject to the terms and conditions of the following licenses.

The limited permissions granted above are perpetual and will not be revoked
by the OGF or its successors or assignees.

ICU - Copyright (c) 1995-2014 International Business Machines Corporation
and others

XPATH - Copyright © 2007 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
liability, trademark and document use rules apply.
67 NOTICE
@@ -4,66 +4,7 @@ Copyright 2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

******************
BSD License
******************

The following components are provided under a BSD style License

(BSD) Passera
The following NOTICE information applies:
Copyright (c) 2011-2013, Nate Nystrom
All rights reserved.

(BSD) Scala
The following NOTICE information applies:
Copyright (c) 2002- EPFL
Copyright (c) 2011- Lightbend, Inc.

All rights reserved.

******************
W3C Document License
******************

The following components are provided under the W3C Document License

(W3CD) W3C XML Schemas
The following NOTICE information applies:
Copyright © 2018 World Wide Web Consortium, (MIT, ERCIM, Keio, Beihang). All Rights Reserved.
http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231

******************
Open Grid Forum
******************

The following components are provided under the Open Grid Forum license

(OGF) Open Grid Forum Data Format Description Language (DFDL) v1.0 Specification
The following NOTICE information applies:
Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.

This document and translations of it may be copied and furnished to
others, and derivative works that comment on or otherwise explain it or
assist in its implementation may be prepared, copied, published and
distributed, in whole or in part, without restriction of any kind,
provided that the above copyright notice and this paragraph are included
as references to the derived portions on all such copies and derivative
works. The published OGF document from which such works are derived,
however, may not be modified in any way, such as by removing the
copyright notice or references to the OGF or other organizations, except
as needed for the purpose of developing new or updated OGF documents in
conformance with the procedures defined in the OGF Document Process, or
as required to translate it into languages other than English. OGF, with
the approval of its board, may remove this restriction for inclusion of
OGF document content for the purpose of producing standards in
cooperation with other international standards bodies.

The limited permissions granted above are perpetual and will not be
revoked by the OGF or its successors or assignees.

ICU - Copyright (c) 1995-2014 International Business Machines Corporation
and others

XPATH - Copyright © 2007 W3C® (MIT, ERCIM, Keio), All Rights Reserved.
W3C liability, trademark and document use rules apply.
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)

0 comments on commit a996518

Please sign in to comment.