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

Commit ff89f00

Browse files
committed
Re-did some of the files corrected by copyright plugin
1 parent 7aaef25 commit ff89f00

7 files changed

Lines changed: 16 additions & 299 deletions

File tree

mq/src/share/install/install/model/CreateSOA.xcs

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
4-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5-
6-
Copyright (c) 2017 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://oss.oracle.com/licenses/CDDL+GPL-1.1
14-
or 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 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-
42-
-->
432

443
<oor:component-schema oor:version="1.1" oor:name="CreateSOA" oor:package="com.sun.install.L10nSelection"
454
xsi:schemaLocation="http://openoffice.org/2001/registry"
@@ -51,19 +10,19 @@
5110
5211
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5312
54-
Copyright (c) 2006-2010 Oracle and/or its affiliates. All rights reserved.
13+
Copyright (c) 2006-2017 Oracle and/or its affiliates. All rights reserved.
5514
5615
The contents of this file are subject to the terms of either the GNU
5716
General Public License Version 2 only ("GPL") or the Common Development
5817
and Distribution License("CDDL") (collectively, the "License"). You
5918
may not use this file except in compliance with the License. You can
6019
obtain a copy of the License at
61-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
62-
or packager/legal/LICENSE.txt. See the License for the specific
20+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
21+
or LICENSE.txt. See the License for the specific
6322
language governing permissions and limitations under the License.
6423
6524
When distributing the software, include this License Header Notice in each
66-
file and include the License file at packager/legal/LICENSE.txt.
25+
file and include the License file at LICENSE.txt.
6726
6827
GPL Classpath Exception:
6928
Oracle designates this particular file as subject to the "Classpath"

mq/src/share/java/webapps/imqhttp/web.xml

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,25 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
22
<!DOCTYPE web-app
3-
<!--
4-
5-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
6-
7-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
8-
9-
The contents of this file are subject to the terms of either the GNU
10-
General Public License Version 2 only ("GPL") or the Common Development
11-
and Distribution License("CDDL") (collectively, the "License"). You
12-
may not use this file except in compliance with the License. You can
13-
obtain a copy of the License at
14-
https://oss.oracle.com/licenses/CDDL+GPL-1.1
15-
or LICENSE.txt. See the License for the specific
16-
language governing permissions and limitations under the License.
17-
18-
When distributing the software, include this License Header Notice in each
19-
file and include the License file at LICENSE.txt.
20-
21-
GPL Classpath Exception:
22-
Oracle designates this particular file as subject to the "Classpath"
23-
exception as provided by Oracle in the GPL Version 2 section of the License
24-
file that accompanied this code.
25-
26-
Modifications:
27-
If applicable, add the following below the License Header, with the fields
28-
enclosed by brackets [] replaced by your own identifying information:
29-
"Portions Copyright [year] [name of copyright owner]"
30-
31-
Contributor(s):
32-
If you wish your version of this file to be governed by only the CDDL or
33-
only the GPL Version 2, indicate your decision by adding "[Contributor]
34-
elects to include this software in this distribution under the [CDDL or GPL
35-
Version 2] license." If you don't indicate a single choice of license, a
36-
recipient has the option to distribute your version of this file under
37-
either the CDDL, the GPL Version 2 or to extend the choice of license to
38-
its licensees as provided above. However, if you add GPL Version 2 code
39-
and therefore, elected the GPL Version 2 license, then the option applies
40-
only if the new code is made subject to such option by the copyright
41-
holder.
42-
43-
-->
443

454
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
465
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
476
<!--
487
498
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
509
51-
Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
10+
Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
5211
5312
The contents of this file are subject to the terms of either the GNU
5413
General Public License Version 2 only ("GPL") or the Common Development
5514
and Distribution License("CDDL") (collectively, the "License"). You
5615
may not use this file except in compliance with the License. You can
5716
obtain a copy of the License at
58-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
59-
or packager/legal/LICENSE.txt. See the License for the specific
17+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
18+
or LICENSE.txt. See the License for the specific
6019
language governing permissions and limitations under the License.
6120
6221
When distributing the software, include this License Header Notice in each
63-
file and include the License file at packager/legal/LICENSE.txt.
22+
file and include the License file at LICENSE.txt.
6423
6524
GPL Classpath Exception:
6625
Oracle designates this particular file as subject to the "Classpath"

