Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

schema/ListedLicense: Punt license text into <text> #452

Merged
merged 2 commits into from
Jan 16, 2018
Merged

schema/ListedLicense: Punt license text into <text> #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40ea806
schema/ListedLicense: Punt license and exception text into <text>
wking Oct 19, 2017
c478ba1
src: Port to <text>
wking Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 6 additions & 20 deletions schema/ListedLicense.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,24 @@
</choice>
</complexType>
<complexType name="ExceptionType" mixed="true">
<choice minOccurs="1" maxOccurs="unbounded">
<all>
<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
<element name="titleText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
<element name="copyrightText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
<element name="bullet" type="string"/>
<element name="list" type="tns:listType"/>
<element name="p" type="tns:formattedAltTextType"/>
<element name="optional" type="tns:optionalType"/>
<element name="alt" type="tns:altType"/>
<element name="br" type="tns:emptyType"/>
</choice>
<element name="text" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
</all>
<attribute name="licenseId" type="string" use="required" />
<attribute name="isDeprecated" type="boolean"/>
<attribute name="name" type="string" use="required" />
<attribute name="listVersionAdded" type="string"/>
<attribute name="deprecatedVersion" type="string"/>
</complexType>
<complexType name="LicenseType" mixed="true">
<choice minOccurs="1" maxOccurs="unbounded">
<all>
<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
<element name="standardLicenseHeader" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
<element name="titleText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
<element name="copyrightText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
<element name="bullet" type="string"/>
<element name="list" type="tns:listType"/>
<element name="p" type="tns:formattedAltTextType"/>
<element name="optional" type="tns:optionalType"/>
<element name="alt" type="tns:altType"/>
<element name="br" type="tns:emptyType"/>
</choice>
<element name="text" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
</all>
<attribute name="licenseId" type="string" use="required" />
<attribute name="isOsiApproved" type="boolean"/>
<attribute name="isDeprecated" type="boolean"/>
Expand Down
3 changes: 2 additions & 1 deletion src/0BSD.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<crossRefs>
<crossRef>http://landley.net/toybox/license.html</crossRef>
</crossRefs>
<text>
<copyrightText>
<p>Copyright (C) 2006 by Rob Landley &lt;[email protected]&gt;</p>
</copyrightText>
Expand All @@ -15,6 +16,6 @@
LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</p>

</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/AAL.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
content or legal efficacy. You may use or modify the language freely, but entirely at your
own risk.
</notes>
<text>
<titleText>
<p>Attribution Assurance License</p>
</titleText>
Expand Down Expand Up @@ -86,6 +87,6 @@
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.</p>

</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/ADSL.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
<crossRef>https://fedoraproject.org/wiki/Licensing/AmazonDigitalServicesLicense</crossRef>
</crossRefs>

<text>
<p>This software code is made available "AS IS" without warranties of any kind. You may copy, display,
modify and redistribute the software code either by itself or as incorporated into your code; provided
that &gt; you do not remove any proprietary notices. Your use of this software code is at your own
risk and you waive any claim against Amazon Digital Services, Inc. or its affiliates with respect to
your use of this software code. (c) 2006 Amazon Digital Services, Inc. or its affiliates.</p>

</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/AFL-1.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
Licensed under the Academic Free License version 1.1.
</standardLicenseHeader>
<notes>This license has been superseded by later versions.</notes>
<text>
<titleText>
<p>Academic Free License</p>
<p>Version 1.1</p>
Expand Down Expand Up @@ -76,6 +77,6 @@
<p>This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved.</p>
<p>Permission is hereby granted to copy and distribute this license without modification. This license
may not be modified without the express written permission of its copyright owner.</p>

</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/AFL-1.2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* The AFL includes the warranty by the licensor that it either owns the copyright or that it is distributing the software under a license. None of the other licenses contain that warranty. All other warranties are disclaimed, as is the case for the other licenses.
* The AFL is itself copyrighted (with the right granted to copy and distribute without modification). This ensures that the owner of the copyright to the license will control changes. The Apache license contains a copyright notice, but the BSD, MIT and UoI/NCSA licenses do not.
</notes>
<text>
<titleText>
<p>Academic Free License</p>
<p>Version 1.2</p>
Expand Down Expand Up @@ -83,6 +84,6 @@
<p>This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved.</p>
<p>Permission is hereby granted to copy and distribute this license without modification. This license
may not be modified without the express written permission of its copyright owner.</p>

