Skip to content
This repository was archived by the owner on Aug 17, 2018. It is now read-only.

Commit fb97952

Browse files
author
Kin Man Chung
committed
Update copyright headers.
svn path=/trunk/; revision=1277
1 parent 5469f70 commit fb97952

File tree

155 files changed

+2881
-2223
lines changed

Some content is hidden

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

155 files changed

+2881
-2223
lines changed

‎api/pom.xml‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,46 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
/*
4-
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5-
*
6-
* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
7-
*
8-
* The contents of this file are subject to the terms of either the GNU
9-
* General Public License Version 2 only ("GPL") or the Common Development
10-
* and Distribution License("CDDL") (collectively, the "License"). You
11-
* may not use this file except in compliance with the License. You can obtain
12-
* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
13-
* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
14-
* language governing permissions and limitations under the License.
15-
*
16-
* When distributing the software, include this License Header Notice in each
17-
* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
18-
* Sun designates this particular file as subject to the "Classpath" exception
19-
* as provided by Sun in the GPL Version 2 section of the License file that
20-
* accompanied this code. If applicable, add the following below the License
21-
* Header, with the fields enclosed by brackets [] replaced by your own
22-
* identifying information: "Portions Copyrighted [year]
23-
* [name of copyright owner]"
24-
*
25-
* Contributor(s):
26-
*
27-
* If you wish your version of this file to be governed by only the CDDL or
28-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
29-
* elects to include this software in this distribution under the [CDDL or GPL
30-
* Version 2] license." If you don't indicate a single choice of license, a
31-
* recipient has the option to distribute your version of this file under
32-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
33-
* its licensees as provided above. However, if you add GPL Version 2 code
34-
* and therefore, elected the GPL Version 2 license, then the option applies
35-
* only if the new code is made subject to such option by the copyright
36-
* holder.
37-
*/
2+
<!--
3+
4+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5+
6+
Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
7+
8+
The contents of this file are subject to the terms of either the GNU
9+
General Public License Version 2 only ("GPL") or the Common Development
10+
and Distribution License("CDDL") (collectively, the "License"). You
11+
may not use this file except in compliance with the License. You can
12+
obtain a copy of the License at
13+
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
14+
or packager/legal/LICENSE.txt. See the License for the specific
15+
language governing permissions and limitations under the License.
16+
17+
When distributing the software, include this License Header Notice in each
18+
file and include the License file at packager/legal/LICENSE.txt.
19+
20+
GPL Classpath Exception:
21+
Oracle designates this particular file as subject to the "Classpath"
22+
exception as provided by Oracle in the GPL Version 2 section of the License
23+
file that accompanied this code.
24+
25+
Modifications:
26+
If applicable, add the following below the License Header, with the fields
27+
enclosed by brackets [] replaced by your own identifying information:
28+
"Portions Copyright [year] [name of copyright owner]"
29+
30+
Contributor(s):
31+
If you wish your version of this file to be governed by only the CDDL or
32+
only the GPL Version 2, indicate your decision by adding "[Contributor]
33+
elects to include this software in this distribution under the [CDDL or GPL
34+
Version 2] license." If you don't indicate a single choice of license, a
35+
recipient has the option to distribute your version of this file under
36+
either the CDDL, the GPL Version 2 or to extend the choice of license to
37+
its licensees as provided above. However, if you add GPL Version 2 code
38+
and therefore, elected the GPL Version 2 license, then the option applies
39+
only if the new code is made subject to such option by the copyright
40+
holder.
41+
3842
-->
43+
3944
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4045
<parent>
4146
<groupId>org.glassfish.web</groupId>

