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 2018/04/05 14:37:40 UTC
[incubator-daffodil] branch master updated: Updates to
LICENSE/NOTICE
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.git
The following commit(s) were added to refs/heads/master by this push:
new a996518 Updates to LICENSE/NOTICE
a996518 is described below
commit a9965181bfd558019b820f425d2d7603736476e6
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Mon Mar 5 11:19:11 2018 -0500
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
---
LICENSE | 64 ++-
NOTICE | 67 +---
daffodil-cli/{LICENSE => LICENSE-bin} | 142 +++----
daffodil-cli/NOTICE | 172 --------
daffodil-cli/NOTICE-bin | 90 +++++
daffodil-cli/build.sbt | 4 +-
.../org/apache/daffodil/xsd/XMLSchema.dtd | 10 +-
.../org/apache/daffodil/xsd/XMLSchema.xsd | 11 +-
.../org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd | 10 +-
.../org/apache/daffodil/xsd/datatypes.dtd | 10 +-
.../main/resources/org/apache/daffodil/xsd/xml.xsd | 10 +-
.../xml/{scalaLib => }/PrettyPrinter.scala | 14 +-
.../scala/org/apache/daffodil/xml/XMLUtils.scala | 2 +-
.../org/apache/daffodil/xml/scalaLib/Utility.scala | 436 ---------------------
.../xml/test/unit/TestXMLPrettyPrinter.scala | 21 +-
.../apache/daffodil/processors/Evaluatable.scala | 3 +-
.../ibm-contributed/dpaspc121_01.dfdl.xsd | 10 +-
.../ibm-contributed/dpaspc121_02.dfdl.xsd | 9 +-
.../ibm-contributed/dpaspc7133_01.dfdl.xsd | 9 +-
.../ibm-contributed/dpaspc81_01.dfdl.xsd | 9 +-
.../ibm-contributed/dpaspc82_01.dfdl.xsd | 10 +-
.../ibm-contributed/dpaspc83_01.dfdl.xsd | 10 +-
.../ibm-contributed/dpaspc83_02.dfdl.xsd | 10 +-
.../ibm-contributed/dpaspc83_03.dfdl.xsd | 10 +-
.../ibm-contributed/dpaspc_41_83_04_01.dfdl.xsd | 10 +-
.../ibm-contributed/dpaspc_41_83_04_02.dfdl.xsd | 9 +-
.../daffodil/ibm-tests/dpaspc121_02.dfdl.xsd | 9 +-
.../apache/daffodil/ibm-tests/dpaspc7131.dfdl.xsd | 11 +-
.../apache/daffodil/ibm-tests/dpaspc7132.dfdl.xsd | 12 +-
.../daffodil/ibm-tests/dpaspc7132_2.dfdl.xsd | 11 +-
30 files changed, 339 insertions(+), 866 deletions(-)
diff --git a/LICENSE b/LICENSE
index 54781ad..e6ef957 100644
--- a/LICENSE
+++ b/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.
diff --git a/NOTICE b/NOTICE
index f2bf998..e60ed06 100644
--- a/NOTICE
+++ b/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)
diff --git a/daffodil-cli/LICENSE b/daffodil-cli/LICENSE-bin
similarity index 85%
rename from daffodil-cli/LICENSE
rename to daffodil-cli/LICENSE-bin
index b05e2bb..4e3dd57 100644
--- a/daffodil-cli/LICENSE
+++ b/daffodil-cli/LICENSE-bin
@@ -208,8 +208,13 @@ 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 compiled source from 'Passera', including the following
+ files:
+ - passera/ directory in lib/org.apache.daffodil.daffodil-lib-2.1.0.jar
+ 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 +237,18 @@ 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 'Scala', including the following files:
+ - lib/org.scala-lang.modules.scala-parser-combinators_2.11-1.0.4.jar
+ - lib/org.scala-lang.modules.scala-xml_2.11-1.0.6.jar
+ - lib/org.scala-lang.scala-library-2.11.8.jar
+ - lib/org.scala-lang.scala-reflect-2.11.8.jar
+ - org/apache/daffodil/util/UniquenessCache.class in lib/org.apache.daffodil.daffodil-lib-2.1.0.jar
+ 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 +276,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:
+ - org/apache/daffodil/xsd/XMLSchema.dtd (https://www.w3.org/2001/XMLSchema.dtd) in lib/org.apache.daffodil.daffodil-lib-2.1.0.jar
+ - org/apache/daffodil/xsd/XMLSchema.xsd (https://www.w3.org/2001/XMLSchema.xsd) in lib/org.apache.daffodil.daffodil-lib-2.1.0.jar
+ - org/apache/daffodil/xsd/xml.xsd (https://www.w3.org/2001/xml.xsd) in lib/org.apache.daffodil.daffodil-lib-2.1.0.jar
+ - org/apache/daffodil/xsd/datatypes.dtd (https://www.w3.org/2001/datatypes.dtd) in lib/org.apache.daffodil.daffodil-lib-2.1.0.jar
+ - org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd (https://www.w3.org/2001/XMLSchema.dtd) in lib/org.apache.daffodil.daffodil-lib-2.1.0.jar
+ 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,60 +321,14 @@ 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:
-
- Intellectual Property Statement
-
- The OGF takes no position regarding the validity or scope of any
- intellectual property or other rights that might be claimed to pertain to
- the implementation or use of the technology described in this document or
- the extent to which any license under such rights might or might not be
- available; neither does it represent that it has made any effort to
- identify any such rights. Copies of claims of rights made available for
- publication and any assurances of licenses to be made available, or the
- result of an attempt made to obtain a general license or permission for the
- use of such proprietary rights by implementers or users of this
- specification can be obtained from the OGF Secretariat.
-
- The OGF invites any interested party to bring to its attention any
- copyrights, patents or patent applications, or other proprietary rights
- which may cover technology that may be required to practice this
- recommendation. Please address the information to the OGF Executive
- Director.
-
- Disclaimer
-
- This document and the information contained herein is provided on an As Is
- basis and the OGF disclaims all warranties, express or implied, including
- but not limited to any warranty that the use of the information herein will
- not infringe any rights or any implied warranties of merchantability or
- fitness for a particular purpose.
-
- Full Copyright Notice
-
- 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.
-
- This product bundles 'ICU4J' which is available under a "ICU" License. For
- details, see https://ssl.icu-project.org/repos/icu/icu4j/tags/release-51-2/main/shared/licenses/license.html
+ This product bundles 'ICU4J', including the following files:
+ - lib/com.ibm.icu.icu4j-51.1.jar
+ These files are available under the ICU License. For details, see
+ https://ssl.icu-project.org/repos/icu/icu4j/tags/release-51-2/main/shared/licenses/license.html
+
+ Copyright (c) 1995-2013 International Business Machines Corporation and others
+
+ All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"),
@@ -384,28 +353,30 @@ subcomponents is subject to the terms and conditions of the following licenses.
used in advertising or otherwise to promote the sale, use or other dealings in
this Software without prior written authorization of the copyright holder.
- This product bundles 'JDOM2' which is available under an Apache style License:
+ This product bundles 'JDOM2', including the following files:
+ - lib/org.jdom.jdom2-2.0.6.jar
+ These files are available under an Apache style License:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
-
+
1. Redistributions of source code must retain the above copyright
notice, this list of conditions, and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions, and the disclaimer that follows
these conditions in the documentation and/or other materials
provided with the distribution.
-
+
3. The name "JDOM" must not be used to endorse or promote products
derived from this software without prior written permission. For
written permission, please contact <request_AT_jdom_DOT_org>.
-
+
4. Products derived from this software may not be called "JDOM", nor
may "JDOM" appear in their name, without prior written permission
from the JDOM Project Management <request_AT_jdom_DOT_org>.
-
+
In addition, we request (but do not require) that you include in the
end-user documentation provided with the redistribution and/or in the
software itself an acknowledgement equivalent to the following:
@@ -415,7 +386,7 @@ subcomponents is subject to the terms and conditions of the following licenses.
Alternatively, the acknowledgment may be graphical using the logos
available at http://www.jdom.org/images/logos.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -428,15 +399,20 @@ 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 software consists of voluntary contributions made by many
individuals on behalf of the JDOM Project and was originally
created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
on the JDOM Project, please see <http://www.jdom.org/>.
- This product bundles 'JLine' which is available under a BSD license. For
- details, see https://github.com/jline/jline2/blob/master/LICENSE.txt
+ This product bundles 'JLine', including the following files:
+ - lib/jline.jline-2.12.1.jar
+ These files are available under a BSD-3-Clause license. For details, see
+ https://github.com/jline/jline2/blob/master/LICENSE.txt
+
+ Copyright (c) 2002-2016, the original author or authors.
+ All rights reserved.
http://www.opensource.org/licenses/bsd-license.php
@@ -470,8 +446,12 @@ subcomponents is subject to the terms and conditions of the following licenses.
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
- This product bundles 'Scallop' which is available under an MIT License. For
- details, see https://github.com/scallop/scallop/blob/develop/license.txt
+ This product bundles 'Scallop', including the following files:
+ - lib/org.rogach.scallop_2.11-0.9.5.jar
+ These files are available under under an MIT License. For details, see
+ https://github.com/scallop/scallop/blob/develop/license.txt
+
+ Copyright (C) 2012 Platon Pronko and Chris Hodapp
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
@@ -491,7 +471,11 @@ subcomponents is subject to the terms and conditions of the following licenses.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. scallop_2.11-0.9.5.jar
- This product product bundles 'Stax 2 API' which is licensed under a BSD license:
+ This product product bundles 'Stax 2 API', including the following files:
+ - lib/org.codehaus.woodstox.stax2-api-3.1.4.jar
+ These files are available under the BSD-2-Clause license:
+
+ Copyright 2010- FasterXML.com
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
diff --git a/daffodil-cli/NOTICE b/daffodil-cli/NOTICE
deleted file mode 100644
index 07b361d..0000000
--- a/daffodil-cli/NOTICE
+++ /dev/null
@@ -1,172 +0,0 @@
-Apache Daffodil
-Copyright 2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
-******************
-Apache Software License v2
-******************
-
-The following binary components are provided under the Apache Software License v2
-
- (ASLv2) Apache Commons IO
- The following NOTICE information applies:
- Apache Commons IO
- Copyright 2002-2016 The Apache Software Foundation
-
- (ASLv2) Apache Xerces Java
- The following NOTICE information applies:
- Apache Xerces Java
- Copyright 1999-2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
-
- Portions of this software were originally based on the following:
- - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
- - voluntary contributions made by Paul Eng on behalf of the
- Apache Software Foundation that were originally developed at iClick, Inc.,
- software copyright (c) 1999.
-
- (ASLv2) JDOM2
- The following NOTICE information applies:
- Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin.
-
- All rights reserved.
-
- This product includes software developed by the
- JDOM Project (http://www.jdom.org/).
-
- (ASLv2) Jansi
- The following NOTICE information applies:
- Copyright (C) 2009, Progress Software Corporation and/or its
- subsidiaries or affiliates. All rights reserved.
-
- (ASLv2) Jackson JSON processor
- The following NOTICE information applies:
- # Jackson JSON processor
-
- Jackson is a high-performance, Free/Open Source JSON processing library.
- It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
- been in development since 2007.
- It is currently developed by a community of developers, as well as supported
- commercially by FasterXML.com.
-
- ## Licensing
-
- Jackson core and extension components may licensed under different licenses.
- To find the details that apply to this artifact see the accompanying LICENSE file.
- For more information, including possible other licensing options, contact
- FasterXML.com (http://fasterxml.com).
-
- ## Credits
-
- A list of contributors may be found from CREDITS file, which is included
- in some artifacts (usually source distributions); but is always available
- from the source code management (SCM) system project uses.
-
- (ASLv2) Woodstox
- The following NOTICE information applies:
- This product currently only contains code developed by authors
- of specific components, as identified by the source code files.
-
- Since product implements StAX API, it has dependencies to StAX API
- classes.
-
-******************
-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.
-
- (BSD) JLine
- The following NOTICE information applies:
- Copyright (c) 2002-2016, the original author or authors.
- All rights reserved.
-
- (BSD) Stax 2 API
- The following NOTICE information applies:
- Copyright 2010- FasterXML.com
-
-******************
-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.
-
-******************
-ICU License
-******************
-
-The following components are provided under the ICU license
-
- (ICU) ICU4J
- The following NOTICE information applies:
- Copyright (c) 1995-2013 International Business Machines Corporation and others
-
- All rights reserved.
-
-******************
-MIT License
-******************
-
-The following components are provided under the MIT license
-
- (MIT) Scallop
- The following NOTICE information applies:
- Copyright (C) 2012 Platon Pronko and Chris Hodapp
diff --git a/daffodil-cli/NOTICE-bin b/daffodil-cli/NOTICE-bin
new file mode 100644
index 0000000..071ce34
--- /dev/null
+++ b/daffodil-cli/NOTICE-bin
@@ -0,0 +1,90 @@
+Apache Daffodil
+Copyright 2018 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)
+
+The following NOTICE information applies to binary components distributed with this project:
+
+Apache Xerces Java (lib/xerces.xercesImpl-2.10.0.jar)
+ Apache Xerces Java
+ Copyright 1999-2010 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - voluntary contributions made by Paul Eng on behalf of the
+ Apache Software Foundation that were originally developed at iClick, Inc.,
+ software copyright (c) 1999.
+
+Apache XML Commons Resolver (lib/xml-resolver.xml-resolver-1.2.jar)
+ Apache XML Commons Resolver
+ Copyright 2006 The Apache Software Foundation.
+
+ This product includes software developed at
+ The Apache Software Foundation http://www.apache.org/
+
+ Portions of this code are derived from classes placed in the
+ public domain by Arbortext on 10 Apr 2000. See:
+ http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
+
+Apache XML Commons XML APIs (lib/xml-apis.xml-apis-1.4.01.jar)
+ Apache XML Commons XML APIs
+ Copyright 1999-2009 The Apache Software Foundation.
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Portions of this software were originally based on the following:
+ - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+ - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+ - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+
+JDOM2 (lib/org.jdom.jdom2-2.0.6.jar)
+ Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin.
+
+ All rights reserved.
+
+ This product includes software developed by the
+ JDOM Project (http://www.jdom.org/).
+
+Jansi (lib/org.fusesource.jansi.jansi-1.14.jar)
+ Copyright (C) 2009, Progress Software Corporation and/or its
+ subsidiaries or affiliates. All rights reserved.
+
+Jackson JSON processor (lib/com.fasterxml.jackson.core.jackson-core-2.8.8.jar)
+ # Jackson JSON processor
+
+ Jackson is a high-performance, Free/Open Source JSON processing library.
+ It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+ been in development since 2007.
+ It is currently developed by a community of developers, as well as supported
+ commercially by FasterXML.com.
+
+ ## Licensing
+
+ Jackson core and extension components may licensed under different licenses.
+ To find the details that apply to this artifact see the accompanying LICENSE file.
+ For more information, including possible other licensing options, contact
+ FasterXML.com (http://fasterxml.com).
+
+ ## Credits
+
+ A list of contributors may be found from CREDITS file, which is included
+ in some artifacts (usually source distributions); but is always available
+ from the source code management (SCM) system project uses.
+
+Woodstox (lib/com.fasterxml.woodstox.woodstox-core-5.0.3.jar)
+ This product currently only contains code developed by authors
+ of specific components, as identified by the source code files.
+
+ Since product implements StAX API, it has dependencies to StAX API
+ classes.
diff --git a/daffodil-cli/build.sbt b/daffodil-cli/build.sbt
index 94870b0..57b961e 100644
--- a/daffodil-cli/build.sbt
+++ b/daffodil-cli/build.sbt
@@ -32,8 +32,8 @@ packageName in Linux := executableScriptName.value
packageName in Rpm := "apache-" + executableScriptName.value
mappings in Universal ++= Seq(
- baseDirectory.value / "LICENSE" -> "LICENSE",
- baseDirectory.value / "NOTICE" -> "NOTICE",
+ baseDirectory.value / "LICENSE-bin" -> "LICENSE",
+ baseDirectory.value / "NOTICE-bin" -> "NOTICE",
baseDirectory.value / ".." / "DISCLAIMER" -> "DISCLAIMER",
baseDirectory.value / "README.md" -> "README.md",
)
diff --git a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd
index 9ff783d..7b22dd2 100644
--- a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd
+++ b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.dtd
@@ -1,6 +1,12 @@
<!--
- Copyright © 2018 World Wide Web Consortium, (MIT, ERCIM, Keio, Beihang). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
+ Copyright © 2018 World Wide Web Consortium, (Massachusetts
+ Institute of Technology, European Research Consortium for Informatics and
+ Mathematics, Keio University, Beihang). All Rights Reserved. This work is
+ distributed under the W3C® Software License [1] in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ [1] http://www.w3.org/Consortium/Legal/copyright-software
-->
<!-- DTD for XML Schemas: Part 1: Structures
diff --git a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.xsd b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.xsd
index 83e520c..284a036 100644
--- a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.xsd
+++ b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema.xsd
@@ -1,8 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
-
<!--
- Copyright © 2018 World Wide Web Consortium, (MIT, ERCIM, Keio, Beihang). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
+ Copyright © 2018 World Wide Web Consortium, (Massachusetts
+ Institute of Technology, European Research Consortium for Informatics and
+ Mathematics, Keio University, Beihang). All Rights Reserved. This work is
+ distributed under the W3C® Software License [1] in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ [1] http://www.w3.org/Consortium/Legal/copyright-software
-->
<!-- XML Schema schema for XML Schemas: Part 1: Structures -->
diff --git a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd
index acb55a8..aa75bc1 100644
--- a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd
+++ b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd
@@ -1,7 +1,13 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
- Copyright © 2018 World Wide Web Consortium, (MIT, ERCIM, Keio, Beihang). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
+ Copyright © 2018 World Wide Web Consortium, (Massachusetts
+ Institute of Technology, European Research Consortium for Informatics and
+ Mathematics, Keio University, Beihang). All Rights Reserved. This work is
+ distributed under the W3C® Software License [1] in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ [1] http://www.w3.org/Consortium/Legal/copyright-software
-->
<!--
diff --git a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd
index ac4b7ac..7e7d3df 100644
--- a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd
+++ b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/datatypes.dtd
@@ -1,6 +1,12 @@
<!--
- Copyright © 2018 World Wide Web Consortium, (MIT, ERCIM, Keio, Beihang). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
+ Copyright © 2018 World Wide Web Consortium, (Massachusetts
+ Institute of Technology, European Research Consortium for Informatics and
+ Mathematics, Keio University, Beihang). All Rights Reserved. This work is
+ distributed under the W3C® Software License [1] in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ [1] http://www.w3.org/Consortium/Legal/copyright-software
-->
<!--
diff --git a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/xml.xsd b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/xml.xsd
index 7478be3..696fdc4 100644
--- a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/xml.xsd
+++ b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/xml.xsd
@@ -1,7 +1,13 @@
<?xml version='1.0'?>
<!--
- Copyright © 2018 World Wide Web Consortium, (MIT, ERCIM, Keio, Beihang). All Rights Reserved.
- http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231
+ Copyright © 2018 World Wide Web Consortium, (Massachusetts
+ Institute of Technology, European Research Consortium for Informatics and
+ Mathematics, Keio University, Beihang). All Rights Reserved. This work is
+ distributed under the W3C® Software License [1] in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ [1] http://www.w3.org/Consortium/Legal/copyright-software
-->
<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace"
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/xml/scalaLib/PrettyPrinter.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/xml/PrettyPrinter.scala
similarity index 96%
rename from daffodil-lib/src/main/scala/org/apache/daffodil/xml/scalaLib/PrettyPrinter.scala
rename to daffodil-lib/src/main/scala/org/apache/daffodil/xml/PrettyPrinter.scala
index ad8c177..b38c2e2 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/xml/scalaLib/PrettyPrinter.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/xml/PrettyPrinter.scala
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.daffodil.xml.scalaLib
+package org.apache.daffodil.xml
-import Utility.sbToString
import scala.xml._
import org.apache.daffodil.exceptions.Assert
@@ -168,7 +167,9 @@ class PrettyPrinter(step: Int) {
*/
def format(n: Node): String = {
val c = minimizeScopes(n)
- sbToString(format(c, _, 0))
+ val sb = new StringBuilder
+ format(c, sb, 0)
+ sb.toString
}
/**
@@ -177,8 +178,11 @@ class PrettyPrinter(step: Int) {
* @param nodes the sequence of nodes to be serialized
* @param pscope the namespace to prefix mapping
*/
- def formatNodes(nodes: Seq[Node]): String =
- sbToString(formatNodes(nodes, _))
+ def formatNodes(nodes: Seq[Node]): String = {
+ val sb = new StringBuilder
+ formatNodes(nodes, sb)
+ sb.toString
+ }
/**
* Appends a formatted string containing well-formed XML with
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/xml/XMLUtils.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/xml/XMLUtils.scala
index 7362142..c363f67 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/xml/XMLUtils.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/xml/XMLUtils.scala
@@ -874,7 +874,7 @@ Differences were (path, expected, actual):
// Note: we use our own pretty printer here because
// Scala library one doesn't preserve/print CDATA properly.
//
- val pp = new org.apache.daffodil.xml.scalaLib.PrettyPrinter(2)
+ val pp = new org.apache.daffodil.xml.PrettyPrinter(2)
val xmlString = pp.format(xml)
val fos = new java.io.FileOutputStream(tmpSchemaFile)
val fw = new java.io.OutputStreamWriter(fos, "utf-8")
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/xml/scalaLib/Utility.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/xml/scalaLib/Utility.scala
deleted file mode 100644
index d732c9e..0000000
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/xml/scalaLib/Utility.scala
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * 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:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * * Neither the name of the EPFL nor the names of its contributors may be
- * used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS”
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2003-2013, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-package org.apache.daffodil.xml.scalaLib
-
-import scala.xml._
-import scala.collection.mutable
-import scala.language.implicitConversions
-
-
-/**
- * Adapted from Scala libraries so their copyright is preserved here.
- *
- * This file exists to overcome a bug in the original scala libarary pretty printer
- * which is illustrated in unit test test_scala_xml_pretty_printer_normalizes_whitespace_inside_cdata_bug.
- */
-
-/**
- * The `Utility` object provides utility functions for processing instances
- * of bound and not bound XML classes, as well as escaping text nodes.
- *
- * @author Burak Emir
- */
-object Utility extends AnyRef with parsing.TokenTests {
- final val SU = '\u001A'
-
- // [Martin] This looks dubious. We don't convert StringBuilders to
- // Strings anywhere else, why do it here?
-
- implicit def implicitSbToString(sb: StringBuilder) = sb.toString()
-
- // helper for the extremely oft-repeated sequence of creating a
- // StringBuilder, passing it around, and then grabbing its String.
- private[xml] def sbToString(f: (StringBuilder) => Unit): String = {
- val sb = new StringBuilder
- f(sb)
- sb.toString
- }
- private[xml] def isAtomAndNotText(x: Node) = x.isAtom && !x.isInstanceOf[Text]
-
- /**
- * Trims an element - call this method, when you know that it is an
- * element (and not a text node) so you know that it will not be trimmed
- * away. With this assumption, the function can return a `Node`, rather
- * than a `Seq[Node]`. If you don't know, call `trimProper` and account
- * for the fact that you may get back an empty sequence of nodes.
- *
- * Precondition: node is not a text node (it might be trimmed)
- */
- def trim(x: Node): Node = x match {
- case Elem(pre, lab, md, scp, child @ _*) =>
- Elem(pre, lab, md, scp, true, (child flatMap trimProper): _*)
- }
-
- /**
- * trim a child of an element. `Attribute` values and `Atom` nodes that
- * are not `Text` nodes are unaffected.
- */
- def trimProper(x: Node): Seq[Node] = x match {
- case Elem(pre, lab, md, scp, child @ _*) =>
- Elem(pre, lab, md, scp, true, (child flatMap trimProper): _*)
- case Text(s) =>
- new TextBuffer().append(s).toText
- case _ =>
- x
- }
-
- /** returns a sorted attribute list */
- def sort(md: MetaData): MetaData = if ((md eq Null) || (md.next eq Null)) md else {
- val key = md.key
- val smaller = sort(md.filter { m => m.key < key })
- val greater = sort(md.filter { m => m.key > key })
- smaller.foldRight(md copy greater)((x, xs) => x copy xs)
- }
-
- /**
- * Return the node with its attribute list sorted alphabetically
- * (prefixes are ignored)
- */
- def sort(n: Node): Node = n match {
- case Elem(pre, lab, md, scp, child @ _*) =>
- Elem(pre, lab, sort(md), scp, true, (child map sort): _*)
- case _ => n
- }
-
- /**
- * Escapes the characters < > & and " from string.
- */
- final def escape(text: String): String = sbToString(escape(text, _))
-
- object Escapes {
- /**
- * For reasons unclear escape and unescape are a long ways from
- * being logical inverses.
- */
- val pairs = Map(
- "lt" -> '<',
- "gt" -> '>',
- "amp" -> '&',
- "quot" -> '"' // enigmatic comment explaining why this isn't escaped --
- // is valid xhtml but not html, and IE doesn't know it, says jweb
- // "apos" -> '\''
- )
- val escMap = pairs map { case (s, c) => c -> ("&%s;" format s) }
- val unescMap = pairs ++ Map("apos" -> '\'')
- }
- import Escapes.unescMap
-
- /**
- * Appends escaped string to `s`.
- */
- final def escape(text: String, s: StringBuilder): StringBuilder = {
- // Implemented per XML spec:
- // http://www.w3.org/International/questions/qa-controls
- // imperative code 3x-4x faster than current implementation
- // dpp (David Pollak) 2010/02/03
- val len = text.length
- var pos = 0
- while (pos < len) {
- text.charAt(pos) match {
- case '<' => s.append("<")
- case '>' => s.append(">")
- case '&' => s.append("&")
- case '"' => s.append(""")
- case '\n' => s.append('\n')
- case '\r' => s.append('\r')
- case '\t' => s.append('\t')
- case c => if (c >= ' ') s.append(c)
- }
-
- pos += 1
- }
- s
- }
-
- /**
- * Appends unescaped string to `s`, `amp` becomes `&`,
- * `lt` becomes `<` etc..
- *
- * @return `'''null'''` if `ref` was not a predefined entity.
- */
- final def unescape(ref: String, s: StringBuilder): StringBuilder =
- ((unescMap get ref) map (s append _)).orNull
-
- /**
- * Returns a set of all namespaces used in a sequence of nodes
- * and all their descendants, including the empty namespaces.
- */
- def collectNamespaces(nodes: Seq[Node]): mutable.Set[String] =
- nodes.foldLeft(new mutable.HashSet[String]) { (set, x) => collectNamespaces(x, set); set }
-
- /**
- * Adds all namespaces in node to set.
- */
- def collectNamespaces(n: Node, set: mutable.Set[String]) {
- if (n.doCollectNamespaces) {
- set += n.namespace
- for (a <- n.attributes) a match {
- case _: PrefixedAttribute =>
- set += a.getNamespace(n)
- case _ =>
- }
- for (i <- n.child)
- collectNamespaces(i, set)
- }
- }
-
- /**
- * Serialize an XML Node to a StringBuilder.
- *
- * This is essentially a minor rework of `toXML` that can't have the same name due to an unfortunate
- * combination of named/default arguments and overloading.
- *
- * @todo use a Writer instead
- */
- def serialize(
- x: Node,
- pscope: NamespaceBinding = TopScope,
- sb: StringBuilder = new StringBuilder,
- stripComments: Boolean = false,
- decodeEntities: Boolean = true,
- preserveWhitespace: Boolean = false,
- minimizeTags: MinimizeMode.Value = MinimizeMode.Default): StringBuilder =
- {
- x match {
- case c: Comment if !stripComments => c buildString sb
- //
- // If it's plain Text node, then unless preserve whitespace we have to
- // normalize whitespace.
- case s: Text =>
- if (preserveWhitespace) s buildString sb
- else sb.append(TextBuffer.fromString(s.toString).sb)
- //
- // other textual nodes (PCData, PI, etc.) we always preserve whitespace.
- //
- case s: SpecialNode => s buildString sb
- case g: Group =>
- for (c <- g.nodes) serialize(c, g.scope, sb, minimizeTags = minimizeTags); sb
- case el: Elem =>
- // print tag with namespace declarations
- sb.append('<')
- el.nameToString(sb)
- if (el.attributes ne null) el.attributes.buildString(sb)
- el.scope.buildString(sb, pscope)
- if (el.child.isEmpty &&
- (minimizeTags == MinimizeMode.Always ||
- (minimizeTags == MinimizeMode.Default && el.minimizeEmpty))) {
- // no children, so use short form: <xyz .../>
- sb.append("/>")
- } else {
- // children, so use long form: <xyz ...>...</xyz>
- sb.append('>')
- //
- // changed here to pass the additional flags so this knows
- // what to do recursively with whitespace and entities.
- //
- sequenceToXML(el.child, el.scope, sb, stripComments,
- decodeEntities, preserveWhitespace, minimizeTags)
- sb.append("</")
- el.nameToString(sb)
- sb.append('>')
- }
- case _ => throw new IllegalArgumentException("Don't know how to serialize a " + x.getClass.getName)
- }
- }
-
- def sequenceToXML(
- children: Seq[Node],
- pscope: NamespaceBinding = TopScope,
- sb: StringBuilder = new StringBuilder,
- stripComments: Boolean = false,
- decodeEntities: Boolean = true,
- preserveWhitespace: Boolean = false,
- minimizeTags: MinimizeMode.Value = MinimizeMode.Default): Unit =
- {
- if (children.isEmpty) return
- else if (children forall isAtomAndNotText) { // add space
- val it = children.iterator
- val f = it.next
- serialize(f, pscope, sb, stripComments, decodeEntities, preserveWhitespace, minimizeTags)
- while (it.hasNext) {
- val x = it.next
- if (!preserveWhitespace) sb.append(' ') // only if we're not preserving whitespace.
- serialize(x, pscope, sb, stripComments, decodeEntities, preserveWhitespace, minimizeTags)
- }
- } else children foreach { serialize(_, pscope, sb, stripComments, decodeEntities, preserveWhitespace, minimizeTags) }
- }
-
- /**
- * Returns prefix of qualified name if any.
- */
- final def prefix(name: String): Option[String] = (name indexOf ':') match {
- case -1 => None
- case i => Some(name.substring(0, i))
- }
-
- /**
- * Returns a hashcode for the given constituents of a node
- */
- def hashCode(pre: String, label: String, attribHashCode: Int, scpeHash: Int, children: Seq[Node]) =
- scala.util.hashing.MurmurHash3.orderedHash(label +: attribHashCode +: scpeHash +: children, pre.##)
-
- def appendQuoted(s: String): String = sbToString(appendQuoted(s, _))
-
- /**
- * Appends "s" if string `s` does not contain ",
- * 's' otherwise.
- */
- def appendQuoted(s: String, sb: StringBuilder) = {
- val ch = if (s contains '"') '\'' else '"'
- sb.append(ch).append(s).append(ch)
- }
-
- /**
- * Appends "s" and escapes and " i s with \"
- */
- def appendEscapedQuoted(s: String, sb: StringBuilder): StringBuilder = {
- sb.append('"')
- for (c <- s) c match {
- case '"' =>
- sb.append('\\'); sb.append('"')
- case _ => sb.append(c)
- }
- sb.append('"')
- }
-
- def getName(s: String, index: Int): String = {
- if (index >= s.length) null
- else {
- val xs = s drop index
- if (xs.nonEmpty && isNameStart(xs.head)) xs takeWhile isNameChar
- else ""
- }
- }
-
- /**
- * Returns `'''null'''` if the value is a correct attribute value,
- * error message if it isn't.
- */
- def checkAttributeValue(value: String): String = {
- var i = 0
- while (i < value.length) {
- value.charAt(i) match {
- case '<' =>
- return "< not allowed in attribute value";
- case '&' =>
- val n = getName(value, i + 1)
- if (n eq null)
- return "malformed entity reference in attribute value [" + value + "]";
- i = i + n.length + 1
- if (i >= value.length || value.charAt(i) != ';')
- return "malformed entity reference in attribute value [" + value + "]";
- case _ =>
- }
- i = i + 1
- }
- null
- }
-
- def parseAttributeValue(value: String): Seq[Node] = {
- val sb = new StringBuilder
- var rfb: StringBuilder = null
- val nb = new NodeBuffer()
-
- val it = value.iterator
- while (it.hasNext) {
- var c = it.next
- // entity! flush buffer into text node
- if (c == '&') {
- c = it.next
- if (c == '#') {
- c = it.next
- val theChar = parseCharRef({ () => c }, { () => c = it.next }, { s => throw new RuntimeException(s) }, { s => throw new RuntimeException(s) })
- sb.append(theChar)
- } else {
- if (rfb eq null) rfb = new StringBuilder()
- rfb append c
- c = it.next
- while (c != ';') {
- rfb.append(c)
- c = it.next
- }
- val ref = rfb.toString()
- rfb.clear()
- unescape(ref, sb) match {
- case null =>
- if (sb.length > 0) { // flush buffer
- nb += Text(sb.toString())
- sb.clear()
- }
- nb += EntityRef(ref) // add entityref
- case _ =>
- }
- }
- } else sb append c
- }
- if (sb.length > 0) { // flush buffer
- val x = Text(sb.toString())
- if (nb.length == 0)
- return x
- else
- nb += x
- }
- nb
- }
-
- /**
- * {{{
- * CharRef ::= "&#" '0'..'9' {'0'..'9'} ";"
- * | "&#x" '0'..'9'|'A'..'F'|'a'..'f' { hexdigit } ";"
- * }}}
- * See [66]
- */
- def parseCharRef(ch: () => Char, nextch: () => Unit, reportSyntaxError: String => Unit, reportTruncatedError: String => Unit): String = {
- val hex = (ch() == 'x') && { nextch(); true }
- val base = if (hex) 16 else 10
- var i = 0
- while (ch() != ';') {
- ch() match {
- case '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' =>
- i = i * base + ch().asDigit
- case 'a' | 'b' | 'c' | 'd' | 'e' | 'f'
- | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' =>
- if (!hex)
- reportSyntaxError("hex char not allowed in decimal char ref\n" +
- "Did you mean to write &#x ?")
- else
- i = i * base + ch().asDigit
- case SU =>
- reportTruncatedError("")
- case _ =>
- reportSyntaxError("character '" + ch() + "' not allowed in char ref\n")
- }
- nextch()
- }
- new String(Array(i), 0, 1)
- }
-}
diff --git a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLPrettyPrinter.scala b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLPrettyPrinter.scala
index 22bacec..bd0a56a 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLPrettyPrinter.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLPrettyPrinter.scala
@@ -55,10 +55,9 @@ class TestXMLPrettyPrinter {
// because we know scala's XML literals don't preserve CDATA as PCData nodes
// we force it to have a PCData node by constructing one explicitly here.
//
- import org.apache._
val pcdata = scala.xml.PCData("a\nb")
val fragment = <x>{ pcdata }</x>
- val pp = new daffodil.xml.scalaLib.PrettyPrinter(2)
+ val pp = new org.apache.daffodil.xml.PrettyPrinter(2)
val xmlString = pp.format(fragment)
//
// This verifies that our modified pretty printer does the right thing
@@ -70,11 +69,10 @@ class TestXMLPrettyPrinter {
@Test def test_daffodil_pretty_printer_preserves_whitespace_inside_text() {
- import org.apache._
val str = """aaaaa
bbbbb"""
val fragment = <xxxxx><yyyyy><zzzzz>{ str }</zzzzz></yyyyy></xxxxx>
- val pp = new daffodil.xml.scalaLib.PrettyPrinter(2)
+ val pp = new org.apache.daffodil.xml.PrettyPrinter(2)
val xmlString = pp.format(fragment)
assertEquals("""<xxxxx>
<yyyyy>
@@ -89,10 +87,9 @@ bbbbb</zzzzz>
// because we know scala's XML literals don't preserve CDATA as PCData nodes
// we force it to have a PCData node by constructing one explicitly here.
//
- import org.apache._
val pcdata = scala.xml.PCData(" aaaaa\nbbbbb ")
val fragment = <xxxxx><yyyyy><zzzzz>{ pcdata }</zzzzz></yyyyy></xxxxx>
- val pp = new daffodil.xml.scalaLib.PrettyPrinter(2)
+ val pp = new org.apache.daffodil.xml.PrettyPrinter(2)
val xmlString = pp.format(fragment)
//
// This verifies that our modified pretty printer does the right thing
@@ -111,10 +108,9 @@ bbbbb ]]></zzzzz>
// because we know scala's XML literals don't preserve CDATA as PCData nodes
// we force it to have a PCData node by constructing one explicitly here.
- import org.apache._
val pcdata = scala.xml.PCData(" aaaaa\nbbbbb ")
val fragment = <xxxxx><yyyyy><zzzzz>{ pcdata } xyzzy { pcdata }</zzzzz></yyyyy></xxxxx>
- val pp = new daffodil.xml.scalaLib.PrettyPrinter(2)
+ val pp = new org.apache.daffodil.xml.PrettyPrinter(2)
var xmlString = pp.format(fragment)
//
// This verifies that our modified pretty printer does the right thing
@@ -149,9 +145,8 @@ bbbbb ]]></zzzzz>
@Test def test_daffodil_pretty_printer_preserves_simple_values1() {
- import org.apache._
val fragment = <xxxxx><yyyyy><zzzzz>aaaaa bbbbb ccccc ddddd eeeee fffff ggggg</zzzzz></yyyyy></xxxxx>
- val pp = new daffodil.xml.scalaLib.PrettyPrinter(2)
+ val pp = new org.apache.daffodil.xml.PrettyPrinter(2)
val xmlString = pp.format(fragment)
val expected = """<xxxxx>
<yyyyy>
@@ -163,9 +158,8 @@ bbbbb ]]></zzzzz>
@Test def test_daffodil_pretty_printer_removes_redundant_xmlns_bindings() {
- import org.apache._
val fragment = <xxxxx xmlns="foobar"><yyyyy><zzzzz xmlns="foobar">aaaaa bbbbb ccccc ddddd eeeee fffff ggggg</zzzzz></yyyyy></xxxxx>
- val pp = new daffodil.xml.scalaLib.PrettyPrinter(2)
+ val pp = new org.apache.daffodil.xml.PrettyPrinter(2)
val xmlString = pp.format(fragment)
//
val expected = """<xxxxx xmlns="foobar">
@@ -178,9 +172,8 @@ bbbbb ]]></zzzzz>
@Test def test_daffodil_pretty_printer_newlines_and_indents1() {
- import org.apache._
val fragment = <tns:row2 xmlns:tns="http://example.com"><cell>-9</cell><cell>-2</cell><cell>-8</cell></tns:row2>
- val pp = new daffodil.xml.scalaLib.PrettyPrinter(2)
+ val pp = new org.apache.daffodil.xml.PrettyPrinter(2)
val xmlString = pp.format(fragment)
//
val expected = """<tns:row2 xmlns:tns="http://example.com">
diff --git a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/Evaluatable.scala b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/Evaluatable.scala
index bc8700a..ad36037 100644
--- a/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/Evaluatable.scala
+++ b/daffodil-runtime1/src/main/scala/org/apache/daffodil/processors/Evaluatable.scala
@@ -27,7 +27,6 @@ import org.apache.daffodil.util.Maybe
import org.apache.daffodil.util.Maybe._
import org.apache.daffodil.exceptions.Assert
import scala.collection.JavaConversions._
-import org.apache.daffodil.xml.scalaLib
import org.apache.daffodil.dpath.ExpressionEvaluationException
import org.apache.daffodil.xml._
import org.apache.daffodil.api.Diagnostic
@@ -335,7 +334,7 @@ abstract class Evaluatable[+T <: AnyRef](protected val rd: RuntimeData, qNameArg
// looks like XML with child elements or other things that begin with "<", but no quotes
"<![CDATA[" + stringValue + "]]>"
} else {
- scalaLib.Utility.escape(stringValue)
+ scala.xml.Utility.escape(stringValue)
}
val res = pseudoAttributeName + "=\"" + pseudoXMLStringValue + "\""
res
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_01.dfdl.xsd
index bac920d..16206cd 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_01.dfdl.xsd
@@ -15,17 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
-
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd
index 907e94e..57b71ff 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd
@@ -15,15 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
<xs:annotation>
<!-- Defaulted property values minimum needed for a text boolean-->
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd
index b6eed82..e2180a3 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd
@@ -15,15 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
<xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc81_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc81_01.dfdl.xsd
index b781a2c..09447c8 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc81_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc81_01.dfdl.xsd
@@ -15,15 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="qualified"
attributeFormDefault="qualified" >
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
<!--
From section 8.1 examples Providing Defaults for DFDL properties Only
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd
index 78b60b1..c94aa06 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd
@@ -15,17 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="qualified"
attributeFormDefault="qualified" >
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
-
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format initiator="" terminator="" leadingSkip="0" trailingSkip="0"
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_01.dfdl.xsd
index 908e865..1af10b6 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_01.dfdl.xsd
@@ -15,16 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="qualified">
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
-
<!--
added all the namespace stuff to schema tag added textNumber format
number of properties needed to be defaulted. quotes
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_02.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_02.dfdl.xsd
index b5dbaab..e26cb24 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_02.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_02.dfdl.xsd
@@ -15,16 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="qualified">
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
-
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format initiator="" terminator="" leadingSkip="0" trailingSkip="0"
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_03.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_03.dfdl.xsd
index 64fefc3..c57bbcb 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_03.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc83_03.dfdl.xsd
@@ -15,17 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="qualified"
attributeFormDefault="qualified" >
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
-
<!--
added all the namespace stuff to schema tag added textNumber format
number of properties needed to be defaulted. quotes
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_01.dfdl.xsd
index 2e689f7..73c4e28 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_01.dfdl.xsd
@@ -15,16 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:tns2="http://tns2" xmlns:tns1="http://tns1">
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
-
<!-- add this for other schema -->
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_02.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_02.dfdl.xsd
index 1f1b2dc..859db0e 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_02.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc_41_83_04_02.dfdl.xsd
@@ -15,14 +15,15 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://tns2">
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
<!--
added all the namespace stuff to schema tag added textNumber format
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc121_02.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc121_02.dfdl.xsd
index 7eaf4c4..365b2a7 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc121_02.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc121_02.dfdl.xsd
@@ -15,15 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
<xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7131.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7131.dfdl.xsd
index a1e1826..11321b8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7131.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7131.dfdl.xsd
@@ -15,6 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
@@ -22,10 +27,6 @@
attributeFormDefault="unqualified" >
<xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
<!--
7.1.3.1 Representation Property Binding Syntax: Attribute Form spec v.40
@@ -86,4 +87,4 @@ Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
</xs:sequence>
</xs:complexType>
</xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132.dfdl.xsd
index 7634286..178e388 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132.dfdl.xsd
@@ -15,6 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
@@ -22,11 +27,6 @@
attributeFormDefault="unqualified" >
<xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
-
<!--
7.1.3.2 Representation Property Binding Syntax: Element Form spec v.40
-->
@@ -90,4 +90,4 @@ Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
</xs:sequence>
</xs:complexType>
</xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132_2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132_2.dfdl.xsd
index 3c1f8e9..f94d58a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132_2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/ibm-tests/dpaspc7132_2.dfdl.xsd
@@ -15,16 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ Portions of this schema taken from examples in Data Format Description Language (DFDL) v1.0 Specification
+ Copyright (C) Open Grid Forum (2005-2014). Some Rights Reserved.
+ https://www.ogf.org/ogf/doku.php/about/copyright
+-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
<xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
- <!-- Portions of this schema taken from example in
- Data Format Description Language (DFDL) v1.0 Specification, Copyright © Global Grid Forum (2004-2006). All Rights Reserved.
-Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
- -->
<!--
7.1.3.2 Representation Property Binding Syntax: Element Form
@@ -66,4 +67,4 @@ Copyright © Open Grid Forum, (2006-2010). All Rights Reserved.
<xs:element name="element1" type="xs:string" dfdl:ref="config"
dfdl:representation="text" />
-</xs:schema>
\ No newline at end of file
+</xs:schema>
--
To stop receiving notification emails like this one, please contact
slawrence@apache.org.