Skip to content

Commit 8d898ef

Browse files
goneallgoneall
authored
Merge pull request #581 from wking/header-inside-license
Allow standardLicenseHeader under text
2 parents c72a9f0 + 34832d8 commit 8d898ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+284
-696
lines changed

‎schema/ListedLicense.xsd

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
3434
<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
3535
<element name="standardLicenseHeader" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
36-
<element name="text" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
36+
<element name="text" type="tns:formattedAltStandardLicenseHeaderTextType" minOccurs="0" maxOccurs="1"/>
3737
</all>
3838
<attribute name="licenseId" type="string" use="required" />
3939
<attribute name="isOsiApproved" type="boolean"/>
@@ -55,19 +55,31 @@
5555
<complexType name="optionalType" mixed="true">
5656
<group ref="tns:formattedAltTextGroup" minOccurs="0" maxOccurs="unbounded"/>
5757
</complexType>
58+
<complexType name="optionalStandardLicenseHeaderType" mixed="true">
59+
<group ref="tns:formattedAltStandardLicenseHeaderTextGroup" minOccurs="0" maxOccurs="unbounded"/>
60+
</complexType>
5861
<complexType name="listType">
5962
<choice minOccurs="1" maxOccurs="unbounded">
6063
<element name="item" type="tns:formattedAltTextType"/>
6164
<element name="list" type="tns:listType"/>
6265
</choice>
6366
</complexType>
67+
<complexType name="listStandardLicenseHeaderType">
68+
<choice minOccurs="1" maxOccurs="unbounded">
69+
<element name="item" type="tns:formattedAltStandardLicenseHeaderTextType"/>
70+
<element name="list" type="tns:listStandardLicenseHeaderType"/>
71+
</choice>
72+
</complexType>
6473
<complexType name="emptyType"/>
6574
<complexType name="formattedFixedTextType" mixed="true">
6675
<group ref="tns:formattedFixedTextGroup" minOccurs="0" maxOccurs="unbounded"/>
6776
</complexType>
6877
<complexType name="formattedAltTextType" mixed="true">
6978
<group ref="tns:formattedAltTextGroup" minOccurs="0" maxOccurs="unbounded"/>
7079
</complexType>
80+
<complexType name="formattedAltStandardLicenseHeaderTextType" mixed="true">
81+
<group ref="tns:formattedAltStandardLicenseHeaderTextGroup" minOccurs="0" maxOccurs="unbounded"/>
82+
</complexType>
7183
<group name="formattedFixedTextGroup">
7284
<choice>
7385
<element name="p" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="unbounded"/>
@@ -90,4 +102,17 @@
90102
<element name="copyrightText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
91103
</choice>
92104
</group>
105+
<group name="formattedAltStandardLicenseHeaderTextGroup">
106+
<choice>
107+
<element name="p" type="tns:formattedAltStandardLicenseHeaderTextType" minOccurs="0" maxOccurs="unbounded"/>
108+
<element name="bullet" type="string" minOccurs="0" maxOccurs="unbounded"/>
109+
<element name="list" type="tns:listStandardLicenseHeaderType" minOccurs="0" maxOccurs="unbounded"/>
110+
<element name="optional" type="tns:optionalStandardLicenseHeaderType" minOccurs="0" maxOccurs="unbounded"/>
111+
<element name="alt" type="tns:altType" minOccurs="0" maxOccurs="unbounded"/>
112+
<element name="br" type="tns:emptyType" minOccurs="0" maxOccurs="unbounded"/>
113+
<element name="titleText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
114+
<element name="copyrightText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
115+
<element name="standardLicenseHeader" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
116+
</choice>
117+
</group>
93118
</schema>

‎src/AFL-1.1.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
<crossRef>http://opensource.linux-mirror.org/licenses/afl-1.1.txt</crossRef>
66
<crossRef>http://wayback.archive.org/web/20021004124254/http://www.opensource.org/licenses/academic.php</crossRef>
77
</crossRefs>
8-
<standardLicenseHeader>
9-
Licensed under the Academic Free License version 1.1.
10-
</standardLicenseHeader>
118
<notes>This license has been superseded by later versions.</notes>
129
<text>
1310
<titleText>
@@ -18,7 +15,9 @@
1815
<p>The Academic Free License applies to any original work of authorship (the "Original Work") whose owner
1916
(the "Licensor") has placed the following notice immediately following the copyright notice for the
2017
Original Work:</p>
21-
<p>"Licensed under the Academic Free License version 1.1."</p>
18+
<standardLicenseHeader>
19+
<p><optional>"</optional>Licensed under the Academic Free License version 1.1.<optional>"</optional></p>
20+
</standardLicenseHeader>
2221
</optional>
2322

2423
<p>Grant of License. Licensor hereby grants to any person obtaining a copy of the Original Work ("You") a