‎api/src/main/java/javax/servlet/jsp/ErrorData.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
4+
* Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
88
* and Distribution License("CDDL") (collectively, the "License"). You
9-
* may not use this file except in compliance with the License. You can obtain
10-
* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
11-
* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
12+
* or packager/legal/LICENSE.txt. See the License for the specific
1213
* language governing permissions and limitations under the License.
1314
*
1415
* When distributing the software, include this License Header Notice in each
15-
* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
16-
* Sun designates this particular file as subject to the "Classpath" exception
17-
* as provided by Sun in the GPL Version 2 section of the License file that
18-
* accompanied this code. If applicable, add the following below the License
19-
* Header, with the fields enclosed by brackets [] replaced by your own
20-
* identifying information: "Portions Copyrighted [year]
21-
* [name of copyright owner]"
16+
* file and include the License file at packager/legal/LICENSE.txt.
2217
*
23-
* Contributor(s):
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
2427
*
28+
* Contributor(s):
2529
* If you wish your version of this file to be governed by only the CDDL or
2630
* only the GPL Version 2, indicate your decision by adding "[Contributor]
2731
* elects to include this software in this distribution under the [CDDL or GPL
@@ -51,6 +55,7 @@
5155
* See the License for the specific language governing permissions and
5256
* limitations under the License.
5357
*/
58+
5459
package javax.servlet.jsp;
5560

5661
/**

‎api/src/main/java/javax/servlet/jsp/HttpJspPage.java‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
4+
* Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
88
* and Distribution License("CDDL") (collectively, the "License"). You
9-
* may not use this file except in compliance with the License. You can obtain
10-
* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
11-
* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
12+
* or packager/legal/LICENSE.txt. See the License for the specific
1213
* language governing permissions and limitations under the License.
1314
*
1415
* When distributing the software, include this License Header Notice in each
15-
* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
16-
* Sun designates this particular file as subject to the "Classpath" exception
17-
* as provided by Sun in the GPL Version 2 section of the License file that
18-
* accompanied this code. If applicable, add the following below the License
19-
* Header, with the fields enclosed by brackets [] replaced by your own
20-
* identifying information: "Portions Copyrighted [year]
21-
* [name of copyright owner]"
16+
* file and include the License file at packager/legal/LICENSE.txt.
2217
*
23-
* Contributor(s):
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
2427
*
28+
* Contributor(s):
2529
* If you wish your version of this file to be governed by only the CDDL or
2630
* only the GPL Version 2, indicate your decision by adding "[Contributor]
2731
* elects to include this software in this distribution under the [CDDL or GPL
@@ -51,7 +55,7 @@
5155
* See the License for the specific language governing permissions and
5256
* limitations under the License.
5357
*/
54-
58+
5559
package javax.servlet.jsp;
5660

5761
import javax.servlet.*;

‎api/src/main/java/javax/servlet/jsp/JspApplicationContext.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
4+
* Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
88
* and Distribution License("CDDL") (collectively, the "License"). You
9-
* may not use this file except in compliance with the License. You can obtain
10-
* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
11-
* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
12+
* or packager/legal/LICENSE.txt. See the License for the specific
1213
* language governing permissions and limitations under the License.
1314
*
1415
* When distributing the software, include this License Header Notice in each
15-
* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
16-
* Sun designates this particular file as subject to the "Classpath" exception
17-
* as provided by Sun in the GPL Version 2 section of the License file that
18-
* accompanied this code. If applicable, add the following below the License
19-
* Header, with the fields enclosed by brackets [] replaced by your own
20-
* identifying information: "Portions Copyrighted [year]
21-
* [name of copyright owner]"
16+
* file and include the License file at packager/legal/LICENSE.txt.
2217
*
23-
* Contributor(s):
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
2427
*
28+
* Contributor(s):
2529
* If you wish your version of this file to be governed by only the CDDL or
2630
* only the GPL Version 2, indicate your decision by adding "[Contributor]
2731
* elects to include this software in this distribution under the [CDDL or GPL

‎api/src/main/java/javax/servlet/jsp/JspContext.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
4+
* Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
88
* and Distribution License("CDDL") (collectively, the "License"). You
9-
* may not use this file except in compliance with the License. You can obtain
10-
* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
11-
* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
12+
* or packager/legal/LICENSE.txt. See the License for the specific
1213
* language governing permissions and limitations under the License.
1314
*
1415
* When distributing the software, include this License Header Notice in each
15-
* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
16-
* Sun designates this particular file as subject to the "Classpath" exception
17-
* as provided by Sun in the GPL Version 2 section of the License file that
18-
* accompanied this code. If applicable, add the following below the License
19-
* Header, with the fields enclosed by brackets [] replaced by your own
20-
* identifying information: "Portions Copyrighted [year]
21-
* [name of copyright owner]"
16+
* file and include the License file at packager/legal/LICENSE.txt.
2217
*
23-
* Contributor(s):
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
2427
*
28+
* Contributor(s):
2529
* If you wish your version of this file to be governed by only the CDDL or
2630
* only the GPL Version 2, indicate your decision by adding "[Contributor]
2731
* elects to include this software in this distribution under the [CDDL or GPL
@@ -51,6 +55,7 @@
5155
* See the License for the specific language governing permissions and
5256
* limitations under the License.
5357
*/
58+
5459
package javax.servlet.jsp;
5560

5661
import java.util.Enumeration;

‎api/src/main/java/javax/servlet/jsp/JspEngineInfo.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
4+
* Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
88
* and Distribution License("CDDL") (collectively, the "License"). You
9-
* may not use this file except in compliance with the License. You can obtain
10-
* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
11-
* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
12+
* or packager/legal/LICENSE.txt. See the License for the specific
1213
* language governing permissions and limitations under the License.
1314
*
1415
* When distributing the software, include this License Header Notice in each
15-
* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
16-
* Sun designates this particular file as subject to the "Classpath" exception
17-
* as provided by Sun in the GPL Version 2 section of the License file that
18-
* accompanied this code. If applicable, add the following below the License
19-
* Header, with the fields enclosed by brackets [] replaced by your own
20-
* identifying information: "Portions Copyrighted [year]
21-
* [name of copyright owner]"
16+
* file and include the License file at packager/legal/LICENSE.txt.
2217
*
23-
* Contributor(s):
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
2427
*
28+
* Contributor(s):
2529
* If you wish your version of this file to be governed by only the CDDL or
2630
* only the GPL Version 2, indicate your decision by adding "[Contributor]
2731
* elects to include this software in this distribution under the [CDDL or GPL
@@ -51,6 +55,7 @@
5155
* See the License for the specific language governing permissions and
5256
* limitations under the License.
5357
*/
58+
5459
package javax.servlet.jsp;
5560

5661
/**

‎api/src/main/java/javax/servlet/jsp/JspException.java‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
4+
* Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
88
* and Distribution License("CDDL") (collectively, the "License"). You
9-
* may not use this file except in compliance with the License. You can obtain
10-
* a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
11-
* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
9+
* may not use this file except in compliance with the License. You can
10+
* obtain a copy of the License at
11+
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
12+
* or packager/legal/LICENSE.txt. See the License for the specific
1213
* language governing permissions and limitations under the License.
1314
*
1415
* When distributing the software, include this License Header Notice in each
15-
* file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
16-
* Sun designates this particular file as subject to the "Classpath" exception
17-
* as provided by Sun in the GPL Version 2 section of the License file that
18-
* accompanied this code. If applicable, add the following below the License
19-
* Header, with the fields enclosed by brackets [] replaced by your own
20-
* identifying information: "Portions Copyrighted [year]
21-
* [name of copyright owner]"
16+
* file and include the License file at packager/legal/LICENSE.txt.
2217
*
23-
* Contributor(s):
18+
* GPL Classpath Exception:
19+
* Oracle designates this particular file as subject to the "Classpath"
20+
* exception as provided by Oracle in the GPL Version 2 section of the License
21+
* file that accompanied this code.
22+
*
23+
* Modifications:
24+
* If applicable, add the following below the License Header, with the fields
25+
* enclosed by brackets [] replaced by your own identifying information:
26+
* "Portions Copyright [year] [name of copyright owner]"
2427
*
28+
* Contributor(s):
2529
* If you wish your version of this file to be governed by only the CDDL or
2630
* only the GPL Version 2, indicate your decision by adding "[Contributor]
2731
* elects to include this software in this distribution under the [CDDL or GPL
@@ -51,6 +55,7 @@
5155
* See the License for the specific language governing permissions and
5256
* limitations under the License.
5357
*/
58+
5459
package javax.servlet.jsp;
5560

5661
/**

0 commit comments

Comments
 (0)