Skip to content

Commit 6b8539a

Browse files
committed
ECOSYS-77 EPLv2 License update
1 parent c5b5807 commit 6b8539a

6 files changed

+332
-461
lines changed

Diff for: LICENSE.txt

+277-295
Large diffs are not rendered by default.

Diff for: src/main/extension.ts

+11-33
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
11
'use strict';
22

33
/*
4+
* Copyright (c) 2020 Payara Foundation and/or its affiliates and others.
5+
* All rights reserved.
46
*
5-
* Copyright (c) 2020 Payara Foundation and/or its affiliates. All rights reserved.
7+
* This program and the accompanying materials are made available under the
8+
* terms of the Eclipse Public License v. 2.0, which is available at
9+
* http://www.eclipse.org/legal/epl-2.0.
610
*
7-
* The contents of this file are subject to the terms of either the GNU
8-
* General Public License Version 2 only ("GPL") or the Common Development
9-
* and Distribution License("CDDL") (collectively, the "License"). You
10-
* may not use this file except in compliance with the License. You can
11-
* obtain a copy of the License at
12-
* https://github.com/payara/Payara/blob/master/LICENSE.txt
13-
* See the License for the specific
14-
* language governing permissions and limitations under the License.
11+
* This Source Code may also be made available under the following Secondary
12+
* Licenses when the conditions for such availability set forth in the
13+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
14+
* version 2 with the GNU Classpath Exception, which is available at
15+
* https://www.gnu.org/software/classpath/license.html.
1516
*
16-
* When distributing the software, include this License Header Notice in each
17-
* file and include the License file at glassfish/legal/LICENSE.txt.
18-
*
19-
* GPL Classpath Exception:
20-
* The Payara Foundation designates this particular file as subject to the "Classpath"
21-
* exception as provided by the Payara Foundation in the GPL Version 2 section of the License
22-
* file that accompanied this code.
23-
*
24-
* Modifications:
25-
* If applicable, add the following below the License Header, with the fields
26-
* enclosed by brackets [] replaced by your own identifying information:
27-
* "Portions Copyright [year] [name of copyright owner]"
28-
*
29-
* Contributor(s):
30-
* If you wish your version of this file to be governed by only the CDDL or
31-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
32-
* elects to include this software in this distribution under the [CDDL or GPL
33-
* Version 2] license." If you don't indicate a single choice of license, a
34-
* recipient has the option to distribute your version of this file under
35-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
36-
* its licensees as provided above. However, if you add GPL Version 2 code
37-
* and therefore, elected the GPL Version 2 license, then the option applies
38-
* only if the new code is made subject to such option by the copyright
39-
* holder.
17+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
4018
*/
4119

4220
import * as vscode from 'vscode';

Diff for: src/main/fish/payara/server/PayaraInstanceController.ts

+11-33
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
11
'use strict';
22

33
/*
4+
* Copyright (c) 2020 Payara Foundation and/or its affiliates and others.
5+
* All rights reserved.
46
*
5-
* Copyright (c) 2020 Payara Foundation and/or its affiliates. All rights reserved.
7+
* This program and the accompanying materials are made available under the
8+
* terms of the Eclipse Public License v. 2.0, which is available at
9+
* http://www.eclipse.org/legal/epl-2.0.
610
*
7-
* The contents of this file are subject to the terms of either the GNU
8-
* General Public License Version 2 only ("GPL") or the Common Development
9-
* and Distribution License("CDDL") (collectively, the "License"). You
10-
* may not use this file except in compliance with the License. You can
11-
* obtain a copy of the License at
12-
* https://github.com/payara/Payara/blob/master/LICENSE.txt
13-
* See the License for the specific
14-
* language governing permissions and limitations under the License.
11+
* This Source Code may also be made available under the following Secondary
12+
* Licenses when the conditions for such availability set forth in the
13+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
14+
* version 2 with the GNU Classpath Exception, which is available at
15+
* https://www.gnu.org/software/classpath/license.html.
1516
*
16-
* When distributing the software, include this License Header Notice in each
17-
* file and include the License file at glassfish/legal/LICENSE.txt.
18-
*
19-
* GPL Classpath Exception:
20-
* The Payara Foundation designates this particular file as subject to the "Classpath"
21-
* exception as provided by the Payara Foundation in the GPL Version 2 section of the License
22-
* file that accompanied this code.
23-
*
24-
* Modifications:
25-
* If applicable, add the following below the License Header, with the fields
26-
* enclosed by brackets [] replaced by your own identifying information:
27-
* "Portions Copyright [year] [name of copyright owner]"
28-
*
29-
* Contributor(s):
30-
* If you wish your version of this file to be governed by only the CDDL or
31-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
32-
* elects to include this software in this distribution under the [CDDL or GPL
33-
* Version 2] license." If you don't indicate a single choice of license, a
34-
* recipient has the option to distribute your version of this file under
35-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
36-
* its licensees as provided above. However, if you add GPL Version 2 code
37-
* and therefore, elected the GPL Version 2 license, then the option applies
38-
* only if the new code is made subject to such option by the copyright
39-
* holder.
17+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
4018
*/
4119

