From 6ebb5e11ef97a6ac1c6081c41c379924f6f8f944 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Thu, 21 Feb 2008 16:44:46 +0000 Subject: [PATCH] At the request of legal-discuss, shuffle the ooxml xsd licence details into LICENSE from NOTICE git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@629865 13f79535-47bb-0310-9956-ffa450edef68 --- legal/LICENSE | 17 +++++++++++++++++ legal/NOTICE | 27 +++++++++++---------------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/legal/LICENSE b/legal/LICENSE index d645695673..b547443dea 100755 --- a/legal/LICENSE +++ b/legal/LICENSE @@ -200,3 +200,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + + + +Office Open XML (OOXML) xsds: +----------------------------- + +These were downloaded as part of the Office Open XML ECMA Specification +from + +These are included within the Apache POI distribution, and are available +under compatible licensing terms. + +Copyright - ECMA International, "made available without restriction" + http://www.ecma-international.org/memento/Ecmabylaws.htm - section 9.4 +Patent License - Microsoft Open Specification Promise (OSP) + http://www.microsoft.com/interop/osp/ diff --git a/legal/NOTICE b/legal/NOTICE index 14efe24b57..d5d7883b35 100644 --- a/legal/NOTICE +++ b/legal/NOTICE @@ -19,19 +19,14 @@ Since this is a data file, and has no compiled version (the original See http://www.gnome.ru/projects/vsdump_en.html -Office Open XML experimental support: - XML Beans - http://xmlbeans.apache.org/ - Apache Licence Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - DOM4J - http://www.dom4j.org/ - BSD Licence - http://www.dom4j.org/license.html - Jaxen - http://jaxen.org/ - Apache Style Licence - http://jaxen.org/license.html - OpenXml4J - http://www.openxml4j.org/ - BSD Licence or Apache Licence Version 2.0 - - http://www.openxml4j.org/Licensing/Default.html - Office Open XML ECMA Specification - - http://www.ecma-international.org/publications/standards/Ecma-376.htm - Copyright - ECMA International, made available without restriction - http://www.ecma-international.org/memento/Ecmabylaws.htm - section 9.4 - Patent - Microsoft Open Specification Promise (OSP) - http://www.microsoft.com/interop/osp/ +The Office Open XML experimental support had additional dependencies, +with their own licensing: + * XML Beans - http://xmlbeans.apache.org/ + Apache Licence Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 + * DOM4J - http://www.dom4j.org/ + BSD Licence - http://www.dom4j.org/license.html + * Jaxen - http://jaxen.org/ + Apache Style Licence - http://jaxen.org/license.html + * OpenXml4J - http://www.openxml4j.org/ + BSD Licence or Apache Licence Version 2.0 - + http://www.openxml4j.org/Licensing/Default.html