mq/src/share/java/webapps/imqhttps/web.xml

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,25 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
22
<!DOCTYPE web-app
3-
<!--
4-
5-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
6-
7-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
8-
9-
The contents of this file are subject to the terms of either the GNU
10-
General Public License Version 2 only ("GPL") or the Common Development
11-
and Distribution License("CDDL") (collectively, the "License"). You
12-
may not use this file except in compliance with the License. You can
13-
obtain a copy of the License at
14-
https://oss.oracle.com/licenses/CDDL+GPL-1.1
15-
or LICENSE.txt. See the License for the specific
16-
language governing permissions and limitations under the License.
17-
18-
When distributing the software, include this License Header Notice in each
19-
file and include the License file at LICENSE.txt.
20-
21-
GPL Classpath Exception:
22-
Oracle designates this particular file as subject to the "Classpath"
23-
exception as provided by Oracle in the GPL Version 2 section of the License
24-
file that accompanied this code.
25-
26-
Modifications:
27-
If applicable, add the following below the License Header, with the fields
28-
enclosed by brackets [] replaced by your own identifying information:
29-
"Portions Copyright [year] [name of copyright owner]"
30-
31-
Contributor(s):
32-
If you wish your version of this file to be governed by only the CDDL or
33-
only the GPL Version 2, indicate your decision by adding "[Contributor]
34-
elects to include this software in this distribution under the [CDDL or GPL
35-
Version 2] license." If you don't indicate a single choice of license, a
36-
recipient has the option to distribute your version of this file under
37-
either the CDDL, the GPL Version 2 or to extend the choice of license to
38-
its licensees as provided above. However, if you add GPL Version 2 code
39-
and therefore, elected the GPL Version 2 license, then the option applies
40-
only if the new code is made subject to such option by the copyright
41-
holder.
42-
43-
-->
443

454
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
465
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
476
<!--
487
498
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
509
51-
Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
10+
Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
5211
5312
The contents of this file are subject to the terms of either the GNU
5413
General Public License Version 2 only ("GPL") or the Common Development
5514
and Distribution License("CDDL") (collectively, the "License"). You
5615
may not use this file except in compliance with the License. You can
5716
obtain a copy of the License at
58-
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
59-
or packager/legal/LICENSE.txt. See the License for the specific
17+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
18+
or LICENSE.txt. See the License for the specific
6019
language governing permissions and limitations under the License.
6120
6221
When distributing the software, include this License Header Notice in each
63-
file and include the License file at packager/legal/LICENSE.txt.
22+
file and include the License file at LICENSE.txt.
6423
6524
GPL Classpath Exception:
6625
Oracle designates this particular file as subject to the "Classpath"

mq/src/solaris/native/com_sun_messaging_jmq_jmsserver_audit_impl_BSMAuditSession.c

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2010-2017 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
@@ -42,46 +42,6 @@
4242
static char sccsid[] = "@(#)com_sun_messaging_jmq_jmsserver_audit_BSMAuditSession.c 1.5 07/02/07 Copyr 2004 Sun Microsystems, Inc.";
4343
#endif
4444

45-
/*
46-
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
47-
*
48-
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
49-
*
50-
* The contents of this file are subject to the terms of either the GNU
51-
* General Public License Version 2 only ("GPL") or the Common Development
52-
* and Distribution License("CDDL") (collectively, the "License"). You
53-
* may not use this file except in compliance with the License. You can
54-
* obtain a copy of the License at
55-
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
56-
* or packager/legal/LICENSE.txt. See the License for the specific
57-
* language governing permissions and limitations under the License.
58-
*
59-
* When distributing the software, include this License Header Notice in each
60-
* file and include the License file at packager/legal/LICENSE.txt.
61-
*
62-
* GPL Classpath Exception:
63-
* Oracle designates this particular file as subject to the "Classpath"
64-
* exception as provided by Oracle in the GPL Version 2 section of the License
65-
* file that accompanied this code.
66-
*
67-
* Modifications:
68-
* If applicable, add the following below the License Header, with the fields
69-
* enclosed by brackets [] replaced by your own identifying information:
70-
* "Portions Copyright [year] [name of copyright owner]"
71-
*
72-
* Contributor(s):
73-
* If you wish your version of this file to be governed by only the CDDL or
74-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
75-
* elects to include this software in this distribution under the [CDDL or GPL
76-
* Version 2] license." If you don't indicate a single choice of license, a
77-
* recipient has the option to distribute your version of this file under
78-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
79-
* its licensees as provided above. However, if you add GPL Version 2 code
80-
* and therefore, elected the GPL Version 2 license, then the option applies
81-
* only if the new code is made subject to such option by the copyright
82-
* holder.
83-
*/
84-
8545
/*
8646
* @(#)com_sun_messaging_jmq_jmsserver_audit_BSMAuditSession.c 1.5 07/02/07
8747
*/

