Skip to content

Commit 98cfa4f

Browse files
thboileauthboileau
committed
Removed the CDDL and LGPL licences, kept Apache License, Version 2.0 and Eclipse Public License -v 1.0.
1 parent 1bb14dd commit 98cfa4f

File tree

2,043 files changed

+9167
-24342
lines changed

Some content is hidden

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

2,043 files changed

+9167
-24342
lines changed

‎build/tmpl/text/changes.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Changes log
3131

3232
- Misc
3333
- Removed the Tanuki's Java Service Wrapper library.
34+
- Removed the CDDL and LGPL licences, kept Apache License, Version 2.0 and
35+
Eclipse Public License -v 1.0.
3436

3537
- 2.3 Release Candidate 1 (11/21/2014)
3638
- Enhancements

‎build/tmpl/text/license.txt‎

Lines changed: 3 additions & 1022 deletions
Large diffs are not rendered by default.

‎modules/org.restlet.example.book.restlet.ch08.gae/src/org/restlet/example/book/restlet/ch08/gae/common/AccountRepresentation.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
/**
2-
* Copyright 2005-2012 Restlet S.A.S.
2+
* Copyright 2005-2014 Restlet
33
*
44
* The contents of this file are subject to the terms of one of the following
5-
* open source licenses: Apache 2.0 or LGPL 3.0 or LGPL 2.1 or CDDL 1.0 or EPL
6-
* 1.0 (the "Licenses"). You can select the license that you prefer but you may
7-
* not use this file except in compliance with one of these Licenses.
5+
* open source licenses: Apache 2.0 or or EPL 1.0 (the "Licenses"). You can
6+
* select the license that you prefer but you may not use this file except in
7+
* compliance with one of these Licenses.
88
*
99
* You can obtain a copy of the Apache 2.0 license at
1010
* http://www.opensource.org/licenses/apache-2.0
1111
*
12-
* You can obtain a copy of the LGPL 3.0 license at
13-
* http://www.opensource.org/licenses/lgpl-3.0
14-
*
15-
* You can obtain a copy of the LGPL 2.1 license at
16-
* http://www.opensource.org/licenses/lgpl-2.1
17-
*
18-
* You can obtain a copy of the CDDL 1.0 license at
19-
* http://www.opensource.org/licenses/cddl1
20-
*
2112
* You can obtain a copy of the EPL 1.0 license at
2213
* http://www.opensource.org/licenses/eclipse-1.0
2314
*
@@ -26,7 +17,7 @@
2617
*
2718
* Alternatively, you can obtain a royalty free commercial license with less
2819
* limitations, transferable or non-transferable, directly at
29-
* http://www.restlet.com/products/restlet-framework
20+
* http://restlet.com/products/restlet-framework
3021
*
3122
* Restlet is a registered trademark of Restlet S.A.S.
3223
*/

‎modules/org.restlet.example.book.restlet.ch08.gae/src/org/restlet/example/book/restlet/ch08/gae/common/AccountResource.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
/**
2-
* Copyright 2005-2012 Restlet S.A.S.
2+
* Copyright 2005-2014 Restlet
33
*
44
* The contents of this file are subject to the terms of one of the following
5-
* open source licenses: Apache 2.0 or LGPL 3.0 or LGPL 2.1 or CDDL 1.0 or EPL
6-
* 1.0 (the "Licenses"). You can select the license that you prefer but you may
7-
* not use this file except in compliance with one of these Licenses.
5+
* open source licenses: Apache 2.0 or or EPL 1.0 (the "Licenses"). You can
6+
* select the license that you prefer but you may not use this file except in
7+
* compliance with one of these Licenses.
88
*
99
* You can obtain a copy of the Apache 2.0 license at
1010
* http://www.opensource.org/licenses/apache-2.0
1111
*
12-
* You can obtain a copy of the LGPL 3.0 license at
13-
* http://www.opensource.org/licenses/lgpl-3.0
14-
*
15-
* You can obtain a copy of the LGPL 2.1 license at
16-
* http://www.opensource.org/licenses/lgpl-2.1
17-
*
18-
* You can obtain a copy of the CDDL 1.0 license at
19-
* http://www.opensource.org/licenses/cddl1
20-
*
2112
* You can obtain a copy of the EPL 1.0 license at
2213
* http://www.opensource.org/licenses/eclipse-1.0
2314
*
@@ -26,7 +17,7 @@
2617
*
2718
* Alternatively, you can obtain a royalty free commercial license with less
2819
* limitations, transferable or non-transferable, directly at
29-
* http://www.restlet.com/products/restlet-framework
20+
* http://restlet.com/products/restlet-framework
3021
*
3122
* Restlet is a registered trademark of Restlet S.A.S.
3223
*/

