Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 56405 invoked from network); 3 Jul 2006 05:45:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Jul 2006 05:45:55 -0000 Received: (qmail 96662 invoked by uid 500); 3 Jul 2006 05:45:54 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 96638 invoked by uid 500); 3 Jul 2006 05:45:54 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 96627 invoked by uid 99); 3 Jul 2006 05:45:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jul 2006 22:45:54 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jul 2006 22:45:53 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9A5401A983A; Sun, 2 Jul 2006 22:45:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r418687 - /db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java Date: Mon, 03 Jul 2006 05:45:33 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060703054533.9A5401A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: kahatlen Date: Sun Jul 2 22:45:32 2006 New Revision: 418687 URL: http://svn.apache.org/viewvc?rev=418687&view=rev Log: DERBY-1427: sysinfo does not write Java SE and JDBC version when running under JDK 1.6 Make sysinfo print "JRE - JDBC: Java SE 6 - JDBC 4.0" when running under JVM version 1.6. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java?rev=418687&r1=418686&r2=418687&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java Sun Jul 2 22:45:32 2006 @@ -42,7 +42,7 @@ public static final int J2SE_14 = 4; public static final int J2SE_142 = 5; public static final int J2SE_15 = 6; // aka J2SE 5.0 - public static final int J2SE_16 = 7; + public static final int J2SE_16 = 7; // Java SE 6, not J2SE public static final boolean J2ME; @@ -165,6 +165,7 @@ case J2SE_14: return "J2SE 1.4 - JDBC 3.0"; case J2SE_142: return "J2SE 1.4.2 - JDBC 3.0"; case J2SE_15: return "J2SE 5.0 - JDBC 3.0"; + case J2SE_16: return "Java SE 6 - JDBC 4.0"; default: return "?-?"; } }