/hg/icedtea7: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 24dbf739e406 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=24dbf739e406
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Nov 29 04:18:45 2012 +0000

	PR1212: IcedTea7 fails to build because Resources.getText() is no longer available for code to use

	2012-11-29  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR1212
		* generated/sun/tools/jconsole/Version.java,
		Removed to avoid build breakage.
		* NEWS: Updated.


changeset 293d04f4c449 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=293d04f4c449
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Nov 29 04:20:36 2012 +0000

	PR1197, S8003120: ResourceManager.getApplicationResources() does not close InputStreams

	2012-11-29  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR1197
		* Makefile.am:
		(JDK_CHANGESET): Updated to tip.
		(JDK_SHA256SUM): Likewise.
		* NEWS: Updated.


diffstat:

 ChangeLog                                 |  15 ++++++++
 Makefile.am                               |   4 +-
 NEWS                                      |   5 ++
 generated/sun/tools/jconsole/Version.java |  55 -------------------------------
 4 files changed, 22 insertions(+), 57 deletions(-)

diffs (116 lines):

diff -r 91cb89e3e986 -r 293d04f4c449 ChangeLog
--- a/ChangeLog	Wed Nov 07 14:31:11 2012 -0500
+++ b/ChangeLog	Thu Nov 29 04:20:36 2012 +0000
@@ -1,3 +1,18 @@
+2012-11-29  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR1197
+	* Makefile.am:
+	(JDK_CHANGESET): Updated to tip.
+	(JDK_SHA256SUM): Likewise.
+	* NEWS: Updated.
+
+2012-11-29  Andrew John Hughes  <gnu_andrew at 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 at member.fsf.org>
 
 	* patches/systemtap.patch: Removed.
diff -r 91cb89e3e986 -r 293d04f4c449 Makefile.am
--- a/Makefile.am	Wed Nov 07 14:31:11 2012 -0500
+++ b/Makefile.am	Thu Nov 29 04:20:36 2012 +0000
@@ -7,14 +7,14 @@
 CORBA_CHANGESET = 1285389d6969
 JAXP_CHANGESET = 8e9679984e79
 JAXWS_CHANGESET = bbd4ecb4bbcb
-JDK_CHANGESET = e9c857dcb964
+JDK_CHANGESET = c6a90ff85ffc
 LANGTOOLS_CHANGESET = 79e875e2dca3
 OPENJDK_CHANGESET = 0fa8b0b4ca26
 
 CORBA_SHA256SUM = 880683c950e833a792d4c36059af4f8a4a50dc8fb9d773831bd9cd4578f2f2f7
 JAXP_SHA256SUM = ead7718f52579c1c096ed7e853582b2622ad7e64afbf9d360eae6af55de58377
 JAXWS_SHA256SUM = 78d4e79dc8b08bfd5940f02990e9664c296242dfcef4b5e820f93744e98e7e2d
-JDK_SHA256SUM = d47ae7848f09723302f18f40987f7419f98e0470131ed96f77377719bbe6e03e
+JDK_SHA256SUM = 014ec54f8315f4511cfb7a0bf71ef5ecd05d7ac879063fe0f50f570fba3b8981
 LANGTOOLS_SHA256SUM = 42444bf6a314d1914013b826d8137d6edf9843c14011cec5a4761289d1846a3d
 OPENJDK_SHA256SUM = acab74106ee2670962b048cd4f1b7cfbb0f55340477cd625b7cb40c6bc99036c
 
diff -r 91cb89e3e986 -r 293d04f4c449 NEWS
--- a/NEWS	Wed Nov 07 14:31:11 2012 -0500
+++ b/NEWS	Thu Nov 29 04:20:36 2012 +0000
@@ -12,6 +12,11 @@
 
 New in release 2.4 (2012-XX-XX):
 
+* Backports
+  - PR1197, S8003120: ResourceManager.getApplicationResources() does not close InputStreams
+* 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
diff -r 91cb89e3e986 -r 293d04f4c449 generated/sun/tools/jconsole/Version.java
--- 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;
-    }
-}