changeset 2603:24dbf739e406

PR1212: IcedTea7 fails to build because Resources.getText() is no longer available for code to use 2012-11-29 Andrew John Hughes <gnu_andrew@member.fsf.org> PR1212 * generated/sun/tools/jconsole/Version.java, Removed to avoid build breakage. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 29 Nov 2012 04:18:45 +0000
parents 91cb89e3e986
children 293d04f4c449
files ChangeLog NEWS generated/sun/tools/jconsole/Version.java
diffstat 3 files changed, 10 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Nov 07 14:31:11 2012 -0500
+++ b/ChangeLog	Thu Nov 29 04:18:45 2012 +0000
@@ -1,3 +1,10 @@
+2012-11-29  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR1212
+	* generated/sun/tools/jconsole/Version.java,
+	Removed to avoid build breakage.
+	* NEWS: Updated.
+
 2012-11-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* patches/systemtap.patch: Removed.
--- a/NEWS	Wed Nov 07 14:31:11 2012 -0500
+++ b/NEWS	Thu Nov 29 04:18:45 2012 +0000
@@ -12,6 +12,9 @@
 
 New in release 2.4 (2012-XX-XX):
 
+* Bug fixes
+  - PR1212: IcedTea7 fails to build because Resources.getText() is no longer available for code to use
+
 New in release 2.3.3 (2012-10-17):
 
 * Security fixes
--- a/generated/sun/tools/jconsole/Version.java	Wed Nov 07 14:31:11 2012 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package sun.tools.jconsole;
-
-import java.io.PrintStream;
-
-public class Version {
-    private static final String jconsole_version =
-        "1.7.0-b36";
-
-    public static void print(PrintStream ps) {
-        printFullVersion(ps);
-
-        ps.println(Resources.getText("Name and Build",
-                                     System.getProperty("java.runtime.name"),
-                                     System.getProperty("java.runtime.version")));
-
-        ps.println(Resources.getText("Name Build and Mode",
-                                     System.getProperty("java.vm.name"),
-                                     System.getProperty("java.vm.version"),
-                                     System.getProperty("java.vm.info")));
-
-    }
-
-    public static void printFullVersion(PrintStream ps) {
-        ps.println(Resources.getText("JConsole version", jconsole_version));
-    }
-
-    static String getVersion() {
-        return jconsole_version;
-    }
-}