On Wednesday 26 March 2008 05:33, juiceman at freenetproject.org wrote:
> Author: juiceman
> Date: 2008-03-26 05:33:55 +0000 (Wed, 26 Mar 2008)
> New Revision: 18793
>
> Modified:
> trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
> trunk/freenet/src/freenet/node/Node.java
> trunk/freenet/src/freenet/node/TextModeClientInterface.java
> trunk/freenet/src/freenet/pluginmanager/PluginManager.java
> Log:
> Use System.getProperty("java.version") instead of
System.getProperty("java.vm.version") to handle Sun's recent decision to
change the naming convention of the client JVM:
> C:\Documents and Settings\user>java -version
> java version "1.6.0_05"
> Java(TM) SE Runtime Environment (build 1.6.0_05-b13)
> Java HotSpot(TM) Client VM (build 10.0-b19, mixed mode, sharing)
>
> Tested with Sun JVM, needs to be tested on other vendors JVMs
>
> Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
> ===================================================================
> --- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
> 2008-03-25
19:05:32 UTC (rev 18792)
> +++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
> 2008-03-26
05:33:55 UTC (rev 18793)
> @@ -379,8 +379,8 @@
> jvmStatsList.addChild("li", l10n("threads", new String[]
{ "running", "max" },
> new String[] {
> thousendPoint.format(threadCount),
Integer.toString(stats.getThreadLimit()) }));
> jvmStatsList.addChild("li", l10n("cpus", "count",
Integer.toString(availableCpus)));
> - jvmStatsList.addChild("li", l10n("jvmVendor", "vendor",
System.getProperty("java.vm.vendor")));
> - jvmStatsList.addChild("li", l10n("jvmVersion", "version",
System.getProperty("java.vm.version")));
> + jvmStatsList.addChild("li", l10n("jvmVendor", "vendor",
System.getProperty("java.vendor")));
> + jvmStatsList.addChild("li", l10n("jvmVersion", "version",
System.getProperty("java.version")));
AFAICS there is no reason to use java.vendor rather than java.vm.vendor. Any
java VM (at least any VM which has passed the JCK test suite) will return Sun
Microsystems Inc., surely?
> jvmStatsList.addChild("li", l10n("osName", "name",
System.getProperty("os.name")));
> jvmStatsList.addChild("li", l10n("osVersion", "version",
System.getProperty("os.version")));
> jvmStatsList.addChild("li", l10n("osArch", "arch",
System.getProperty("os.arch")));
>
> Modified: trunk/freenet/src/freenet/node/Node.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/Node.java 2008-03-25 19:05:32 UTC (rev
18792)
> +++ trunk/freenet/src/freenet/node/Node.java 2008-03-26 05:33:55 UTC (rev
18793)
> @@ -599,7 +599,7 @@
> Node(PersistentConfig config, RandomSource random,
> LoggingConfigHandler
lc, NodeStarter ns, Executor executor) throws NodeInitException {
> // Easy stuff
> logMINOR = Logger.shouldLog(Logger.MINOR, this);
> - String tmp = "Initializing Node using Freenet Build
#"+Version.buildNumber()+" r"+Version.cvsRevision+" and freenet-ext Build
#"+NodeStarter.extBuildNumber+" r"+NodeStarter.extRevisionNumber+"
with "+System.getProperty("java.vm.vendor")+" JVM
version "+System.getProperty("java.vm.version")+" running
on "+System.getProperty("os.arch")+' '+System.getProperty("os.name")+'
'+System.getProperty("os.version");
> + String tmp = "Initializing Node using Freenet Build
#"+Version.buildNumber()+" r"+Version.cvsRevision+" and freenet-ext Build
#"+NodeStarter.extBuildNumber+" r"+NodeStarter.extRevisionNumber+"
with "+System.getProperty("java.vendor")+" JVM
version "+System.getProperty("java.version")+" running
on "+System.getProperty("os.arch")+' '+System.getProperty("os.name")+'
'+System.getProperty("os.version");
> Logger.normal(this, tmp);
> System.out.println(tmp);
> collector = new IOStatisticCollector();
> @@ -1760,8 +1760,8 @@
> // Now check whether we are likely to get the EvilJVMBug.
> // If we are running a Sun or Blackdown JVM, on Linux, and
LD_ASSUME_KERNEL is not set, then we are.
>
> - String jvmVendor = System.getProperty("java.vm.vendor");
> - String jvmVersion = System.getProperty("java.vm.version");
> + String jvmVendor = System.getProperty("java.vendor");
I doubt very much that java.vendor would be "Free Software Foundation" for
GCJ. java.vm.vendor would be, of course... so you've just broken a load of
sun-jvm-detection code. No???
> + String jvmVersion = System.getProperty("java.version");
> String osName = System.getProperty("os.name");
> String osVersion = System.getProperty("os.version");
>
> @@ -1810,12 +1810,12 @@
> L10n.addL10nSubstitution(n,
> "Node.buggyJVMWithLink",
> new String[] {
> "link", "/link", "version" },
> new String[] {
> "<a
href=\"/?_CHECKED_HTTP_=http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4855795\";>",
> - "</a>",
HTMLEncoder.encode(System.getProperty("java.vm.version")) });
> + "</a>",
> HTMLEncoder.encode(System.getProperty("java.version")) });
> return n;
> }
>
> public String getText() {
> - return l10n("buggyJVM",
> "version",
System.getProperty("java.vm.version"));
> + return l10n("buggyJVM",
> "version",
System.getProperty("java.version"));
> }
>
> public String getTitle() {
> @@ -1834,7 +1834,7 @@
> } else {
> if(jvmVendor.startsWith("Free Software Foundation")) {
> try {
> - jvmVersion =
> System.getProperty("java.vm.version").split(" ")
[0].replaceAll("[.]","");
> + jvmVersion =
> System.getProperty("java.version").split(" ")
[0].replaceAll("[.]","");
This is correct on the other hand.
> int jvmVersionInt =
> Integer.parseInt(jvmVersion);
>
> if(jvmVersionInt <= 422 &&
> jvmVersionInt >= 100) // make sure that no
bogus values cause true
>
> Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
> ===================================================================
> --- trunk/freenet/src/freenet/node/TextModeClientInterface.java
> 2008-03-25
19:05:32 UTC (rev 18792)
> +++ trunk/freenet/src/freenet/node/TextModeClientInterface.java
> 2008-03-26
05:33:55 UTC (rev 18793)
> @@ -425,8 +425,8 @@
> sb.append("Maximum Java memory:\u00a0" +
> SizeUtil.formatSize(maxJavaMem,
true)+"\r\n");
> sb.append("Running threads:\u00a0" +
thousendPoint.format(threadCount)+"\r\n");
> sb.append("Available CPUs:\u00a0" + availableCpus+"\r\n");
> - sb.append("JVM Vendor:\u00a0" +
System.getProperty("java.vm.vendor")+"\r\n");
> - sb.append("JVM Version:\u00a0" +
System.getProperty("java.vm.version")+"\r\n");
> + sb.append("JVM Vendor:\u00a0" +
System.getProperty("java.vendor")+"\r\n");
> + sb.append("JVM Version:\u00a0" +
System.getProperty("java.version")+"\r\n");
> sb.append("OS Name:\u00a0" +
> System.getProperty("os.name")+"\r\n");
> sb.append("OS Version:\u00a0" +
> System.getProperty("os.version")+"\r\n");
> sb.append("OS Architecture:\u00a0" +
System.getProperty("os.arch")+"\r\n");
>
> Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
> ===================================================================
> --- trunk/freenet/src/freenet/pluginmanager/PluginManager.java
> 2008-03-25
19:05:32 UTC (rev 18792)
> +++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java
> 2008-03-26
05:33:55 UTC (rev 18793)
> @@ -163,7 +163,7 @@
> Logger.error(this, "Could not load
> plugin " + filename + " : " + e,
e);
> System.err.println("Could not load
> plugin " + filename + " : " + e);
> e.printStackTrace();
> - String jvmVersion =
> System.getProperty("java.vm.version");
> + String jvmVersion =
> System.getProperty("java.version");
> if (jvmVersion.startsWith("1.4.") ||
> jvmVersion.equals("1.4")) {
> System.err.println("Plugin " +
> filename + " appears to require a
later JVM");
> Logger.error(this, "Plugin " +
> filename + " appears to require a
later JVM");
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL:
<https://emu.freenetproject.org/pipermail/cvs/attachments/20080328/0c4c83c4/attachment.pgp>
