changeset in /hg/icedtea6: Merge to tip.

[gnu_andrew at member.fsf.org]

changeset a4c62286f1df in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4c62286f1df
description:
	Merge to tip.

diffstat:

7 files changed, 42 insertions(+), 2 deletions(-)
ChangeLog                                                 |   16 +++++++++++++
HACKING                                                   |    1 
Makefile.am                                               |    1 
Makefile.in                                               |    5 ++--
patches/icedtea-jdk-docs-target.patch                     |   16 +++++++++++++
rt/net/sourceforge/jnlp/Launcher.java                     |    2 +
rt/net/sourceforge/jnlp/services/XPersistenceService.java |    3 ++

diffs (108 lines):

diff -r 2522ce476e1a -r a4c62286f1df ChangeLog
--- a/ChangeLog	Fri Jun 27 17:04:10 2008 +0100
+++ b/ChangeLog	Sun Jun 29 17:05:06 2008 +0100
@@ -7,6 +7,22 @@ 2008-06-26  Andrew John Hughes  <gnu_and
 	* aclocal.m4,
 	* configure:
 	Regenerated.
+
+2008-06-29  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-jdk-docs-target.patch: New.
+	* Makefile.am: Apply patch.
+	* Makefile.in: Regenerate.
+	
+2008-06-27  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/net/sourceforge/jnlp/services/XPersistenceService.java: Throw a
+	FileNotFoundException if the persistence store does not exist.
+
+2008-06-27  Joshua Sumali  <jsumali at redhat.com>
+
+	* rt/net/sourceforge/jnlp/Launcher.java: Exit the application if there was
+	a LaunchException caught.
 
 2008-06-26  Joshua Sumali  <jsumali at redhat.com>
 
diff -r 2522ce476e1a -r a4c62286f1df HACKING
--- a/HACKING	Fri Jun 27 17:04:10 2008 +0100
+++ b/HACKING	Sun Jun 29 17:05:06 2008 +0100
@@ -64,6 +64,7 @@ The following patches are only applied t
 * icedtea-eclipse-hotspot-6614100-6b06.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13.
 * icedtea-gtkplaf.patch: Fix corrupted combo box (S6624717). Fixed in OpenJDK7 b27.
 * icedtea-sparc.patch: Add support for GNU/Linux on SPARC.
+* icedtea-jdk-docs-target.patch: Always set DOCS_TARGET.
 
 The following patches are only applied to OpenJDK in IcedTea:
 
diff -r 2522ce476e1a -r a4c62286f1df Makefile.am
--- a/Makefile.am	Fri Jun 27 17:04:10 2008 +0100
+++ b/Makefile.am	Sun Jun 29 17:05:06 2008 +0100
@@ -383,6 +383,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-component.patch \
 	patches/icedtea-shark-build.patch \
 	patches/icedtea-toolkit.patch \
+	patches/icedtea-jdk-docs-target.patch \
 	$(SHARK_PATCH) \
 	$(GCC_PATCH)
 
diff -r 2522ce476e1a -r a4c62286f1df Makefile.in
--- a/Makefile.in	Fri Jun 27 17:04:10 2008 +0100
+++ b/Makefile.in	Sun Jun 29 17:05:06 2008 +0100
@@ -467,8 +467,9 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
 	patches/icedtea-dnd-updatecursor.patch \
 	patches/icedtea-component.patch \
 	patches/icedtea-shark-build.patch \
-	patches/icedtea-toolkit.patch $(SHARK_PATCH) $(GCC_PATCH) \
-	$(am__append_7) $(am__append_8)
+	patches/icedtea-toolkit.patch \
+	patches/icedtea-jdk-docs-target.patch $(SHARK_PATCH) \
+	$(GCC_PATCH) $(am__append_7) $(am__append_8)
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
diff -r 2522ce476e1a -r a4c62286f1df patches/icedtea-jdk-docs-target.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-jdk-docs-target.patch	Sun Jun 29 17:05:06 2008 +0100
@@ -0,0 +1,16 @@
+--- openjdk/control/make/make/jdk-rules.gmk	2008-06-29 10:09:47.002591764 +0000
++++ openjdk/control/make/make/jdk-rules.gmk	2008-06-29 15:04:01.228901751 +0000
+@@ -36,12 +36,7 @@
+   IMAGES_TARGET = images
+ endif
+ 
+-# No DOCS build when JDK_UPDATE_VERSION set
+-ifdef JDK_UPDATE_VERSION
+-  DOCS_TARGET =
+-else
+-  DOCS_TARGET = docs
+-endif
++DOCS_TARGET = docs
+ 
+ # NO_DOCS may be set in conjunction with DEV_ONLY
+ ifdef NO_DOCS
diff -r 2522ce476e1a -r a4c62286f1df rt/net/sourceforge/jnlp/Launcher.java
--- a/rt/net/sourceforge/jnlp/Launcher.java	Fri Jun 27 17:04:10 2008 +0100
+++ b/rt/net/sourceforge/jnlp/Launcher.java	Sun Jun 29 17:05:06 2008 +0100
@@ -593,6 +593,8 @@ public class Launcher {
             }
             catch (LaunchException ex) {
                 exception = ex;
+                // Exit if we can't launch the application.
+                System.exit(0);
             }
         }
 
diff -r 2522ce476e1a -r a4c62286f1df rt/net/sourceforge/jnlp/services/XPersistenceService.java
--- a/rt/net/sourceforge/jnlp/services/XPersistenceService.java	Fri Jun 27 17:04:10 2008 +0100
+++ b/rt/net/sourceforge/jnlp/services/XPersistenceService.java	Sun Jun 29 17:05:06 2008 +0100
@@ -118,6 +118,9 @@ class XPersistenceService implements Per
         checkLocation(location);
 
         File file = toCacheFile(location);
+        if (!file.exists())
+            throw new FileNotFoundException("Persistence store for "
+              + location.toString() + " is not found.");
         file.getParentFile().mkdirs();
 
         return (FileContents) ServiceUtil.createPrivilegedProxy(FileContents.class, new XFileContents(file));