</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/AFL-2.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<standardLicenseHeader>
<p>Licensed under the Academic Free License version 2.0</p>
</standardLicenseHeader>
<text>
<titleText>
<p>The Academic Free License
<br/>v. 2.0
Expand Down Expand Up @@ -188,5 +189,6 @@
<br/>Permission is hereby granted to copy and distribute this license without modification. This license
may not be modified without the express written permission of its copyright owner.
</p>
</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/AFL-2.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<standardLicenseHeader>
Licensed under the Academic Free License version 2.1
</standardLicenseHeader>
<text>
<titleText>
<p>The Academic Free License
<br/>v.2.1
Expand Down Expand Up @@ -189,6 +190,6 @@
<br/>Permission is hereby granted to copy and distribute this license without modification. This license
may not be modified without the express written permission of its copyright owner.
</p>

</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/AFL-3.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<standardLicenseHeader>
Licensed under the Academic Free License version 3.0
</standardLicenseHeader>
<text>
<titleText>
<p>Academic Free License ("AFL") v. 3.0</p>
</titleText>
Expand Down Expand Up @@ -207,6 +208,6 @@
and You comply with its license review and certification process.
</item>
</list>

</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/AGPL-1.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<crossRefs>
<crossRef>http://www.affero.org/oagpl.html</crossRef>
</crossRefs>
<text>
<titleText>
<p>AFFERO GENERAL PUBLIC LICENSE
<br/>Version 1, March 2002 </p>
Expand Down Expand Up @@ -272,5 +273,6 @@
HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
</item>
</list>
</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/AGPL-3.0-only.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<notes>
This version was released: 19 November 2007
</notes>
<text>
<titleText>
<p>
GNU AFFERO GENERAL PUBLIC LICENSE<br></br>
Expand Down Expand Up @@ -849,5 +850,6 @@
&lt;http<optional>s</optional>://www.gnu.org/licenses/&gt;.
</p>
</optional>
</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/AGPL-3.0-or-later.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<notes>
This version was released: 19 November 2007
</notes>
<text>
<titleText>
<p>
GNU AFFERO GENERAL PUBLIC LICENSE<br></br>
Expand Down Expand Up @@ -846,5 +847,6 @@
&lt;http<optional>s</optional>://www.gnu.org/licenses/&gt;.
</p>
</optional>
</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/AGPL-3.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
along with this program. If not, see
&lt;http<optional>s</optional>://www.gnu.org/licenses/&gt;
</standardLicenseHeader>
<text>
<titleText>
<p>
GNU AFFERO GENERAL PUBLIC LICENSE<br></br>
Expand Down Expand Up @@ -846,5 +847,6 @@
&lt;http<optional>s</optional>://www.gnu.org/licenses/&gt;.
</p>
</optional>
</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/AMDPLPA.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<crossRefs>
<crossRef>https://fedoraproject.org/wiki/Licensing/AMD_plpa_map_License</crossRef>
</crossRefs>
<text>
<copyrightText>
Copyright (c) 2006, 2007 Advanced Micro Devices, Inc.
<p>All rights reserved.</p>
Expand Down Expand Up @@ -70,6 +71,6 @@
disputes arising out of this license shall be subject to the jurisdiction of the federal and state
courts in Austin, Texas, and all defenses are hereby waived concerning personal jurisdiction and venue
of these courts.</p>