4220
import * as vscode from 'vscode';

Diff for: src/main/fish/payara/server/PayaraInstanceProvider.ts

+11-33
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
11
'use strict';
22

33
/*
4+
* Copyright (c) 2020 Payara Foundation and/or its affiliates and others.
5+
* All rights reserved.
46
*
5-
* Copyright (c) 2020 Payara Foundation and/or its affiliates. All rights reserved.
7+
* This program and the accompanying materials are made available under the
8+
* terms of the Eclipse Public License v. 2.0, which is available at
9+
* http://www.eclipse.org/legal/epl-2.0.
610
*
7-
* The contents of this file are subject to the terms of either the GNU
8-
* General Public License Version 2 only ("GPL") or the Common Development
9-
* and Distribution License("CDDL") (collectively, the "License"). You
10-
* may not use this file except in compliance with the License. You can
11-
* obtain a copy of the License at
12-
* https://github.com/payara/Payara/blob/master/LICENSE.txt
13-
* See the License for the specific
14-
* language governing permissions and limitations under the License.
11+
* This Source Code may also be made available under the following Secondary
12+
* Licenses when the conditions for such availability set forth in the
13+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
14+
* version 2 with the GNU Classpath Exception, which is available at
15+
* https://www.gnu.org/software/classpath/license.html.
1516
*
16-
* When distributing the software, include this License Header Notice in each
17-
* file and include the License file at glassfish/legal/LICENSE.txt.
18-
*
19-
* GPL Classpath Exception:
20-
* The Payara Foundation designates this particular file as subject to the "Classpath"
21-
* exception as provided by the Payara Foundation in the GPL Version 2 section of the License
22-
* file that accompanied this code.
23-
*
24-
* Modifications:
25-
* If applicable, add the following below the License Header, with the fields
26-
* enclosed by brackets [] replaced by your own identifying information:
27-
* "Portions Copyright [year] [name of copyright owner]"
28-
*
29-
* Contributor(s):
30-
* If you wish your version of this file to be governed by only the CDDL or
31-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
32-
* elects to include this software in this distribution under the [CDDL or GPL
33-
* Version 2] license." If you don't indicate a single choice of license, a
34-
* recipient has the option to distribute your version of this file under
35-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
36-
* its licensees as provided above. However, if you add GPL Version 2 code
37-
* and therefore, elected the GPL Version 2 license, then the option applies
38-
* only if the new code is made subject to such option by the copyright
39-
* holder.
17+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
4018
*/
4119

4220
import * as vscode from "vscode";

Diff for: src/main/fish/payara/server/PayaraServerInstance.ts

+11-34
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,21 @@
11
'use strict';
22