‎modules/org.restlet.example.book.restlet.ch08.gae/src/org/restlet/example/book/restlet/ch08/gae/common/AccountsResource.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
/**
2-
* Copyright 2005-2012 Restlet S.A.S.
2+
* Copyright 2005-2014 Restlet
33
*
44
* The contents of this file are subject to the terms of one of the following
5-
* open source licenses: Apache 2.0 or LGPL 3.0 or LGPL 2.1 or CDDL 1.0 or EPL
6-
* 1.0 (the "Licenses"). You can select the license that you prefer but you may
7-
* not use this file except in compliance with one of these Licenses.
5+
* open source licenses: Apache 2.0 or or EPL 1.0 (the "Licenses"). You can
6+
* select the license that you prefer but you may not use this file except in
7+
* compliance with one of these Licenses.
88
*
99
* You can obtain a copy of the Apache 2.0 license at
1010
* http://www.opensource.org/licenses/apache-2.0
1111
*
12-
* You can obtain a copy of the LGPL 3.0 license at
13-
* http://www.opensource.org/licenses/lgpl-3.0
14-
*
15-
* You can obtain a copy of the LGPL 2.1 license at
16-
* http://www.opensource.org/licenses/lgpl-2.1
17-
*
18-
* You can obtain a copy of the CDDL 1.0 license at
19-
* http://www.opensource.org/licenses/cddl1
20-
*
2112
* You can obtain a copy of the EPL 1.0 license at
2213
* http://www.opensource.org/licenses/eclipse-1.0
2314
*
@@ -26,7 +17,7 @@
2617
*
2718
* Alternatively, you can obtain a royalty free commercial license with less
2819
* limitations, transferable or non-transferable, directly at
29-
* http://www.restlet.com/products/restlet-framework
20+
* http://restlet.com/products/restlet-framework
3021
*
3122
* Restlet is a registered trademark of Restlet S.A.S.
3223
*/

‎modules/org.restlet.example.book.restlet.ch08.gae/src/org/restlet/example/book/restlet/ch08/gae/common/ContactRepresentation.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
/**
2-
* Copyright 2005-2012 Restlet S.A.S.
2+
* Copyright 2005-2014 Restlet
33
*
44
* The contents of this file are subject to the terms of one of the following
5-
* open source licenses: Apache 2.0 or LGPL 3.0 or LGPL 2.1 or CDDL 1.0 or EPL
6-
* 1.0 (the "Licenses"). You can select the license that you prefer but you may
7-
* not use this file except in compliance with one of these Licenses.
5+
* open source licenses: Apache 2.0 or or EPL 1.0 (the "Licenses"). You can
6+
* select the license that you prefer but you may not use this file except in
7+
* compliance with one of these Licenses.
88
*
99
* You can obtain a copy of the Apache 2.0 license at
1010
* http://www.opensource.org/licenses/apache-2.0
1111
*
12-
* You can obtain a copy of the LGPL 3.0 license at
13-
* http://www.opensource.org/licenses/lgpl-3.0
14-
*
15-
* You can obtain a copy of the LGPL 2.1 license at
16-
* http://www.opensource.org/licenses/lgpl-2.1
17-
*
18-
* You can obtain a copy of the CDDL 1.0 license at
19-
* http://www.opensource.org/licenses/cddl1
20-
*
2112
* You can obtain a copy of the EPL 1.0 license at
2213
* http://www.opensource.org/licenses/eclipse-1.0
2314
*
@@ -26,7 +17,7 @@
2617
*
2718
* Alternatively, you can obtain a royalty free commercial license with less
2819
* limitations, transferable or non-transferable, directly at
29-
* http://www.restlet.com/products/restlet-framework
20+
* http://restlet.com/products/restlet-framework
3021
*
3122
* Restlet is a registered trademark of Restlet S.A.S.
3223
*/