</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/AML.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<crossRefs>
<crossRef>https://fedoraproject.org/wiki/Licensing/Apple_MIT_License</crossRef>
</crossRefs>
<text>
<copyrightText>
<p>Copyright: Copyright (c) 2006 by Apple Computer, Inc., All Rights Reserved.</p>
</copyrightText>
Expand Down Expand Up @@ -33,6 +34,6 @@
AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT
(INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.</p>

</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/AMPAS.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<crossRefs>
<crossRef>https://fedoraproject.org/wiki/Licensing/BSD#AMPASBSD</crossRef>
</crossRefs>
<text>
<copyrightText>
<p>Copyright (c) 2006 Academy of Motion Picture Arts and Sciences ("A.M.P.A.S."). Portions contributed by
others as indicated. All rights reserved.</p>
Expand Down Expand Up @@ -45,6 +46,6 @@
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.</p>

</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/ANTLR-PD.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
</crossRefs>
<notes>ANTLR used this public domain notice through version 2.7 and then switched to a BSD license for version 3.0
and later.</notes>
<text>
<titleText>
<p>ANTLR 2 License</p>
</titleText>
Expand All @@ -20,6 +21,6 @@
tool with the output, please mention that you developed it using ANTLR. In addition, we ask that the
headers remain intact in our source code. As long as these guidelines are kept, we expect to continue
enhancing this system and expect to make other tools available as they are completed.</p>

</text>
</license>
</SPDXLicenseCollection>
3 changes: 2 additions & 1 deletion src/APAFML.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<crossRefs>
<crossRef>https://fedoraproject.org/wiki/Licensing/AdobePostscriptAFM</crossRef>
</crossRefs>
<text>
<copyrightText>
<p>Copyright (c) 1985, 1987, 1989, 1990, 1991, 1992, 1993, 1997 Adobe Systems Incorporated. All Rights
Reserved.</p>
Expand All @@ -15,6 +16,6 @@
file or any of the AFM files are prominently noted in the modified file(s); and that this paragraph is
not modified. Adobe Systems has no responsibility or obligation to support the use of the AFM
files.</p>

</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/APL-1.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<crossRefs>
<crossRef>http://www.opensource.org/licenses/APL-1.0</crossRef>
</crossRefs>
<text>
<titleText>
<p>ADAPTIVE PUBLIC LICENSE
<br/>Version 1.0
Expand Down Expand Up @@ -1014,5 +1015,6 @@ ________________________________________________ <br/>
</list>
<p>//***EXHIBIT A ENDS HERE.***//</p>
</optional>
</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/APSL-1.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<crossRef>https://fedoraproject.org/wiki/Licensing/Apple_Public_Source_License_1.0</crossRef>
</crossRefs>
<notes>This license was released 16 March 1999.</notes>
<text>
<titleText>
<p>APPLE PUBLIC SOURCE LICENSE
<br/>Version 1.0 - March 16, 1999
Expand Down Expand Up @@ -431,5 +432,6 @@
PURPOSE OR NON-INFRINGEMENT. Please see the License for the specific language governing rights and
limitations under the License."</p>
</optional>
</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/APSL-1.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<crossRef>http://www.opensource.apple.com/source/IOSerialFamily/IOSerialFamily-7/APPLE_LICENSE</crossRef>
</crossRefs>
<notes>This license was released 19 April 1999.</notes>
<text>
<titleText>
<p>APPLE PUBLIC SOURCE LICENSE
<br/>Version 1.1 - April 19, 1999
Expand Down Expand Up @@ -429,5 +430,6 @@
PURPOSE OR NON- INFRINGEMENT. Please see the License for the specific language governing rights and
limitations under the License."</p>
</optional>
</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/APSL-1.2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<crossRef>http://www.samurajdata.se/opensource/mirror/licenses/apsl.php</crossRef>
</crossRefs>
<notes>This license was released 4 Jan 2001.</notes>
<text>
<titleText>
<p>Apple Public Source License Ver. 1.2</p>
</titleText>
Expand Down Expand Up @@ -415,5 +416,6 @@
PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. Please see the License for the specific language
governing rights and limitations under the License."</p>
</optional>
</text>
</license>
</SPDXLicenseCollection>
2 changes: 2 additions & 0 deletions src/APSL-2.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<crossRef>http://www.opensource.apple.com/license/apsl/</crossRef>
</crossRefs>
<notes>This license was released: 6 August 2003.</notes>
<text>
<titleText>
<p>APPLE PUBLIC SOURCE LICENSE
<br/>Version 2.0 - August 6, 2003
Expand Down Expand Up @@ -413,5 +414,6 @@
PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. Please see the License for the specific language
governing rights and limitations under the License."</p>
</optional>
</text>
</license>
</SPDXLicenseCollection>
Loading