mq/src/solaris/native/com_sun_messaging_jmq_util_Password.c

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2000-2017 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
@@ -51,46 +51,6 @@
5151
#include <termios.h>
5252
#endif
5353

54-
/*
55-
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
56-
*
57-
* Copyright (c) 2000-2010 Oracle and/or its affiliates. All rights reserved.
58-
*
59-
* The contents of this file are subject to the terms of either the GNU
60-
* General Public License Version 2 only ("GPL") or the Common Development
61-
* and Distribution License("CDDL") (collectively, the "License"). You
62-
* may not use this file except in compliance with the License. You can
63-
* obtain a copy of the License at
64-
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
65-
* or packager/legal/LICENSE.txt. See the License for the specific
66-
* language governing permissions and limitations under the License.
67-
*
68-
* When distributing the software, include this License Header Notice in each
69-
* file and include the License file at packager/legal/LICENSE.txt.
70-
*
71-
* GPL Classpath Exception:
72-
* Oracle designates this particular file as subject to the "Classpath"
73-
* exception as provided by Oracle in the GPL Version 2 section of the License
74-
* file that accompanied this code.
75-
*
76-
* Modifications:
77-
* If applicable, add the following below the License Header, with the fields
78-
* enclosed by brackets [] replaced by your own identifying information:
79-
* "Portions Copyright [year] [name of copyright owner]"
80-
*
81-
* Contributor(s):
82-
* If you wish your version of this file to be governed by only the CDDL or
83-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
84-
* elects to include this software in this distribution under the [CDDL or GPL
85-
* Version 2] license." If you don't indicate a single choice of license, a
86-
* recipient has the option to distribute your version of this file under
87-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
88-
* its licensees as provided above. However, if you add GPL Version 2 code
89-
* and therefore, elected the GPL Version 2 license, then the option applies
90-
* only if the new code is made subject to such option by the copyright
91-
* holder.
92-
*/
93-
9454
/*
9555
* @(#)com_sun_messaging_jmq_util_Password.c 1.9 07/02/07
9656
*/

mq/src/solaris/native/com_sun_messaging_jmq_util_Rlimit.c

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2000-2017 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
@@ -43,46 +43,6 @@
4343
#include <sys/resource.h>
4444
#include "com_sun_messaging_jmq_util_Rlimit.h"
4545

46-
/*
47-
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
48-
*
49-
* Copyright (c) 2000-2010 Oracle and/or its affiliates. All rights reserved.
50-
*
51-
* The contents of this file are subject to the terms of either the GNU
52-
* General Public License Version 2 only ("GPL") or the Common Development
53-
* and Distribution License("CDDL") (collectively, the "License"). You
54-
* may not use this file except in compliance with the License. You can
55-
* obtain a copy of the License at
56-
* https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
57-
* or packager/legal/LICENSE.txt. See the License for the specific
58-
* language governing permissions and limitations under the License.
59-
*
60-
* When distributing the software, include this License Header Notice in each
61-
* file and include the License file at packager/legal/LICENSE.txt.
62-
*
63-
* GPL Classpath Exception:
64-
* Oracle designates this particular file as subject to the "Classpath"
65-
* exception as provided by Oracle in the GPL Version 2 section of the License
66-
* file that accompanied this code.
67-
*
68-
* Modifications:
69-
* If applicable, add the following below the License Header, with the fields
70-
* enclosed by brackets [] replaced by your own identifying information:
71-
* "Portions Copyright [year] [name of copyright owner]"
72-
*
73-
* Contributor(s):
74-
* If you wish your version of this file to be governed by only the CDDL or
75-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
76-
* elects to include this software in this distribution under the [CDDL or GPL
77-
* Version 2] license." If you don't indicate a single choice of license, a
78-
* recipient has the option to distribute your version of this file under
79-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
80-
* its licensees as provided above. However, if you add GPL Version 2 code
81-
* and therefore, elected the GPL Version 2 license, then the option applies
82-
* only if the new code is made subject to such option by the copyright
83-
* holder.
84-
*/
85-
8646
/*
8747
* @(#)com_sun_messaging_jmq_util_Rlimit.c 1.3 07/02/07
8848
*/

0 commit comments

Comments
 (0)