‎modules/org.restlet.example.book.restlet.ch08.gae/src/org/restlet/example/book/restlet/ch08/gae/common/ContactResource.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
/**
2-
* Copyright 2005-2012 Restlet S.A.S.
2+
* Copyright 2005-2014 Restlet
33
*
44
* The contents of this file are subject to the terms of one of the following
5-
* open source licenses: Apache 2.0 or LGPL 3.0 or LGPL 2.1 or CDDL 1.0 or EPL
6-
* 1.0 (the "Licenses"). You can select the license that you prefer but you may
7-
* not use this file except in compliance with one of these Licenses.
5+
* open source licenses: Apache 2.0 or or EPL 1.0 (the "Licenses"). You can
6+
* select the license that you prefer but you may not use this file except in
7+
* compliance with one of these Licenses.
88
*
99
* You can obtain a copy of the Apache 2.0 license at
1010
* http://www.opensource.org/licenses/apache-2.0
1111
*
12-
* You can obtain a copy of the LGPL 3.0 license at
13-
* http://www.opensource.org/licenses/lgpl-3.0
14-
*
15-
* You can obtain a copy of the LGPL 2.1 license at
16-
* http://www.opensource.org/licenses/lgpl-2.1
17-
*
18-
* You can obtain a copy of the CDDL 1.0 license at
19-
* http://www.opensource.org/licenses/cddl1
20-
*
2112
* You can obtain a copy of the EPL 1.0 license at
2213
* http://www.opensource.org/licenses/eclipse-1.0
2314
*
@@ -26,7 +17,7 @@
2617
*
2718
* Alternatively, you can obtain a royalty free commercial license with less
2819
* limitations, transferable or non-transferable, directly at
29-
* http://www.restlet.com/products/restlet-framework
20+
* http://restlet.com/products/restlet-framework
3021
*
3122
* Restlet is a registered trademark of Restlet S.A.S.
3223
*/

‎modules/org.restlet.example.book.restlet.ch08.gae/src/org/restlet/example/book/restlet/ch08/gae/common/ContactsRepresentation.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
/**
2-
* Copyright 2005-2012 Restlet S.A.S.
2+
* Copyright 2005-2014 Restlet
33
*
44
* The contents of this file are subject to the terms of one of the following
5-
* open source licenses: Apache 2.0 or LGPL 3.0 or LGPL 2.1 or CDDL 1.0 or EPL
6-
* 1.0 (the "Licenses"). You can select the license that you prefer but you may
7-
* not use this file except in compliance with one of these Licenses.
5+
* open source licenses: Apache 2.0 or or EPL 1.0 (the "Licenses"). You can
6+
* select the license that you prefer but you may not use this file except in
7+
* compliance with one of these Licenses.
88
*
99
* You can obtain a copy of the Apache 2.0 license at
1010
* http://www.opensource.org/licenses/apache-2.0
1111
*
12-
* You can obtain a copy of the LGPL 3.0 license at
13-
* http://www.opensource.org/licenses/lgpl-3.0
14-
*
15-
* You can obtain a copy of the LGPL 2.1 license at
16-
* http://www.opensource.org/licenses/lgpl-2.1
17-
*
18-
* You can obtain a copy of the CDDL 1.0 license at
19-
* http://www.opensource.org/licenses/cddl1
20-
*
2112
* You can obtain a copy of the EPL 1.0 license at
2213
* http://www.opensource.org/licenses/eclipse-1.0
2314
*
@@ -26,7 +17,7 @@
2617
*
2718
* Alternatively, you can obtain a royalty free commercial license with less
2819
* limitations, transferable or non-transferable, directly at
29-
* http://www.restlet.com/products/restlet-framework
20+
* http://restlet.com/products/restlet-framework
3021
*
3122
* Restlet is a registered trademark of Restlet S.A.S.
3223
*/

