Skip to content

Commit c37f7cc

Browse files
thurkathurka
committed
GH-339 Updating generic JFR loader to JMC version 8.0.1
1 parent 97cd12d commit c37f7cc

File tree

11 files changed

+376
-6
lines changed

11 files changed

+376
-6
lines changed

‎visualvm/jfr.generic/build.xml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,36 @@
55
<project name="org.graalvm.visualvm.jfr.generic" default="netbeans" basedir=".">
66
<description>Builds, tests, and runs the project org.graalvm.visualvm.jfr.generic.</description>
77
<import file="nbproject/build-impl.xml"/>
8+
<target name="download-all-extbins" unless="ext.binaries.downloaded" depends="init">
9+
<echo>Downloading external binaries (external/ directory)...</echo>
10+
<property name="binaries.cache" location="${user.home}/.hgexternalcache"/>
11+
<property name="binaries.server" value="https://netbeans.osuosl.org/binaries/"/>
12+
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}" >
13+
<manifest dir=".">
14+
<include name="external/binaries-list"/>
15+
</manifest>
16+
</downloadbinaries>
17+
<property name="ext.binaries.downloaded" value="true"/>
18+
</target>
19+
20+
<target name="-pre-compile" depends="download-all-extbins">
21+
</target>
22+
23+
<target name="-pre-release" depends="compile">
24+
<taskdef name="releasefilescopy" classname="org.netbeans.nbbuild.extlibs.ReleaseFilesCopy" classpath="${harness.dir}/tasks.jar"/>
25+
<releasefilescopy cluster="${cluster}"/>
26+
</target>
27+
28+
<target name="-release.files" depends="projectized-common.-release.files">
29+
<taskdef name="releasefilesextra" classname="org.netbeans.nbbuild.extlibs.ReleaseFilesExtra" classpath="${harness.dir}/tasks.jar"/>
30+
<releasefilesextra property="release.files.extra"/>
31+
</target>
32+
33+
<target name="-pre-nbm" depends="compile">
34+
<property name="license.file.override" location="${build.dir}/license"/>
35+
<property name="extra.license.files" value=""/>
36+
<taskdef name="releasefileslicense" classname="org.netbeans.nbbuild.extlibs.ReleaseFilesLicense" classpath="${harness.dir}/tasks.jar"/>
37+
<releasefileslicense license="${license.file.override}" standardlicense="${license.file}" extralicensefiles="${extra.license.files}"/>
38+
</target>
39+
840
</project>

‎visualvm/jfr.generic/external/binaries-list

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
0BBEE5336A9A06CDEF81857D6CF2A4C093A31632 org.openjdk.jmc:flightrecorder:8.0.1
2+
0F9B226237D574F10A77D502486074F584987938 org.openjdk.jmc:common:8.0.1
3+
C4D931EF8AD2C9C35D65B231A33E61428472D0DA org.lz4:lz4-java:1.7.1
4+
664346E62C3A95E1DE5153DB231BD283392A9532 org.owasp.encoder:encoder:1.2.2

‎visualvm/jfr.generic/external/encoder-1.2.2-license.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Name: Encoder
2+
Description: The OWASP Encoders package is a collection of high-performance low-overhead contextual encoders, that when utilized correctly, is an effective tool in preventing Web Application security vulnerabilities such as Cross-Site Scripting.
3+
Version: 1.7.1
4+
Origin: https://github.com/OWASP/owasp-java-encoder
5+
License: BSD 3-Clause
6+
7+
Copyright (c) 2015 Jeff Ichnowski
8+
All rights reserved.
9+
10+
Redistribution and use in source and binary forms, with or without
11+
modification, are permitted provided that the following conditions
12+
are met:
13+
14+
* Redistributions of source code must retain the above
15+
copyright notice, this list of conditions and the following
16+
disclaimer.
17+
18+
* Redistributions in binary form must reproduce the above
19+
copyright notice, this list of conditions and the following
20+
disclaimer in the documentation and/or other materials
21+
provided with the distribution.
22+
23+
* Neither the name of the OWASP nor the names of its
24+
contributors may be used to endorse or promote products
25+
derived from this software without specific prior written
26+
permission.
27+
28+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
29+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
30+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
31+
FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
32+
COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
33+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
34+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
35+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
37+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
38+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
39+
OF THE POSSIBILITY OF SUCH DAMAGE.

