You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/03/08 02:37:39 UTC

[2/5] incubator-taverna-language git commit: More W3C NOTICEs..

More W3C NOTICEs..


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/db09fdd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/db09fdd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/db09fdd9

Branch: refs/heads/master
Commit: db09fdd905cecf9f69955b518ababc6c53dcedef
Parents: 2933674
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Mar 8 01:20:46 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Mar 8 01:20:46 2015 +0000

----------------------------------------------------------------------
 .../src/main/resources/META-INF/NOTICE          | 42 ++++++++++++++++++++
 taverna-robundle/src/main/xsd/combine.xsd       |  4 --
 taverna-robundle/src/main/xsd/xenc-schema.xsd   |  9 +++--
 3 files changed, 47 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/db09fdd9/taverna-robundle/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/resources/META-INF/NOTICE b/taverna-robundle/src/main/resources/META-INF/NOTICE
index aa7e88a..a464027 100644
--- a/taverna-robundle/src/main/resources/META-INF/NOTICE
+++ b/taverna-robundle/src/main/resources/META-INF/NOTICE
@@ -25,6 +25,39 @@ Copyright © 2011-2013 W3C® (MIT, ERCIM, Keio, Beihang), All Rights Reserved.
 W3C liability, trademark and document use rules apply.
 http://www.w3.org/Consortium/Legal/2015/doc-license
 
+---------------------------------------------------------
+
+XML Encryption Syntax and Processing
+W3C Recommendation 10 December 2002
+http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd
+http://www.w3.org/TR/xmlenc-core/
+
+Copyright © 2002 World Wide Web Consortium, (Massachusetts
+Institute of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+---------------------------------------------------------
+
+Schema for XML Signatures
+http://www.w3.org/2000/09/xmldsig#
+$Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+of Technology, Institut National de Recherche en Informatique et en
+Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This document is governed by the W3C Software License [1] as described
+in the FAQ [2].
+
+[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+
+
+---------------------------------------------------------
+
+
 
 ---------------------------------------------------------
 
@@ -80,3 +113,12 @@ available.
 http://www.w3.org/community/about/agreements/cla/
 
 ---------------------------------------------------------
+
+Open Document Format for Office Applications (OpenDocument) Version 1.2
+OASIS Standard, 29 September 2011
+Manifest Relax-NG Schema
+Source: http://docs.oasis-open.org/office/v1.2/os/
+Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
+
+
+---------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/db09fdd9/taverna-robundle/src/main/xsd/combine.xsd
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/combine.xsd b/taverna-robundle/src/main/xsd/combine.xsd
index a8d356b..93a8af7 100644
--- a/taverna-robundle/src/main/xsd/combine.xsd
+++ b/taverna-robundle/src/main/xsd/combine.xsd
@@ -27,10 +27,6 @@ http://co.mbine.org/specifications/combine_archive-Draft1.pdf
 
 Authors: 
   * [Stian Soiland-Reyes](http://orcid.org/0000-0001-9842-9718)
-
-Copyright 2014, University of Manchester
-
-MIT license (See LICENSE.md or http://opensource.org/licenses/MIT)
 </xsd:documentation></xsd:annotation>
     <xsd:element name="omexManifest">
     	<xsd:annotation>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/db09fdd9/taverna-robundle/src/main/xsd/xenc-schema.xsd
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/main/xsd/xenc-schema.xsd b/taverna-robundle/src/main/xsd/xenc-schema.xsd
index 01a5c71..d206a32 100644
--- a/taverna-robundle/src/main/xsd/xenc-schema.xsd
+++ b/taverna-robundle/src/main/xsd/xenc-schema.xsd
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+XML Encryption Syntax and Processing
+W3C Recommendation 10 December 2002
+http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd
+http://www.w3.org/TR/xmlenc-core/
+
 Copyright © 2002 World Wide Web Consortium, (Massachusetts
 Institute of Technology, Institut National de Recherche en Informatique et en
 Automatique, Keio University). All Rights Reserved.
 http://www.w3.org/Consortium/Legal/
 
-XML Encryption Syntax and Processing
-W3C Recommendation 10 December 2002
-http://www.w3.org/TR/xmlenc-core/xenc-schema.xsd
-http://www.w3.org/TR/xmlenc-core/
      -->
 <schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
         xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'