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 2016/06/30 13:54:06 UTC
[42/50] [abbrv] incubator-taverna-common-activities git commit:
TAVERNA-986 Simplify LICENSE note
TAVERNA-986 Simplify LICENSE note
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/778f564b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/778f564b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/778f564b
Branch: refs/heads/docker
Commit: 778f564b2670fb1ab1daae54212c594a83cca5fe
Parents: 055a7ac
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jun 20 15:39:01 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jun 20 15:39:01 2016 +0100
----------------------------------------------------------------------
LICENSE | 32 +++-----------------------------
1 file changed, 3 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/778f564b/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 15a6ca7..9844251 100644
--- a/LICENSE
+++ b/LICENSE
@@ -203,33 +203,7 @@
---------------------------------------------------------
taverna-wsdl-generic/src/main/resources/META-INF/soap-encoding.xsd
-Schema for the SOAP/1.1 encoding
-
-Portions � 2001 DevelopMentor.
-� 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
-
-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
-By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
-
-1. The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-
-2. Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright � 2001 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/"
-
-3. Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
-
-Original W3C files; http://www.w3.org/2001/06/soap-encoding
-Changes made:
- - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
- - reverted root to only allow 0 and 1 as lexical values
- - removed default value from root attribute declaration
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+is licensed by the W3C Software License
+http://www.w3.org/Consortium/Legal/copyright-software-19980720
---------------------------------------------------------
+