‎visualvm/jfr.generic/external/flightrecorder-8.0.1-license.txt

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
Name: JMC
2+
Description: OpenJDK Mission Control, a production time profiling and diagnostics tools suite.
3+
License: UPL
4+
Origin: https://github.com/openjdk/jmc
5+
Version: 8.0.1
6+
Files: common-8.0.1.jar, flightrecorder-8.0.1.jar
7+
8+
Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
9+
10+
The Universal Permissive License (UPL), Version 1.0
11+
12+
Subject to the condition set forth below, permission is hereby granted to any
13+
person obtaining a copy of this software, associated documentation and/or data
14+
(collectively the "Software"), free of charge and under any and all copyright
15+
rights in the Software, and any and all patent rights owned or freely
16+
licensable by each licensor hereunder covering either (i) the unmodified
17+
Software as contributed to or provided by such licensor, or (ii) the Larger
18+
Works (as defined below), to deal in both
19+
20+
(a) the Software, and
21+
22+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
23+
one is included with the Software (each a �Larger Work� to which the
24+
Software is contributed by such licensors), without restriction, including
25+
without limitation the rights to copy, create derivative works of,
26+
display, perform, and distribute the Software and make, use, sell, offer
27+
for sale, import, export, have made, and have sold the Software and the
28+
Larger Work(s), and to sublicense the foregoing rights on either these or
29+
other terms.
30+
31+
This license is subject to the following condition:
32+
33+
The above copyright notice and either this complete permission notice or at a
34+
minimum a reference to the UPL must be included in all copies or substantial
35+
portions of the Software.
36+
37+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
38+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
39+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
40+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
41+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
42+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
43+
SOFTWARE.
44+
45+
46+
Copyright (c) 2018 Oracle America, Inc. All rights reserved.
47+
48+
Redistribution and use in source and binary forms, with or without
49+
modification, are permitted provided that the following conditions are met:
50+
51+
1. Redistributions of source code must retain the above copyright notice,
52+
this list of conditions and the following disclaimer.
53+
54+
2. Redistributions in binary form must reproduce the above copyright notice,
55+
this list of conditions and the following disclaimer in the documentation
56+
and/or other materials provided with the distribution.
57+
58+
3. Neither the name of the copyright holder nor the names of its contributors
59+
may be used to endorse or promote products derived from this software
60+
without specific prior written permission.
61+
62+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
63+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
64+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
65+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
66+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
67+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
68+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
69+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
70+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
71+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎visualvm/jfr.generic/external/lz4-java-1.7.1-license.txt

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
Name: lz4-java
2+
Description: Java ports and bindings of the LZ4 compression algorithm and the xxHash hashing algorithm
3+
Version: 1.7.1
4+
Origin: https://github.com/lz4/lz4-java
5+
License: Apache-2.0
6+
7+
8+
Apache License
9+
Version 2.0, January 2004
10+
http://www.apache.org/licenses/
11+
12+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
13+
14+
1. Definitions.
15+
16+
"License" shall mean the terms and conditions for use, reproduction,
17+
and distribution as defined by Sections 1 through 9 of this document.
18+
19+
"Licensor" shall mean the copyright owner or entity authorized by
20+
the copyright owner that is granting the License.
21+
22+
"Legal Entity" shall mean the union of the acting entity and all
23+
other entities that control, are controlled by, or are under common
24+
control with that entity. For the purposes of this definition,
25+
"control" means (i) the power, direct or indirect, to cause the
26+
direction or management of such entity, whether by contract or
27+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
28+
outstanding shares, or (iii) beneficial ownership of such entity.
29+
30+
"You" (or "Your") shall mean an individual or Legal Entity
31+
exercising permissions granted by this License.
32+
33+
"Source" form shall mean the preferred form for making modifications,
34+
including but not limited to software source code, documentation
35+
source, and configuration files.
36+
37+
"Object" form shall mean any form resulting from mechanical
38+
transformation or translation of a Source form, including but
39+
not limited to compiled object code, generated documentation,
40+
and conversions to other media types.
41+
42+
"Work" shall mean the work of authorship, whether in Source or
43+
Object form, made available under the License, as indicated by a
44+
copyright notice that is included in or attached to the work
45+
(an example is provided in the Appendix below).
46+
47+
"Derivative Works" shall mean any work, whether in Source or Object
48+
form, that is based on (or derived from) the Work and for which the
49+
editorial revisions, annotations, elaborations, or other modifications
50+
represent, as a whole, an original work of authorship. For the purposes
51+
of this License, Derivative Works shall not include works that remain
52+
separable from, or merely link (or bind by name) to the interfaces of,
53+
the Work and Derivative Works thereof.
54+
55+
"Contribution" shall mean any work of authorship, including
56+
the original version of the Work and any modifications or additions
57+
to that Work or Derivative Works thereof, that is intentionally
58+
submitted to Licensor for inclusion in the Work by the copyright owner
59+
or by an individual or Legal Entity authorized to submit on behalf of
60+
the copyright owner. For the purposes of this definition, "submitted"
61+
means any form of electronic, verbal, or written communication sent
62+
to the Licensor or its representatives, including but not limited to
63+
communication on electronic mailing lists, source code control systems,
64+
and issue tracking systems that are managed by, or on behalf of, the
65+
Licensor for the purpose of discussing and improving the Work, but
66+
excluding communication that is conspicuously marked or otherwise
67+
designated in writing by the copyright owner as "Not a Contribution."
68+
69+
"Contributor" shall mean Licensor and any individual or Legal Entity
70+
on behalf of whom a Contribution has been received by Licensor and
71+
subsequently incorporated within the Work.
72+
73+
2. Grant of Copyright License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
copyright license to reproduce, prepare Derivative Works of,
77+
publicly display, publicly perform, sublicense, and distribute the
78+
Work and such Derivative Works in Source or Object form.
79+
80+
3. Grant of Patent License. Subject to the terms and conditions of
81+
this License, each Contributor hereby grants to You a perpetual,
82+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
83+
(except as stated in this section) patent license to make, have made,
84+
use, offer to sell, sell, import, and otherwise transfer the Work,
85+
where such license applies only to those patent claims licensable
86+
by such Contributor that are necessarily infringed by their
87+
Contribution(s) alone or by combination of their Contribution(s)
88+
with the Work to which such Contribution(s) was submitted. If You
89+
institute patent litigation against any entity (including a
90+
cross-claim or counterclaim in a lawsuit) alleging that the Work
91+
or a Contribution incorporated within the Work constitutes direct
92+
or contributory patent infringement, then any patent licenses
93+
granted to You under this License for that Work shall terminate
94+
as of the date such litigation is filed.
95+
96+
4. Redistribution. You may reproduce and distribute copies of the
97+
Work or Derivative Works thereof in any medium, with or without
98+
modifications, and in Source or Object form, provided that You
99+
meet the following conditions:
100+
101+
(a) You must give any other recipients of the Work or
102+
Derivative Works a copy of this License; and
103+
104+
(b) You must cause any modified files to carry prominent notices
105+
stating that You changed the files; and
106+
107+
(c) You must retain, in the Source form of any Derivative Works
108+
that You distribute, all copyright, patent, trademark, and
109+
attribution notices from the Source form of the Work,
110+
excluding those notices that do not pertain to any part of
111+
the Derivative Works; and
112+
113+
(d) If the Work includes a "NOTICE" text file as part of its
114+
distribution, then any Derivative Works that You distribute must
115+
include a readable copy of the attribution notices contained
116+
within such NOTICE file, excluding those notices that do not
117+
pertain to any part of the Derivative Works, in at least one
118+
of the following places: within a NOTICE text file distributed
119+
as part of the Derivative Works; within the Source form or
120+
documentation, if provided along with the Derivative Works; or,
121+
within a display generated by the Derivative Works, if and
122+
wherever such third-party notices normally appear. The contents
123+
of the NOTICE file are for informational purposes only and
124+
do not modify the License. You may add Your own attribution
125+
notices within Derivative Works that You distribute, alongside
126+
or as an addendum to the NOTICE text from the Work, provided
127+
that such additional attribution notices cannot be construed
128+
as modifying the License.
129+
130+
You may add Your own copyright statement to Your modifications and
131+
may provide additional or different license terms and conditions
132+
for use, reproduction, or distribution of Your modifications, or
133+
for any such Derivative Works as a whole, provided Your use,
134+
reproduction, and distribution of the Work otherwise complies with
135+
the conditions stated in this License.
136+
137+
5. Submission of Contributions. Unless You explicitly state otherwise,
138+
any Contribution intentionally submitted for inclusion in the Work
139+
by You to the Licensor shall be under the terms and conditions of
140+
this License, without any additional terms or conditions.
141+
Notwithstanding the above, nothing herein shall supersede or modify
142+
the terms of any separate license agreement you may have executed
143+
with Licensor regarding such Contributions.
144+
145+
6. Trademarks. This License does not grant permission to use the trade
146+
names, trademarks, service marks, or product names of the Licensor,
147+
except as required for reasonable and customary use in describing the
148+
origin of the Work and reproducing the content of the NOTICE file.
149+
150+
7. Disclaimer of Warranty. Unless required by applicable law or
151+
agreed to in writing, Licensor provides the Work (and each
152+
Contributor provides its Contributions) on an "AS IS" BASIS,
153+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
154+
implied, including, without limitation, any warranties or conditions
155+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
156+
PARTICULAR PURPOSE. You are solely responsible for determining the
157+
appropriateness of using or redistributing the Work and assume any
158+
risks associated with Your exercise of permissions under this License.
159+
160+
8. Limitation of Liability. In no event and under no legal theory,
161+
whether in tort (including negligence), contract, or otherwise,
162+
unless required by applicable law (such as deliberate and grossly
163+
negligent acts) or agreed to in writing, shall any Contributor be
164+
liable to You for damages, including any direct, indirect, special,
165+
incidental, or consequential damages of any character arising as a
166+
result of this License or out of the use or inability to use the
167+
Work (including but not limited to damages for loss of goodwill,
168+
work stoppage, computer failure or malfunction, or any and all
169+
other commercial damages or losses), even if such Contributor
170+
has been advised of the possibility of such damages.
171+
172+
9. Accepting Warranty or Additional Liability. While redistributing
173+
the Work or Derivative Works thereof, You may choose to offer,
174+
and charge a fee for, acceptance of support, warranty, indemnity,
175+
or other liability obligations and/or rights consistent with this
176+
License. However, in accepting such obligations, You may act only
177+
on Your own behalf and on Your sole responsibility, not on behalf
178+
of any other Contributor, and only if You agree to indemnify,
179+
defend, and hold each Contributor harmless for any liability
180+
incurred by, or claims asserted against, such Contributor by reason
181+
of your accepting any such warranty or additional liability.
182+
183+
END OF TERMS AND CONDITIONS
184+
185+
APPENDIX: How to apply the Apache License to your work.
186+
187+
To apply the Apache License to your work, attach the following
188+
boilerplate notice, with the fields enclosed by brackets "[]"
189+
replaced with your own identifying information. (Don't include
190+
the brackets!) The text should be enclosed in the appropriate
191+
comment syntax for the file format. We also recommend that a
192+
file or class name and description of purpose be included on the
193+
same "printed page" as the copyright notice for easier
194+
identification within third-party archives.
195+
196+
Copyright [yyyy] [name of copyright owner]
197+
198+
Licensed under the Apache License, Version 2.0 (the "License");
199+
you may not use this file except in compliance with the License.
200+
You may obtain a copy of the License at
201+
202+
http://www.apache.org/licenses/LICENSE-2.0
203+
204+
Unless required by applicable law or agreed to in writing, software
205+
distributed under the License is distributed on an "AS IS" BASIS,
206+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
207+
See the License for the specific language governing permissions and
208+
limitations under the License.

‎visualvm/jfr.generic/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ AutoUpdate-Essential-Module: true
44
OpenIDE-Module: org.graalvm.visualvm.jfr.generic/2
55
OpenIDE-Module-Install: org/graalvm/visualvm/jfr/generic/Installer.class
66
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/generic/Bundle.properties
7-
OpenIDE-Module-Specification-Version: 2.1
7+
OpenIDE-Module-Specification-Version: 2.2
88
OpenIDE-Module-Provides: jfr.implementation

0 commit comments

Comments
 (0)