‎modules/org.restlet.example.book.restlet.ch08.gae/src/org/restlet/example/book/restlet/ch08/gae/common/ContactsResource.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
/**
2-
* Copyright 2005-2012 Restlet S.A.S.
2+
* Copyright 2005-2014 Restlet
33
*
44
* The contents of this file are subject to the terms of one of the following
5-
* open source licenses: Apache 2.0 or LGPL 3.0 or LGPL 2.1 or CDDL 1.0 or EPL
6-
* 1.0 (the "Licenses"). You can select the license that you prefer but you may
7-
* not use this file except in compliance with one of these Licenses.
5+
* open source licenses: Apache 2.0 or or EPL 1.0 (the "Licenses"). You can
6+
* select the license that you prefer but you may not use this file except in
7+
* compliance with one of these Licenses.
88
*
99
* You can obtain a copy of the Apache 2.0 license at
1010
* http://www.opensource.org/licenses/apache-2.0
1111
*
12-
* You can obtain a copy of the LGPL 3.0 license at
13-
* http://www.opensource.org/licenses/lgpl-3.0
14-
*
15-
* You can obtain a copy of the LGPL 2.1 license at
16-
* http://www.opensource.org/licenses/lgpl-2.1
17-
*
18-
* You can obtain a copy of the CDDL 1.0 license at
19-
* http://www.opensource.org/licenses/cddl1
20-
*
2112
* You can obtain a copy of the EPL 1.0 license at
2213
* http://www.opensource.org/licenses/eclipse-1.0
2314
*
@@ -26,7 +17,7 @@
2617
*
2718
* Alternatively, you can obtain a royalty free commercial license with less
2819
* limitations, transferable or non-transferable, directly at
29-
* http://www.restlet.com/products/restlet-framework
20+
* http://restlet.com/products/restlet-framework
3021
*
3122
* Restlet is a registered trademark of Restlet S.A.S.
3223
*/

‎modules/org.restlet.example.book.restlet.ch08.gae/src/org/restlet/example/book/restlet/ch08/gae/common/FeedRepresentation.java‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
11
/**
2-
* Copyright 2005-2012 Restlet S.A.S.
2+
* Copyright 2005-2014 Restlet
33
*
44
* The contents of this file are subject to the terms of one of the following
5-
* open source licenses: Apache 2.0 or LGPL 3.0 or LGPL 2.1 or CDDL 1.0 or EPL
6-
* 1.0 (the "Licenses"). You can select the license that you prefer but you may
7-
* not use this file except in compliance with one of these Licenses.
5+
* open source licenses: Apache 2.0 or or EPL 1.0 (the "Licenses"). You can
6+
* select the license that you prefer but you may not use this file except in
7+
* compliance with one of these Licenses.
88
*
99
* You can obtain a copy of the Apache 2.0 license at
1010
* http://www.opensource.org/licenses/apache-2.0
1111
*
12-
* You can obtain a copy of the LGPL 3.0 license at
13-
* http://www.opensource.org/licenses/lgpl-3.0
14-
*
15-
* You can obtain a copy of the LGPL 2.1 license at
16-
* http://www.opensource.org/licenses/lgpl-2.1
17-
*
18-
* You can obtain a copy of the CDDL 1.0 license at
19-
* http://www.opensource.org/licenses/cddl1
20-
*
2112
* You can obtain a copy of the EPL 1.0 license at
2213
* http://www.opensource.org/licenses/eclipse-1.0
2314
*
@@ -26,7 +17,7 @@
2617
*
2718
* Alternatively, you can obtain a royalty free commercial license with less
2819
* limitations, transferable or non-transferable, directly at
29-
* http://www.restlet.com/products/restlet-framework
20+
* http://restlet.com/products/restlet-framework
3021
*
3122
* Restlet is a registered trademark of Restlet S.A.S.
3223
*/

0 commit comments

Comments
 (0)