‎src/AFL-1.2.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
<crossRef>http://opensource.linux-mirror.org/licenses/afl-1.2.txt</crossRef>
66
<crossRef>http://wayback.archive.org/web/20021204204652/http://www.opensource.org/licenses/academic.php</crossRef>
77
</crossRefs>
8-
<standardLicenseHeader>
9-
Licensed under the Academic Free License version 1.2
10-
</standardLicenseHeader>
118
<notes>This license has been superseded by later versions.
129

1310
We found these notes here: https://web.archive.org/web/20100828113909/http://opensource.linux-mirror.org/licenses/afl-1.2.txt
@@ -30,7 +27,9 @@
3027
<p>This Academic Free License applies to any original work of authorship (the "Original Work") whose owner
3128
(the "Licensor") has placed the following notice immediately following the copyright notice for the
3229
Original Work:</p>
30+
<standardLicenseHeader>
3331
<p>Licensed under the Academic Free License version 1.2</p>
32+
</standardLicenseHeader>
3433
</optional>
3534

3635
<p>Grant of License. Licensor hereby grants to any person obtaining a copy of the Original Work ("You") a

‎src/AFL-2.0.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
<crossRef>http://opensource.linux-mirror.org/licenses/afl-2.0.txt</crossRef>
66
<crossRef>http://wayback.archive.org/web/20060924134533/http://www.opensource.org/licenses/afl-2.0.txt</crossRef>
77
</crossRefs>
8-
<standardLicenseHeader>
9-
<p>Licensed under the Academic Free License version 2.0</p>
10-
</standardLicenseHeader>
118
<text>
129
<titleText>
1310
<p>The Academic Free License
@@ -18,7 +15,9 @@
1815
<p>This Academic Free License (the "License") applies to any original work of authorship (the "Original
1916
Work") whose owner (the "Licensor") has placed the following notice immediately following the
2017
copyright notice for the Original Work:</p>
18+
<standardLicenseHeader>
2119
<p>Licensed under the Academic Free License version 2.0</p>
20+
</standardLicenseHeader>
2221
</optional>
2322
<list>
2423
<item>

‎src/AFL-2.1.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<crossRefs>
55
<crossRef>http://opensource.linux-mirror.org/licenses/afl-2.1.txt</crossRef>
66
</crossRefs>
7-
<standardLicenseHeader>
8-
Licensed under the Academic Free License version 2.1
9-
</standardLicenseHeader>
107
<text>
118
<titleText>
129
<p>The Academic Free License
@@ -17,7 +14,9 @@
1714
<p>This Academic Free License (the "License") applies to any original work of authorship (the
1815
"Original Work") whose owner (the "Licensor") has placed the following notice
1916
immediately following the copyright notice for the Original Work:</p>
17+
<standardLicenseHeader>
2018
<p>Licensed under the Academic Free License version 2.1</p>
19+
</standardLicenseHeader>
2120
</optional>
2221

2322
<list>

‎src/AFL-3.0.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
<crossRef>http://www.rosenlaw.com/AFL3.0.htm</crossRef>
66
<crossRef>http://www.opensource.org/licenses/afl-3.0</crossRef>
77
</crossRefs>
8-
<standardLicenseHeader>
9-
Licensed under the Academic Free License version 3.0
10-
</standardLicenseHeader>
118
<text>
129
<titleText>
1310
<p>Academic Free License ("AFL") v. 3.0</p>
@@ -16,7 +13,9 @@
1613
<p>This Academic Free License (the "License") applies to any original work of authorship (the
1714
"Original Work") whose owner (the "Licensor") has placed the following licensing
1815
notice adjacent to the copyright notice for the Original Work:</p>
16+
<standardLicenseHeader>
1917
<p>Licensed under the Academic Free License version 3.0</p>
18+
</standardLicenseHeader>
2019
</optional>
2120

2221
<list>

‎src/AGPL-3.0-or-later.xml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66
<crossRef>http://www.gnu.org/licenses/agpl.txt</crossRef>
77
<crossRef>http://www.opensource.org/licenses/AGPL-3.0</crossRef>
88
</crossRefs>
9-
<standardLicenseHeader>
10-
Copyright (C) <alt name="copyright" match=".+">[year] [name of author]</alt>
11-
<p>This program is free software: you can redistribute it and/or modify it
12-
under the terms of the GNU Affero General Public License as published
13-
by the Free Software Foundation, either version 3 of the License, or
14-
<optional>(at your option)</optional> any later version. </p>
15-
<p>This program is distributed
16-
in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
17-
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
18-
PURPOSE. See the GNU Affero General Public License for more details.</p>
19-
<p>You should have received a copy of the GNU Affero General Public License
20-
along with this program. If not, see
21-
&lt;http<optional>s</optional>://www.gnu.org/licenses/&gt;</p>
22-
</standardLicenseHeader>
239
<notes>
2410
This version was released: 19 November 2007
2511
</notes>
@@ -805,16 +791,17 @@
805791
state the exclusion of warranty; and each file should have at least
806792
the "copyright" line and a pointer to where the full notice is found.
807793
</p>
794+
<standardLicenseHeader>
808795
<p>
809-
&lt;one line to give the program's name and
810-
a brief idea of what it does.&gt;<br></br>
811-
Copyright (C) &lt;year&gt; &lt;name of author&gt;
796+
<alt name="description" match=".+">&lt;one line to give the program's name and
797+
a brief idea of what it does.&gt;</alt><br/>
798+
Copyright (C) <alt name="copyright" match=".+">&lt;year&gt; &lt;name of author&gt;</alt>
812799
</p>
813800
<p>
814801
This program is free software: you can redistribute it and/or
815802
modify it under the terms of the GNU Affero General Public
816803
License as published by the Free Software Foundation, either
817-
version 3 of the License, or (at your option) any later version.
804+
version 3 of the License, or <optional>(at your option)</optional> any later version.
818805
</p>
819806
<p>
820807
This program is distributed in the hope that it will be useful,
@@ -827,6 +814,7 @@
827814
Public License along with this program. If not, see
828815
&lt;http<optional>s</optional>://www.gnu.org/licenses/&gt;.
829816
</p>
817+
</standardLicenseHeader>
830818
<p>
831819
Also add information on how to contact you by electronic and paper mail.
832820
</p>

‎src/Apache-2.0.xml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,6 @@
55
<crossRef>http://www.apache.org/licenses/LICENSE-2.0</crossRef>
66
<crossRef>http://www.opensource.org/licenses/Apache-2.0</crossRef>
77
</crossRefs>
8-
<standardLicenseHeader> Copyright
9-
<alt match=".+" name="copyright">[yyyy] [name of copyright owner]</alt>
10-
<p>
11-
Licensed under the Apache License, Version 2.0 (the "License"); you may
12-
not use this file except in compliance with the License. You may
13-
obtain a copy of the License at
14-
</p>
15-
<p>
16-
http://www.apache.org/licenses/LICENSE-2.0
17-
</p>
18-
<p>
19-
Unless required by applicable law or agreed to in writing, software
20-
distributed under the License is distributed on an "AS IS" BASIS,
21-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
22-
implied. See the License for the specific language governing permissions
23-
and limitations under the License.
24-
</p>
25-
</standardLicenseHeader>
268
<notes>This license was released January 2004</notes>
279
<text>
2810
<titleText>
@@ -221,7 +203,8 @@
221203
format. We also recommend that a file or class name and description of purpose be included on the same
222204
"printed page" as the copyright notice for easier identification within third-party
223205
archives.</p>
224-
<p>Copyright [yyyy] [name of copyright owner]</p>
206+
<standardLicenseHeader>
207+
<p>Copyright <alt name="copyright" match=".+">[yyyy] [name of copyright owner]</alt></p>
225208
<p>Licensed under the Apache License, Version 2.0 (the "License");
226209
<br/>you may not use this file except in compliance with the License.
227210
<br/>You may obtain a copy of the License at
@@ -233,6 +216,7 @@
233216
<br/>See the License for the specific language governing permissions and
234217
<br/>limitations under the License.
235218
</p>
219+
</standardLicenseHeader>
236220
</optional>
237221
</text>
238222
</license>

‎src/BitTorrent-1.0.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@
55
<crossRefs>
66
<crossRef>http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/BitTorrent?r1=1.1&amp;r2=1.1.1.1&amp;diff_format=s</crossRef>
77
</crossRefs>
8-
<standardLicenseHeader>
9-
<p>The contents of this file are subject to the BitTorrent Open Source License Version 1.0 (the License).
10-
You may not copy or use this file, in either source code or executable form, except in compliance with
11-
the License. You may obtain a copy of the License at http://www.bittorrent.com/license/.</p>
12-
<p>Software distributed under the License is distributed on an AS IS basis, WITHOUT WARRANTY OF ANY KIND,
13-
either express or implied. See the License for the specific language governing rights and limitations under
14-
the License.</p>
15-
</standardLicenseHeader>
168
<text>
179
<titleText>
1810
<p>BitTorrent Open Source License
@@ -461,12 +453,14 @@
461453
Product or any hereto. Contributors to any Modifications may add their own copyright notices to
462454
identify their own contributions.</p>
463455
<p>License:</p>
456+
<standardLicenseHeader>
464457
<p>The contents of this file are subject to the BitTorrent Open Source License Version 1.0 (the License).
465458
You may not copy or use this file, in either source code or executable form, except in compliance with
466459
the License. You may obtain a copy of the License at http://www.bittorrent.com/license/.</p>
467460
<p>Software distributed under the License is distributed on an AS IS basis, WITHOUT WARRANTY OF ANY KIND,
468461
either express or implied. See the License for the specific language governing rights and limitations
469462
under the License.</p>
463+
</standardLicenseHeader>
470464
</optional>
471465
</text>
472466
</license>

0 commit comments

Comments
 (0)