33
/*
4+
* Copyright (c) 2020 Payara Foundation and/or its affiliates and others.
5+
* All rights reserved.
46
*
5-
* Copyright (c) 2020 Payara Foundation and/or its affiliates. All rights reserved.
7+
* This program and the accompanying materials are made available under the
8+
* terms of the Eclipse Public License v. 2.0, which is available at
9+
* http://www.eclipse.org/legal/epl-2.0.
610
*
7-
* The contents of this file are subject to the terms of either the GNU
8-
* General Public License Version 2 only ("GPL") or the Common Development
9-
* and Distribution License("CDDL") (collectively, the "License"). You
10-
* may not use this file except in compliance with the License. You can
11-
* obtain a copy of the License at
12-
* https://github.com/payara/Payara/blob/master/LICENSE.txt
13-
* See the License for the specific
14-
* language governing permissions and limitations under the License.
11+
* This Source Code may also be made available under the following Secondary
12+
* Licenses when the conditions for such availability set forth in the
13+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
14+
* version 2 with the GNU Classpath Exception, which is available at
15+
* https://www.gnu.org/software/classpath/license.html.
1516
*
16-
* When distributing the software, include this License Header Notice in each
17-
* file and include the License file at glassfish/legal/LICENSE.txt.
18-
*
19-
* GPL Classpath Exception:
20-
* The Payara Foundation designates this particular file as subject to the "Classpath"
21-
* exception as provided by the Payara Foundation in the GPL Version 2 section of the License
22-
* file that accompanied this code.
23-
*
24-
* Modifications:
25-
* If applicable, add the following below the License Header, with the fields
26-
* enclosed by brackets [] replaced by your own identifying information:
27-
* "Portions Copyright [year] [name of copyright owner]"
28-
*
29-
* Contributor(s):
30-
* If you wish your version of this file to be governed by only the CDDL or
31-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
32-
* elects to include this software in this distribution under the [CDDL or GPL
33-
* Version 2] license." If you don't indicate a single choice of license, a
34-
* recipient has the option to distribute your version of this file under
35-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
36-
* its licensees as provided above. However, if you add GPL Version 2 code
37-
* and therefore, elected the GPL Version 2 license, then the option applies
38-
* only if the new code is made subject to such option by the copyright
39-
* holder.
17+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
4018
*/
41-
4219
import * as vscode from "vscode";
4320

4421
export class PayaraServerInstance extends vscode.TreeItem {

Diff for: src/main/fish/payara/server/PayaraServerTreeDataProvider.ts

+11-33
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
11
'use strict';
22

33
/*
4+
* Copyright (c) 2020 Payara Foundation and/or its affiliates and others.
5+
* All rights reserved.
46
*
5-
* Copyright (c) 2020 Payara Foundation and/or its affiliates. All rights reserved.
7+
* This program and the accompanying materials are made available under the
8+
* terms of the Eclipse Public License v. 2.0, which is available at
9+
* http://www.eclipse.org/legal/epl-2.0.
610
*
7-
* The contents of this file are subject to the terms of either the GNU
8-
* General Public License Version 2 only ("GPL") or the Common Development
9-
* and Distribution License("CDDL") (collectively, the "License"). You
10-
* may not use this file except in compliance with the License. You can
11-
* obtain a copy of the License at
12-
* https://github.com/payara/Payara/blob/master/LICENSE.txt
13-
* See the License for the specific
14-
* language governing permissions and limitations under the License.
11+
* This Source Code may also be made available under the following Secondary
12+
* Licenses when the conditions for such availability set forth in the
13+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
14+
* version 2 with the GNU Classpath Exception, which is available at
15+
* https://www.gnu.org/software/classpath/license.html.
1516
*
16-
* When distributing the software, include this License Header Notice in each
17-
* file and include the License file at glassfish/legal/LICENSE.txt.
18-
*
19-
* GPL Classpath Exception:
20-
* The Payara Foundation designates this particular file as subject to the "Classpath"
21-
* exception as provided by the Payara Foundation in the GPL Version 2 section of the License
22-
* file that accompanied this code.
23-
*
24-
* Modifications:
25-
* If applicable, add the following below the License Header, with the fields
26-
* enclosed by brackets [] replaced by your own identifying information:
27-
* "Portions Copyright [year] [name of copyright owner]"
28-
*
29-
* Contributor(s):
30-
* If you wish your version of this file to be governed by only the CDDL or
31-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
32-
* elects to include this software in this distribution under the [CDDL or GPL
33-
* Version 2] license." If you don't indicate a single choice of license, a
34-
* recipient has the option to distribute your version of this file under
35-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
36-
* its licensees as provided above. However, if you add GPL Version 2 code
37-
* and therefore, elected the GPL Version 2 license, then the option applies
38-
* only if the new code is made subject to such option by the copyright
39-
* holder.
17+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
4018
*/
4119

4220
import * as vscode from "vscode";

0 commit comments

Comments
 (0)