Skip to content

Commit 7d16308

Browse files
authored
Merge pull request #1 from thurka/main
fixes of BTrace VisualVM integration
2 parents 2479d42 + 7a2f966 commit 7d16308

15 files changed

Lines changed: 22 additions & 22 deletions

File tree

btrace.api.integration/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
33
<!-- for some information on what you could do (e.g. targets to override). -->
44
<!-- If you delete this file and reopen the project it will be recreated. -->
5-
<project name="oeg.openjdk.btrace.visualvm.api" default="netbeans" basedir=".">
5+
<project name="org.openjdk.btrace.visualvm.api" default="netbeans" basedir=".">
66
<description>Builds, tests, and runs the project org.openjdk.btrace.visualvm.api.</description>
77
<import file="nbproject/build-impl.xml"/>
88

btrace.deployer/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<!-- for some information on what you could do (e.g. targets to override). -->
44
<!-- If you delete this file and reopen the project it will be recreated. -->
55
<project name="org.openjdk.btrace.visualvm.tracer.deployer" default="netbeans" basedir=".">
6-
<description>Builds, tests, and runs the project net.java.btrace.visualvm.tracer.deployer.</description>
6+
<description>Builds, tests, and runs the project org.openjdk.btrace.visualvm.tracer.deployer.</description>
77
<import file="nbproject/build-impl.xml"/>
88
</project>

btrace.deployer/src/org/openjdk/btrace/visualvm/tracer/deployer/layer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<folder name="Tracer">
66
<folder name="Deployer">
77
<file name="BTrace">
8-
<attr name="instance" methodvalue="net.java.btrace.visualvm.tracer.deployer.BTraceDeployer.instance"/>
8+
<attr name="instance" methodvalue="org.openjdk.btrace.visualvm.tracer.deployer.BTraceDeployer.instance"/>
99
</file>
1010
</folder>
1111
</folder>

btrace.uc/build.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
33
<!-- for some information on what you could do (e.g. targets to override). -->
44
<!-- If you delete this file and reopen the project it will be recreated. -->
5-
<project name="net.java.btrace.visualvm.uc" default="netbeans" basedir=".">
6-
<description>Builds, tests, and runs the project net.java.btrace.visualvm.uc.</description>
5+
<project name="org.openjdk.btrace.visualvm.uc" default="netbeans" basedir=".">
6+
<description>Builds, tests, and runs the project org.openjdk.btrace.visualvm.uc.</description>
77
<import file="nbproject/build-impl.xml"/>
88
</project>

btrace.uc/manifest.mf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
2-
OpenIDE-Module: net.java.btrace.visualvm.uc
3-
OpenIDE-Module-Layer: net/java/btrace/visualvm/uc/layer.xml
4-
OpenIDE-Module-Localizing-Bundle: net/java/btrace/visualvm/uc/Bundle.properties
2+
OpenIDE-Module: org.openjdk.btrace.visualvm.uc
3+
OpenIDE-Module-Layer: org/openjdk/btrace/visualvm/uc/layer.xml
4+
OpenIDE-Module-Localizing-Bundle: org/openjdk/btrace/visualvm/uc/Bundle.properties
55
OpenIDE-Module-Specification-Version: 1.0
66

btrace.uc/nbproject/build-impl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*** GENERATED FROM project.xml - DO NOT EDIT ***
44
*** EDIT ../build.xml INSTEAD ***
55
-->
6-
<project name="net.java.btrace.visualvm.uc-impl" basedir="..">
6+
<project name="org.openjdk.btrace.visualvm.uc-impl" basedir="..">
77
<fail message="Please build using Ant 1.7.1 or higher.">
88
<condition>
99
<not>

btrace.uc/nbproject/project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<type>org.netbeans.modules.apisupport.project</type>
44
<configuration>
55
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
6-
<code-name-base>net.java.btrace.visualvm.uc</code-name-base>
6+
<code-name-base>org.openjdk.btrace.visualvm.uc</code-name-base>
77
<standalone/>
88
<module-dependencies>
99
<dependency>

btrace.uc/src/net/java/btrace/visualvm/uc/Bundle.properties renamed to btrace.uc/src/org/openjdk/btrace/visualvm/uc/Bundle.properties

File renamed without changes.

btrace.uc/src/net/java/btrace/visualvm/uc/layer.xml renamed to btrace.uc/src/org/openjdk/btrace/visualvm/uc/layer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<folder name="Services">
55
<folder name="AutoupdateType">
66
<file name="btrace.instance">
7-
<attr name="SystemFileSystem.localizingBundle" stringvalue="net.java.btrace.visualvm.uc.Bundle"/>
7+
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.openjdk.btrace.visualvm.uc.Bundle"/>
88
<attr name="enabled" boolvalue="true"/>
99
<attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
1010
<attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>

how-to-build.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
In order to build this plugin you will need VisualVM 1.4 (or later) platform.
1+
In order to build this plugin you will need VisualVM 2.0 (or later) platform.
22
You can get it from https://visualvm.github.io/download.html
33

44
Once you have it downloaded and unpacked on your harddrive you will need to

0 commit comments

Comments
 (0)