Skip to content
This repository was archived by the owner on Aug 27, 2022. It is now read-only.
/ lanai Public archive

Commit 5db5591

Browse files
author
Alexey Ushakov
committed
8261273: RenderPerf test files should have GPL license without Classpath exception
1 parent 79bb755 commit 5db5591

File tree

5 files changed

+34
-53
lines changed

5 files changed

+34
-53
lines changed

test/jdk/performance/client/RenderPerfTest/Makefile

+16-23
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
11
#
22
# Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
3+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
34
#
4-
# Redistribution and use in source and binary forms, with or without
5-
# modification, are permitted provided that the following conditions
6-
# are met:
5+
# This code is free software; you can redistribute it and/or modify it
6+
# under the terms of the GNU General Public License version 2 only, as
7+
# published by the Free Software Foundation.
78
#
8-
# - Redistributions of source code must retain the above copyright
9-
# notice, this list of conditions and the following disclaimer.
9+
# This code is distributed in the hope that it will be useful, but WITHOUT
10+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
# version 2 for more details (a copy is included in the LICENSE file that
13+
# accompanied this code).
1014
#
11-
# - Redistributions in binary form must reproduce the above copyright
12-
# notice, this list of conditions and the following disclaimer in the
13-
# documentation and/or other materials provided with the distribution.
15+
# You should have received a copy of the GNU General Public License version
16+
# 2 along with this work; if not, write to the Free Software Foundation,
17+
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1418
#
15-
# - Neither the name of Oracle nor the names of its
16-
# contributors may be used to endorse or promote products derived
17-
# from this software without specific prior written permission.
18-
#
19-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
20-
# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
21-
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22-
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
23-
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24-
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25-
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
26-
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27-
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
28-
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29-
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
19+
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
# or visit www.oracle.com if you need additional information or have any
21+
# questions.
3022
#
3123

24+
3225
SOURCEPATH=src
3326
CLASSES=build
3427
DIST=dist

test/jdk/performance/client/RenderPerfTest/README

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ Run all tests
3131

3232
Run particular test cases
3333

34-
#> java -jar dist/RenderPerfTest.jar testWhiteTextBubblesGray ...
34+
#> java -jar dist/RenderPerfTest.jar WhiteTextGray ...

test/jdk/performance/client/RenderPerfTest/build.xml

+15-23
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
11
<!--
22
Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
3+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
34
4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions
6-
are met:
5+
This code is free software; you can redistribute it and/or modify it
6+
under the terms of the GNU General Public License version 2 only, as
7+
published by the Free Software Foundation.
78
8-
- Redistributions of source code must retain the above copyright
9-
notice, this list of conditions and the following disclaimer.
9+
This code is distributed in the hope that it will be useful, but WITHOUT
10+
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
version 2 for more details (a copy is included in the LICENSE file that
13+
accompanied this code).
1014
11-
- Redistributions in binary form must reproduce the above copyright
12-
notice, this list of conditions and the following disclaimer in the
13-
documentation and/or other materials provided with the distribution.
15+
You should have received a copy of the GNU General Public License version
16+
2 along with this work; if not, write to the Free Software Foundation,
17+
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1418
15-
- Neither the name of Oracle nor the names of its
16-
contributors may be used to endorse or promote products derived
17-
from this software without specific prior written permission.
18-
19-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
20-
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
21-
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22-
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
23-
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24-
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25-
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
26-
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27-
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
28-
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
19+
Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
or visit www.oracle.com if you need additional information or have any
21+
questions.
3022
-->
3123

3224
<project name="RenderPerfTest" default="dist" basedir=".">

test/jdk/performance/client/RenderPerfTest/src/renderperf/RenderPerfLCDTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
*
55
* This code is free software; you can redistribute it and/or modify it
66
* under the terms of the GNU General Public License version 2 only, as
7-
* published by the Free Software Foundation. Oracle designates this
8-
* particular file as subject to the "Classpath" exception as provided
9-
* by Oracle in the LICENSE file that accompanied this code.
7+
* published by the Free Software Foundation.
108
*
119
* This code is distributed in the hope that it will be useful, but WITHOUT
1210
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

test/jdk/performance/client/RenderPerfTest/src/renderperf/RenderPerfTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
*
55
* This code is free software; you can redistribute it and/or modify it
66
* under the terms of the GNU General Public License version 2 only, as
7-
* published by the Free Software Foundation. Oracle designates this
8-
* particular file as subject to the "Classpath" exception as provided
9-
* by Oracle in the LICENSE file that accompanied this code.
7+
* published by the Free Software Foundation.
108
*
119
* This code is distributed in the hope that it will be useful, but WITHOUT
1210
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

0 commit comments

Comments
 (0)