Skip to content

Commit f830861

Browse files
committed
+ Fix copyrights.
1 parent 1c027f9 commit f830861

File tree

2 files changed

+18
-70
lines changed

2 files changed

+18
-70
lines changed

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProviderConfig.java

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,16 @@
11
/*
2-
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2+
* Copyright (c) 2011 Sonatype, Inc. All rights reserved.
33
*
4-
* Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
4+
* This program is licensed to you under the Apache License Version 2.0,
5+
* and you may not use this file except in compliance with the Apache License Version 2.0.
6+
* You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
57
*
6-
* The contents of this file are subject to the terms of either the GNU
7-
* General Public License Version 2 only ("GPL") or the Common Development
8-
* and Distribution License("CDDL") (collectively, the "License"). You
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
13-
* language governing permissions and limitations under the License.
14-
*
15-
* When distributing the software, include this License Header Notice in each
16-
* file and include the License file at packager/legal/LICENSE.txt.
17-
*
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]"
27-
*
28-
* Contributor(s):
29-
* If you wish your version of this file to be governed by only the CDDL or
30-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
31-
* elects to include this software in this distribution under the [CDDL or GPL
32-
* Version 2] license." If you don't indicate a single choice of license, a
33-
* recipient has the option to distribute your version of this file under
34-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
35-
* its licensees as provided above. However, if you add GPL Version 2 code
36-
* and therefore, elected the GPL Version 2 license, then the option applies
37-
* only if the new code is made subject to such option by the copyright
38-
* holder.
8+
* Unless required by applicable law or agreed to in writing,
9+
* software distributed under the Apache License Version 2.0 is distributed on an
10+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
3912
*/
13+
4014
package com.ning.http.client.providers.grizzly;
4115

4216
import com.ning.http.client.AsyncHttpProviderConfig;

src/main/java/com/ning/http/client/providers/grizzly/TransportCustomizer.java

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,16 @@
11
/*
2-
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2+
* Copyright (c) 2011 Sonatype, Inc. All rights reserved.
33
*
4-
* Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
4+
* This program is licensed to you under the Apache License Version 2.0,
5+
* and you may not use this file except in compliance with the Apache License Version 2.0.
6+
* You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
57
*
6-
* The contents of this file are subject to the terms of either the GNU
7-
* General Public License Version 2 only ("GPL") or the Common Development
8-
* and Distribution License("CDDL") (collectively, the "License"). You
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
13-
* language governing permissions and limitations under the License.
14-
*
15-
* When distributing the software, include this License Header Notice in each
16-
* file and include the License file at packager/legal/LICENSE.txt.
17-
*
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]"
27-
*
28-
* Contributor(s):
29-
* If you wish your version of this file to be governed by only the CDDL or
30-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
31-
* elects to include this software in this distribution under the [CDDL or GPL
32-
* Version 2] license." If you don't indicate a single choice of license, a
33-
* recipient has the option to distribute your version of this file under
34-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
35-
* its licensees as provided above. However, if you add GPL Version 2 code
36-
* and therefore, elected the GPL Version 2 license, then the option applies
37-
* only if the new code is made subject to such option by the copyright
38-
* holder.
8+
* Unless required by applicable law or agreed to in writing,
9+
* software distributed under the Apache License Version 2.0 is distributed on an
10+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
3912
*/
13+
4014
package com.ning.http.client.providers.grizzly;
4115

4216
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;

0 commit comments

Comments
 (0)