diff --git a/README.md b/README.md index cca75cef84..6eb6d052a3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# VisualVM (master) sources repository +# VisualVM 2.0 sources repository VisualVM is a visual tool integrating commandline JDK tools and lightweight profiling capabilities. See https://visualvm.github.io for details, downloads and documentation. diff --git a/l10n/src/ja/visualvm/com-sun-tools-visualvm-core/com-sun-tools-visualvm-core/com/sun/tools/visualvm/core/Bundle_ja.properties b/l10n/src/ja/visualvm/com-sun-tools-visualvm-core/com-sun-tools-visualvm-core/com/sun/tools/visualvm/core/Bundle_ja.properties index b6fa2c6eca..bf609bbede 100644 --- a/l10n/src/ja/visualvm/com-sun-tools-visualvm-core/com-sun-tools-visualvm-core/com/sun/tools/visualvm/core/Bundle_ja.properties +++ b/l10n/src/ja/visualvm/com-sun-tools-visualvm-core/com-sun-tools-visualvm-core/com/sun/tools/visualvm/core/Bundle_ja.properties @@ -26,8 +26,8 @@ OpenIDE-Module-Display-Category=\u30a4\u30f3\u30d5\u30e9\u30b9\u30c8\u30e9\u30af\u30c1\u30e3\u30fc OpenIDE-Module-Name=VisualVM - \u30b3\u30a2 OpenIDE-Module-Short-Description=VisualVM \u306e\u4e3b\u306a\u30e2\u30b8\u30e5\u30fc\u30eb -com_sun_tools_visualvm_core_update_center=https://visualvm.github.io/uc/dev/updates.xml.gz?{$netbeans.hash.code} -Services/AutoupdateType/com_sun_tools_visualvm_core_update_center.instance=VisualVM \u30d7\u30e9\u30b0\u30a4\u30f3\u30bb\u30f3\u30bf\u30fc +com_sun_tools_visualvm_core_update_center=https://visualvm.github.io/uc/release20/updates.xml.gz?{$netbeans.hash.code} +Services/AutoupdateType/com_sun_tools_visualvm_core_update_center.instance=VisualVM 2.0 \u30d7\u30e9\u30b0\u30a4\u30f3\u30bb\u30f3\u30bf\u30fc Menu/Applications=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3(&A) Toolbars/Snapshot=\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8(&S) Toolbars/DataSource=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9(&D) diff --git a/l10n/src/zh_CN/visualvm/com-sun-tools-visualvm-core/com-sun-tools-visualvm-core/com/sun/tools/visualvm/core/Bundle_zh_CN.properties b/l10n/src/zh_CN/visualvm/com-sun-tools-visualvm-core/com-sun-tools-visualvm-core/com/sun/tools/visualvm/core/Bundle_zh_CN.properties index 19cc7b7806..c56900edba 100644 --- a/l10n/src/zh_CN/visualvm/com-sun-tools-visualvm-core/com-sun-tools-visualvm-core/com/sun/tools/visualvm/core/Bundle_zh_CN.properties +++ b/l10n/src/zh_CN/visualvm/com-sun-tools-visualvm-core/com-sun-tools-visualvm-core/com/sun/tools/visualvm/core/Bundle_zh_CN.properties @@ -26,8 +26,8 @@ OpenIDE-Module-Display-Category=\u57fa\u7840\u7ed3\u6784 OpenIDE-Module-Name=VisualVM-Core OpenIDE-Module-Short-Description=VisualVM \u4e3b\u6a21\u5757 -com_sun_tools_visualvm_core_update_center=https://visualvm.github.io/uc/dev/updates.xml.gz?{$netbeans.hash.code} -Services/AutoupdateType/com_sun_tools_visualvm_core_update_center.instance=VisualVM \u63d2\u4ef6\u4e2d\u5fc3 +com_sun_tools_visualvm_core_update_center=https://visualvm.github.io/uc/release20/updates.xml.gz?{$netbeans.hash.code} +Services/AutoupdateType/com_sun_tools_visualvm_core_update_center.instance=VisualVM 2.0 \u63d2\u4ef6\u4e2d\u5fc3 Menu/Applications=\u5e94\u7528\u7a0b\u5e8f(&A) Toolbars/Snapshot=\u5feb\u7167(&S) Toolbars/DataSource=\u6570\u636e\u6e90(&D) diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java index 4a7cbba75e..1a765d8551 100644 --- a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java +++ b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java @@ -52,7 +52,7 @@ public final class AboutAction extends AbstractAction { private final static Logger LOGGER = Logger.getLogger(AboutAction.class.getName()); - private String versionString = "Dev"; // Use "Dev" for development builds // NOI18N + private String versionString = "2.0"; // Use "Dev" for development builds // NOI18N public AboutAction() { diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/Bundle.properties b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/Bundle.properties index 3887fcdb8b..83c512f8ad 100644 --- a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/Bundle.properties +++ b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/Bundle.properties @@ -31,7 +31,7 @@ OpenIDE-Module-Short-Description=UI customizations for VisualVM LBL_About_VisualVM=About VisualVM -LBL_Version_Build=Version: {0} (Build {1}) +LBL_Version_Build=Version: {0} MSG_License=VisualVM has been licensed under the GNU General Public License (GPL) Version 2 with Classpath Exception. diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/image.png b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/image.png index cf6fb3f90c..3d9205dee1 100644 Binary files a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/image.png and b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/about/image.png differ diff --git a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/resources/welcome-topright.png b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/resources/welcome-topright.png index 4b54f6398f..4a29f4990f 100644 Binary files a/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/resources/welcome-topright.png and b/visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/resources/welcome-topright.png differ diff --git a/visualvm/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/visualvm/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 0e047b58a2..efbe677857 100644 --- a/visualvm/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/visualvm/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -22,7 +22,7 @@ # or visit www.oracle.com if you need additional information or have any # questions. -currentVersion=VisualVM {0} +currentVersion=VisualVM 2.0 LBL_splash_window_title=Starting VisualVM SPLASH_HEIGHT=310 SPLASH_WIDTH=530 diff --git a/visualvm/branding/core/core.jar/org/netbeans/core/startup/splash.gif b/visualvm/branding/core/core.jar/org/netbeans/core/startup/splash.gif index cf6fb3f90c..3d9205dee1 100644 Binary files a/visualvm/branding/core/core.jar/org/netbeans/core/startup/splash.gif and b/visualvm/branding/core/core.jar/org/netbeans/core/startup/splash.gif differ diff --git a/visualvm/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/visualvm/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index ef3733a42f..d1ac9ad853 100644 --- a/visualvm/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/visualvm/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -22,5 +22,5 @@ # or visit www.oracle.com if you need additional information or have any # questions. -CTL_MainWindow_Title=VisualVM {0} -CTL_MainWindow_Title_No_Project=VisualVM {0} +CTL_MainWindow_Title=VisualVM 2.0 +CTL_MainWindow_Title_No_Project=VisualVM 2.0 diff --git a/visualvm/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties b/visualvm/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties index 820a931f94..cb7359a8de 100644 --- a/visualvm/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties +++ b/visualvm/branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties @@ -22,4 +22,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. -LBL_ProductInformation=VisualVM +LBL_ProductInformation=VisualVM 2.0 diff --git a/visualvm/core/src/org/graalvm/visualvm/core/boot/Bundle.properties b/visualvm/core/src/org/graalvm/visualvm/core/boot/Bundle.properties index 146d6980d2..385c8ed998 100644 --- a/visualvm/core/src/org/graalvm/visualvm/core/boot/Bundle.properties +++ b/visualvm/core/src/org/graalvm/visualvm/core/boot/Bundle.properties @@ -26,8 +26,8 @@ OpenIDE-Module-Display-Category=Infrastructure OpenIDE-Module-Name=VisualVM-Core OpenIDE-Module-Short-Description=VisualVM main module -com_sun_tools_visualvm_core_update_center=https://visualvm.github.io/uc/dev/updates.xml.gz?{$netbeans.hash.code} -Services/AutoupdateType/com_sun_tools_visualvm_core_update_center.instance=VisualVM Plugins Center +com_sun_tools_visualvm_core_update_center=https://visualvm.github.io/uc/release20/updates.xml.gz?{$netbeans.hash.code} +Services/AutoupdateType/com_sun_tools_visualvm_core_update_center.instance=VisualVM 2.0 Plugins Center Menu/Applications=&Applications Toolbars/Snapshot=&Snapshot Toolbars/DataSource=&Data Source diff --git a/visualvm/launcher/visualvm.conf b/visualvm/launcher/visualvm.conf index f70fc31846..ad1161b8d5 100644 --- a/visualvm/launcher/visualvm.conf +++ b/visualvm/launcher/visualvm.conf @@ -51,14 +51,14 @@ # Cachedir must be different from userdir. The same cachedir and userdir # would cause problems. # -visualvm_default_userdir="${DEFAULT_USERDIR_ROOT}/dev" -visualvm_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev" +visualvm_default_userdir="${DEFAULT_USERDIR_ROOT}/2.0" +visualvm_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/2.0" # Options used by VisualVM launcher by default: # (can be overridden by explicit command line switches) # -visualvm_default_options="-J-client -J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions -J-Dnetbeans.logger.console=true -J-ea" +visualvm_default_options="-J-client -J-Xms24m -J-Xmx768m -J-Dnetbeans.accept_license_class=org.graalvm.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J-Dpolyglot.js.nashorn-compat=true -J-Dsun.misc.URLClassPath.disableJarChecking=true -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions" # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea # Default location of JDK: diff --git a/visualvm/launcher/visualvm.exe b/visualvm/launcher/visualvm.exe index 2819573885..82d3c56320 100644 Binary files a/visualvm/launcher/visualvm.exe and b/visualvm/launcher/visualvm.exe differ diff --git a/visualvm/launcher/windows-src/nbproject/project.xml b/visualvm/launcher/windows-src/nbproject/project.xml index 57e148fbb6..038d2e0815 100644 --- a/visualvm/launcher/windows-src/nbproject/project.xml +++ b/visualvm/launcher/windows-src/nbproject/project.xml @@ -3,7 +3,7 @@ org.netbeans.modules.cnd.makeproject - VisualVM Launcher Win + VisualVM 2.0 Launcher Win 0 cpp diff --git a/visualvm/launcher/windows-src/version.h b/visualvm/launcher/windows-src/version.h index 23dcc58fb6..c69a11d954 100644 --- a/visualvm/launcher/windows-src/version.h +++ b/visualvm/launcher/windows-src/version.h @@ -25,11 +25,11 @@ #define COMPANY "Oracle Corporation" #define COMPONENT "VisualVM" -#define VER "0.0.0.0" -#define FVER 0,0,0,0 -#define BUILD_ID "0" +#define VER "2.0.0.0" +#define FVER 2,0,0,0 +#define BUILD_ID "28012020" #define INTERNAL_NAME "visualvm" -#define COPYRIGHT "\xA9 2007, 2014, Oracle and/or its affiliates. All rights reserved." +#define COPYRIGHT "\xA9 2007, 2020, Oracle and/or its affiliates. All rights reserved." #define FNAME "visualvm.exe" -#define NAME "VisualVM Dev. build" +#define NAME "VisualVM" diff --git a/visualvm/launcher/windows-src/visualvm.exe.manifest b/visualvm/launcher/windows-src/visualvm.exe.manifest index 326dd63289..be79ac4509 100644 --- a/visualvm/launcher/windows-src/visualvm.exe.manifest +++ b/visualvm/launcher/windows-src/visualvm.exe.manifest @@ -1,6 +1,6 @@ - diff --git a/visualvm/nbproject/project.properties b/visualvm/nbproject/project.properties index b7a7248ffc..e3d5466e1a 100644 --- a/visualvm/nbproject/project.properties +++ b/visualvm/nbproject/project.properties @@ -1,6 +1,6 @@ app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif app.name=${branding.token} -app.title=VisualVM +app.title=VisualVM 2.0 modules=\ ${project.org.graalvm.visualvm.core}:\ ${project.org.graalvm.visualvm.modules.appui}:\