From andrew at icedtea.classpath.org Tue Apr 1 01:59:54 2014 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 01 Apr 2014 01:59:54 +0000 Subject: /hg/icedtea: 6 new changesets Message-ID: changeset 80e121d36c8b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=80e121d36c8b author: Andrew John Hughes date: Fri Sep 30 04:25:29 2011 +0100 Use IcedTea server for CACAO downloads, as with 6. 2010-11-19 Andrew John Hughes * Makefile.am: (CACAO_BASE_URL): Switch to using IcedTea server for CACAO drops too. (CACAO_URL): Likewise. changeset 0d3e101af018 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0d3e101af018 author: Andrew John Hughes date: Tue Apr 01 01:36:29 2014 +0100 CACAO: Updated to 2011-08-08 revision. 2011-08-09 Xerxes R?nby CACAO - CA159: Exception handler blocks / register mixup. - Set thread to RUNNABLE during Thread.start. - Removed state-setting function call that would be done by the thread itself, creating a nasty race. * Makefile.am (CACAO_VERSION): Updated CACAO to 2011-08-08 revision. (CACAO_SHA256SUM): Updated. changeset 138d6c171019 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=138d6c171019 author: Xerxes Ranby date: Tue Aug 30 12:30:04 2011 +0200 CACAO: CA149: Used wrong class loader, Updated to 2011-08-29 revision. 2011-08-30 Xerxes Ranby CACAO - CA149: Used wrong class loader. - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): [OPENJDK] stack index of caller was off by one, causing many apt (Annotation Processing Tool) failures. * NEWS: Updated. * Makefile.am (CACAO_VERSION): Updated CACAO to 2011-08-29 revision. (CACAO_SHA256SUM): Updated. changeset 95ec73579840 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=95ec73579840 author: Xerxes Ranby date: Tue Apr 01 01:50:23 2014 +0100 CACAO support for OpenJDK7 2012-02-10 Xerxes Ranby * Makefile.am (CACAO_VERSION): Updated CACAO to 2012-02-09 revision. (CACAO_SHA256SUM): Updated. (stamps/cacao.stamp): Use --with-java-runtime-library=openjdk7. Add -f when creating client and server symlinks to handle repeat builds. Link the fake libjsig.so to CACAO libjvm.so, and touch fake Xusage.txt to work with latest OpenJDK ALT_HOTSPOT_IMPORT_PATH functionality. * patches/cacao/version.patch: Removed, replaced by upstream CACAO changeset 30edcde287d9. changeset c0e1199f441b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c0e1199f441b author: Andrew John Hughes date: Tue Apr 01 01:51:51 2014 +0100 Update CACAO to latest tip. 2013-04-24 Andrew John Hughes * patches/cacao/jsig.patch: Removed. * Makefile.am: (CACAO_VERSION): Bump to current tip. (CACAO_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Drop unneeded jsig patch. changeset 4acb21372190 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4acb21372190 author: Andrew John Hughes date: Tue Apr 01 01:58:21 2014 +0100 Actually delete file removed in 1128225eff23 diffstat: ChangeLog | 49 ++++++++++++++++++++++++++++++++++++ Makefile.am | 16 +++++----- patches/cacao/arm-arch-defines.patch | 18 ------------- patches/cacao/jsig.patch | 18 ------------- patches/cacao/version.patch | 21 --------------- 5 files changed, 57 insertions(+), 65 deletions(-) diffs (171 lines): diff -r 102993442e37 -r 4acb21372190 ChangeLog --- a/ChangeLog Mon Mar 24 17:19:19 2014 -0400 +++ b/ChangeLog Tue Apr 01 01:58:21 2014 +0100 @@ -1,3 +1,52 @@ +2013-04-24 Andrew John Hughes + + * patches/cacao/jsig.patch: + Removed. + * Makefile.am: + (CACAO_VERSION): Bump to current tip. + (CACAO_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Drop unneeded jsig patch. + +2012-02-10 Xerxes R??nby + + * Makefile.am + (CACAO_VERSION): Updated CACAO to 2012-02-09 revision. + (CACAO_SHA256SUM): Updated. + (stamps/cacao.stamp): Use --with-java-runtime-library=openjdk7. + Add -f when creating client and server symlinks to handle repeat builds. + Link the fake libjsig.so to CACAO libjvm.so, and touch fake Xusage.txt + to work with latest OpenJDK ALT_HOTSPOT_IMPORT_PATH functionality. + * patches/cacao/version.patch: Removed, replaced by upstream CACAO changeset 30edcde287d9. + +2011-08-30 Xerxes R??nby + + CACAO + - CA149: Used wrong class loader. + - src/vm/javaobjects.cpp (java_lang_reflect_Method::invoke): + [OPENJDK] stack index of caller was off by one, causing many apt + (Annotation Processing Tool) failures. + * Makefile.am + (CACAO_VERSION): Updated CACAO to 2011-08-29 revision. + (CACAO_SHA256SUM): Updated. + +2011-08-09 Xerxes R??nby + + CACAO + - CA159: Exception handler blocks / register mixup. + - Set thread to RUNNABLE during Thread.start. + - Removed state-setting function call that would be done by the thread + itself, creating a nasty race. + * Makefile.am + (CACAO_VERSION): Updated CACAO to 2011-08-08 revision. + (CACAO_SHA256SUM): Updated. + +2010-11-19 Andrew John Hughes + + * Makefile.am: + (CACAO_BASE_URL): Switch to using IcedTea + server for CACAO drops too. + (CACAO_URL): Likewise. + 2014-03-24 Pavel Tisnovsky * contrib/jck/compile-native-code.sh: diff -r 102993442e37 -r 4acb21372190 Makefile.am --- a/Makefile.am Mon Mar 24 17:19:19 2014 -0400 +++ b/Makefile.am Tue Apr 01 01:58:21 2014 +0100 @@ -20,10 +20,10 @@ HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" HS_URL = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" -CACAO_VERSION = d6264eb66506 -CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c -CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive -CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 +CACAO_VERSION = e215e36be9fc +CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab +CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao +CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 JAMVM_VERSION = ec18fb9e49e62dce16c5094ef1527eed619463aa @@ -229,8 +229,6 @@ if BUILD_CACAO ICEDTEA_PATCHES += \ patches/cacao/launcher.patch \ - patches/cacao/version.patch \ - patches/cacao/jsig.patch \ patches/cacao/6714758.patch \ patches/cacao/memory.patch endif @@ -1785,14 +1783,16 @@ --build=$(build_alias) \ --target=$(target_alias) \ --prefix=$(abs_top_builddir)/cacao/install \ - --with-java-runtime-library=openjdk \ + --with-java-runtime-library=openjdk7 \ --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ --with-java-runtime-library-classes=$(RUNTIME) \ --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \ $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install mkdir -p $(abs_top_builddir)/cacao/install/lib touch $(abs_top_builddir)/cacao/install/hotspot/lib/sa-jdi.jar - ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client + ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client + touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt + ln -sf client/libjvm.so $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so endif endif mkdir -p stamps diff -r 102993442e37 -r 4acb21372190 patches/cacao/arm-arch-defines.patch --- a/patches/cacao/arm-arch-defines.patch Mon Mar 24 17:19:19 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -diff -Nru cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h ---- cacao.orig/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao/src/mm/boehm-gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h 2010-06-21 18:35:53.000000000 +0100 -@@ -33,7 +33,13 @@ - - /* NEC LE-IT: gcc has no way to easily check the arm architecture - * but defines only one of __ARM_ARCH_x__ to be true */ --#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_7__) -+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ -+ || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \ -+ || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \ -+ || defined(__ARM_ARCH_6M__) \ -+ || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ -+ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) -+ - AO_INLINE void - AO_nop_full() - { diff -r 102993442e37 -r 4acb21372190 patches/cacao/jsig.patch --- a/patches/cacao/jsig.patch Mon Mar 24 17:19:19 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -diff -Nru cacao.orig/Makefile.am cacao/Makefile.am ---- cacao.orig/cacao/src/cacao/Makefile.am 2008-08-04 17:51:28.000000000 +0100 -+++ cacao/cacao/src/cacao/Makefile.am 2010-05-11 10:29:35.000000000 +0100 -@@ -96,12 +96,12 @@ - $(mkdir_p) $(prefix)/jre/lib/$(JAVA_ARCH)/server - $(LN_S) -f $(libdir)/libjvm.so $(prefix)/jre/lib/$(JAVA_ARCH)/server - $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt -- $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so -+ $(ECHO) $(ECHO_N) > $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so - - uninstall-local: - rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjvm.so - rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/Xusage.txt -- rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/server/libjsig.so -+ rm -f $(prefix)/jre/lib/$(JAVA_ARCH)/libjsig.so - endif - - diff -r 102993442e37 -r 4acb21372190 patches/cacao/version.patch --- a/patches/cacao/version.patch Mon Mar 24 17:19:19 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -diff -Nru cacao.orig2/cacao/src/vm/global.h cacao2/cacao/src/vm/global.h ---- cacao.orig/cacao/src/vm/global.h 2009-08-05 01:12:02.000000000 +0100 -+++ cacao/cacao/src/vm/global.h 2009-08-05 01:51:01.000000000 +0100 -@@ -132,14 +132,14 @@ - - /* some Java related defines **************************************************/ - --#define JAVA_VERSION "1.5.0" /* this version is supported by CACAO */ --#define CLASS_VERSION "50.0" -+#define JAVA_VERSION "1.7.0" /* this version is supported by CACAO */ -+#define CLASS_VERSION "51.0" - - - /* Java class file constants **************************************************/ - - #define MAGIC 0xCAFEBABE --#define MAJOR_VERSION 50 -+#define MAJOR_VERSION 51 - #define MINOR_VERSION 0 - - From jvanek at icedtea.classpath.org Tue Apr 1 09:20:41 2014 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 01 Apr 2014 09:20:41 +0000 Subject: /hg/icedtea-web: Restricted CodebaseMatcher to not match aaexamp... Message-ID: changeset 70d23452ac83 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=70d23452ac83 author: Jiri Vanek date: Tue Apr 01 11:20:26 2014 +0200 Restricted CodebaseMatcher to not match aaexample.com by *.example.com expression but still match example.com - as in specification. diffstat: ChangeLog | 12 +++ netx/net/sourceforge/jnlp/util/ClasspathMatcher.java | 18 ++++- tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java | 31 +++++++++- 3 files changed, 54 insertions(+), 7 deletions(-) diffs (96 lines): diff -r dc0a77856cb4 -r 70d23452ac83 ChangeLog --- a/ChangeLog Mon Mar 31 13:27:48 2014 -0400 +++ b/ChangeLog Tue Apr 01 11:20:26 2014 +0200 @@ -1,3 +1,15 @@ +2013-04-01 Jiri Vanek + + Restricted CodebaseMatcher to not match aaexample.com by *.example.com expression + but still match example.com - as in specification. + * netx/net/sourceforge/jnlp/util/ClasspathMatcher.java: (domainToRegEx) consists + of original regex connected by or with second one in case of *. start. + (sourceToRegExString) part of the logic extracted to quote method. + * tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java: + (matchTest5) adapted. (wildCardSubdomainDoesNotMatchParentDomainPaths) new test, + focusing on aaexample.com/example.com/aaa.example.com in *.example.com both + path and domain. + 2013-03-31 Omair Majid * netx/net/sourceforge/jnlp/resources/Messages.properties diff -r dc0a77856cb4 -r 70d23452ac83 netx/net/sourceforge/jnlp/util/ClasspathMatcher.java --- a/netx/net/sourceforge/jnlp/util/ClasspathMatcher.java Mon Mar 31 13:27:48 2014 -0400 +++ b/netx/net/sourceforge/jnlp/util/ClasspathMatcher.java Tue Apr 01 11:20:26 2014 +0200 @@ -146,12 +146,16 @@ } private static Pattern domainToRegEx(String domain) { - // Although I have conisdered the "dot" as bug in specification, - // to many applications are depnding on it - while (domain.startsWith("*.")) { - domain = "*" + domain.substring(2); + String pre = ""; + String post = ""; + if (domain.startsWith("*.")) { + //this is handling case, when *.abc.xy + //should match also abc.xy except whatever.abc.xz + //but NOT whatewerabc.xy + pre = "(" + quote(domain.substring(2)) + ")|("; + post = ")"; } - return ClasspathMatcher.sourceToRegEx(domain); + return Pattern.compile(pre + ClasspathMatcher.sourceToRegExString(domain) + post); } } @@ -316,6 +320,10 @@ if (s.equals("*")) { return ".*"; } + return quote(s); + } + + private static String quote(String s) { /* * coment for lazybones: * \Q is start of citation diff -r dc0a77856cb4 -r 70d23452ac83 tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java Mon Mar 31 13:27:48 2014 -0400 +++ b/tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java Tue Apr 01 11:20:26 2014 +0200 @@ -427,8 +427,35 @@ Assert.assertFalse(p.match(urls[17])); //reasons for alowing "dot" issue Assert.assertTrue(p.match(new URL("http://www.example.com"))); - Assert.assertTrue(p.match(new URL("http://example.com"))); //yah, this is really nasty - //still the DOT issue is an BUG + Assert.assertTrue(p.match(new URL("http://example.com"))); + //reason for restricting dost issue + Assert.assertFalse(p.match(new URL("http://aaaexample.com"))); + } + + @Test + public void wildCardSubdomainDoesNotMatchParentDomainPaths() throws MalformedURLException { + ClasspathMatchers p1 = ClasspathMatchers.compile("*.example.com*/*.abc.cde*", true); + Assert.assertFalse(p1.matches(new URL("http://aaaexample.com/xyz.abc.cde"))); + + Assert.assertTrue(p1.matches(new URL("http://www.example.com/.abc.cde"))); + Assert.assertTrue(p1.matches(new URL("http://www.example.com/xyz.abc.cde"))); + Assert.assertFalse(p1.matches(new URL("http://www.example.com/abc.cde"))); + Assert.assertTrue(p1.matches(new URL("http://example.com/xyz.abc.cdeefg"))); + Assert.assertTrue(p1.matches(new URL("http://example.com/xyz.abc.cde.efg"))); + Assert.assertFalse(p1.matches(new URL("http://example.com/abc.cde.efg"))); + Assert.assertFalse(p1.matches(new URL("http://example.com"))); + + + ClasspathMatchers p = ClasspathMatchers.compile("*.example.com*/*.abc.cde*", false); + Assert.assertFalse(p.matches(new URL("http://aaaexample.com/xyz.abc.cde"))); + + Assert.assertTrue(p.matches(new URL("http://www.example.com/.abc.cde"))); + Assert.assertTrue(p.matches(new URL("http://www.example.com/xyz.abc.cde"))); + Assert.assertTrue(p.matches(new URL("http://www.example.com/abc.cde"))); + Assert.assertTrue(p.matches(new URL("http://example.com/xyz.abc.cdeefg"))); + Assert.assertTrue(p.matches(new URL("http://example.com/xyz.abc.cde.efg"))); + Assert.assertTrue(p.matches(new URL("http://example.com/abc.cde.efg"))); + Assert.assertTrue(p.matches(new URL("http://example.com"))); } @Test From jvanek at icedtea.classpath.org Tue Apr 1 09:28:03 2014 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 01 Apr 2014 09:28:03 +0000 Subject: /hg/icedtea-web: Manual quotation in ClasspathMatcher regex repl... Message-ID: changeset d84effce2642 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d84effce2642 author: Jiri Vanek date: Tue Apr 01 11:27:53 2014 +0200 Manual quotation in ClasspathMatcher regex replaced by Pattern.quote diffstat: ChangeLog | 6 ++++++ netx/net/sourceforge/jnlp/util/ClasspathMatcher.java | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diffs (45 lines): diff -r 70d23452ac83 -r d84effce2642 ChangeLog --- a/ChangeLog Tue Apr 01 11:20:26 2014 +0200 +++ b/ChangeLog Tue Apr 01 11:27:53 2014 +0200 @@ -1,3 +1,9 @@ +2013-04-01 Jiri Vanek + + Manual quotation in ClasspathMatcher regex replaced by Pattern.quote + * netx/net/sourceforge/jnlp/util/ClasspathMatcher.java: (quote) + is now using Pattern.quote instead manual \Q + original + \E + 2013-04-01 Jiri Vanek Restricted CodebaseMatcher to not match aaexample.com by *.example.com expression diff -r 70d23452ac83 -r d84effce2642 netx/net/sourceforge/jnlp/util/ClasspathMatcher.java --- a/netx/net/sourceforge/jnlp/util/ClasspathMatcher.java Tue Apr 01 11:20:26 2014 +0200 +++ b/netx/net/sourceforge/jnlp/util/ClasspathMatcher.java Tue Apr 01 11:27:53 2014 +0200 @@ -326,22 +326,21 @@ private static String quote(String s) { /* * coment for lazybones: - * \Q is start of citation - * \E is end of citation - * - all characters in citation are threated as are without any special meaning + * Pattern.quote - all characters in citation are threated as are without any special meaning + * Citation is based on \Q and \E marks wwith escapped inner \Q and \E * ^ is start of th e line * $ is end of the line */ if (s.startsWith("*") && s.endsWith("*")) { - return "^.*\\Q" + s.substring(1, s.length() - 1) + "\\E.*$"; + return "^.*" + Pattern.quote(s.substring(1, s.length() - 1)) + ".*$"; } else if (s.endsWith("*")) { - return "^\\Q" + s.substring(0, s.length() - 1) + "\\E.*$"; + return "^" + Pattern.quote(s.substring(0, s.length() - 1)) + ".*$"; } else if (s.startsWith("*")) { - return "^.*\\Q" + s.substring(1) + "\\E$"; + return "^.*" + Pattern.quote(s.substring(1)) + "$"; } else { - return "^\\Q" + s + "\\E$"; + return "^" + Pattern.quote(s) + "$"; } } From jvanek at icedtea.classpath.org Tue Apr 1 09:34:25 2014 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 01 Apr 2014 09:34:25 +0000 Subject: /hg/icedtea-web: Messages_cs.properties adapted to match newest ... Message-ID: changeset 2670820a9609 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2670820a9609 author: Jiri Vanek date: Tue Apr 01 11:34:16 2014 +0200 Messages_cs.properties adapted to match newest state diffstat: ChangeLog | 6 +++ netx/net/sourceforge/jnlp/resources/Messages_cs.properties | 27 ++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) diffs (53 lines): diff -r d84effce2642 -r 2670820a9609 ChangeLog --- a/ChangeLog Tue Apr 01 11:27:53 2014 +0200 +++ b/ChangeLog Tue Apr 01 11:34:16 2014 +0200 @@ -1,3 +1,9 @@ +2013-04-01 Jiri Vanek + + * netx/net/sourceforge/jnlp/resources/Messages_cs.properties: adapted to match newest state. + (MissingPermissionsMainTitle) (MissingPermissionsInfo) (ALACAMissingMainTitle) (ALACAMissingInfo) + (ALACAMatchingMainTitle) (ALACAMatchingInfo) removed codebase word, used text in all hrefs. + 2013-04-01 Jiri Vanek Manual quotation in ClasspathMatcher regex replaced by Pattern.quote diff -r d84effce2642 -r 2670820a9609 netx/net/sourceforge/jnlp/resources/Messages_cs.properties --- a/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Tue Apr 01 11:27:53 2014 +0200 +++ b/netx/net/sourceforge/jnlp/resources/Messages_cs.properties Tue Apr 01 11:34:16 2014 +0200 @@ -51,15 +51,30 @@ AboutDialogueTabGPLv2=GPLv2 # missing permissions dialogue -MissingPermissionsMainTitle=Aplikace {0} se z\u00e1kladnou k\u00f3du (codebase) {1} postr\u00e1d\u00e1 element \u201epermissions\u201c. Aplikaci bez tohoto elementu byste nem\u011bli v\u011b\u0159it. Chcete povolit b\u011bh t\u00e9to aplikace? -MissingPermissionsInfo=Chcete-li z\u00edskat v\u00edce informac\u00ed, nav\u0161tivte n\u00e1sleduj\u00edc\u00ed weby:
http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#permissions
a
http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html +MissingPermissionsMainTitle=Aplikace {0} z {1} postr\u00e1d\u00e1 atribut \u201epermissions\u201c. Aplikaci bez tohoto elementu byste nem\u011bli v\u011b\u0159it. Chcete povolit b\u011bh t\u00e9to aplikace? +MissingPermissionsInfo=Chcete-li z\u00edskat v\u00edce informac\u00ed, nav\u0161tivte n\u00e1sleduj\u00edc\u00ed weby:
\ +\ +Atributy Manifestu souboru JAR
\ + a
\ +\ +Zabr\u00e1n\u011bn\u00ed zneu\u017e\u00edv\u00e1n\u00ed aplikac\u00ed # missing Application-Library-Allowable-Codebase dialogue -ALACAMissingMainTitle=Aplikace {0} se z\u00e1kladnou k\u00f3du (codebase) {1} postr\u00e1d\u00e1 element \u201eapplication-library-allowable-codebase\u201c. Tato aplikace pou\u017e\u00edv\u00e1 zdroje z n\u00e1sleduj\u00edc\u00edho vzd\u00e1len\u00e9ho um\u00edst\u011bn\u00ed:
{2} Skute\u010dn\u011b chcete spustit tuto aplikaci? -ALACAMissingInfo=Chcete-li z\u00edskat v\u00edce informac\u00ed, nav\u0161tivte n\u00e1sleduj\u00edc\u00ed weby:
http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library
a
http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html +ALACAMissingMainTitle=Aplikace {0} z {1} postr\u00e1d\u00e1 atribut \u201eapplication-library-allowable-codebase\u201c. Tato aplikace pou\u017e\u00edv\u00e1 zdroje z n\u00e1sleduj\u00edc\u00edho vzd\u00e1len\u00e9ho um\u00edst\u011bn\u00ed:
{2} Skute\u010dn\u011b chcete spustit tuto aplikaci? +ALACAMissingInfo=Chcete-li z\u00edskat v\u00edce informac\u00ed, nav\u0161tivte n\u00e1sleduj\u00edc\u00ed weby:
\ +\ +Atributy Manifestu souboru JAR
\ + a
\ +\ +Zabr\u00e1n\u011bn\u00ed zneu\u017e\u00edv\u00e1n\u00ed aplikac\u00ed # matching Application-Library-Allowable-Codebase dialogue -ALACAMatchingMainTitle=Aplikace {0} se z\u00e1kladnou k\u00f3du (codebase) {1} vy\u017eaduje platn\u00e9 zdroje z r\u016fzn\u00fdch um\u00edst\u011bn\u00ed:
{2}
O\u010dek\u00e1v\u00e1 se na\u010dten\u00ed t\u011bchto zdroj\u016f. Souhlas\u00edte se spu\u0161t\u011bn\u00edm t\u00e9to aplikace? -ALACAMatchingInfo=Chcete-li z\u00edskat v\u00edce informac\u00ed, nav\u0161tivte n\u00e1sleduj\u00edc\u00ed weby:
http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library
a
http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html +ALACAMatchingMainTitle=Aplikace {0} z {1} vy\u017eaduje platn\u00e9 zdroje z r\u016fzn\u00fdch um\u00edst\u011bn\u00ed:
{2}
Na\u010dten\u00ed t\u011bchto zdroj\u016f se o\u010dek\u00e1v\u00e1. Souhlas\u00edte se spu\u0161t\u011bn\u00edm t\u00e9to aplikace? +ALACAMatchingInfo=Chcete-li z\u00edskat v\u00edce informac\u00ed, nav\u0161tivte n\u00e1sleduj\u00edc\u00ed weby:
\ +\ +Atributy Manifestu souboru JAR
\ + a
\ +\ +Zabr\u00e1n\u011bn\u00ed zneu\u017e\u00edv\u00e1n\u00ed aplikac\u00ed # LS - Severity LSMinor=Mal\u00e1 From jvanek at redhat.com Tue Apr 1 09:36:51 2014 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 01 Apr 2014 11:36:51 +0200 Subject: [fyi][icedtea-web] adapting cz localisation for future changes. In-Reply-To: <5339A011.2060405@redhat.com> References: <5339A011.2060405@redhat.com> Message-ID: <533A88B3.8000906@redhat.com> Looks like I have not attached the patch :-/ Alexandr, please updater your cache. J pushed: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2670820a9609 On 03/31/2014 07:04 PM, Jiri Vanek wrote: > With: > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-March/026995.html > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-March/026997.html > and > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2014-March/027000.html > > approved. > > > This is adaptation of current CZ messages. > > I will push this in short time. > > > J. From ptisnovs at icedtea.classpath.org Tue Apr 1 09:40:34 2014 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 01 Apr 2014 09:40:34 +0000 Subject: /hg/gfx-test: Eight new tests added into BitBltAffineQuadrantRot... Message-ID: changeset 026d5f07528c in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=026d5f07528c author: Pavel Tisnovsky date: Tue Apr 01 11:41:18 2014 +0200 Eight new tests added into BitBltAffineQuadrantRotateTransformOp. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java | 112 ++++++++++ 2 files changed, 117 insertions(+), 0 deletions(-) diffs (134 lines): diff -r ab61c1a09c99 -r 026d5f07528c ChangeLog --- a/ChangeLog Fri Mar 28 10:45:48 2014 +0100 +++ b/ChangeLog Tue Apr 01 11:41:18 2014 +0200 @@ -1,3 +1,8 @@ +2014-04-01 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java: + Eight new tests added into BitBltAffineQuadrantRotateTransformOp. + 2014-03-28 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r ab61c1a09c99 -r 026d5f07528c src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java --- a/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Fri Mar 28 10:45:48 2014 +0100 +++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Tue Apr 01 11:41:18 2014 +0200 @@ -1173,6 +1173,118 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, RotateTransformationNearest1Op[4]); + } + + /** + Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshort565RGBRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshort565RGB(image, graphics2d, RotateTransformationNearest1Op[5]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayRotateTransformation0Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, RotateTransformationNearest1Op[0]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayRotateTransformation1Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, RotateTransformationNearest1Op[1]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayRotateTransformation2Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, RotateTransformationNearest1Op[2]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayRotateTransformation3Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, RotateTransformationNearest1Op[3]); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayRotateTransformation4Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, RotateTransformationNearest1Op[4]); + } + + /** + Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeUshortGrayRotateTransformation5Nearest1Op(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeUshortGray(image, graphics2d, RotateTransformationNearest1Op[5]); + } + + /** * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image From ptisnovs at icedtea.classpath.org Tue Apr 1 09:43:18 2014 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 01 Apr 2014 09:43:18 +0000 Subject: /hg/rhino-tests: Added new tests testGetResourceAsStreamPositive... Message-ID: changeset e08cdeaa1aee in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=e08cdeaa1aee author: Pavel Tisnovsky date: Tue Apr 01 11:44:02 2014 +0200 Added new tests testGetResourceAsStreamPositiveTest into ScriptEngineFactoryClassTest. diffstat: ChangeLog | 8 ++- src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 61 ++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletions(-) diffs (93 lines): diff -r 9d409b2379c5 -r e08cdeaa1aee ChangeLog --- a/ChangeLog Fri Mar 28 10:48:43 2014 +0100 +++ b/ChangeLog Tue Apr 01 11:44:02 2014 +0200 @@ -1,3 +1,9 @@ +2014-04-01 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: + Added new tests testGetResourceAsStreamPositiveTest + into ScriptEngineFactoryClassTest. + 2014-03-28 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineClassTest.java: @@ -6,7 +12,7 @@ 2014-03-27 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineClassTest.java: - Added new tests testGetResourceAsStreamPositioveTest + Added new tests testGetResourceAsStreamPositiveTest into ScriptEngineClassTest. 2014-03-26 Pavel Tisnovsky diff -r 9d409b2379c5 -r e08cdeaa1aee src/org/RhinoTests/ScriptEngineFactoryClassTest.java --- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Fri Mar 28 10:48:43 2014 +0100 +++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Tue Apr 01 11:44:02 2014 +0200 @@ -1880,6 +1880,67 @@ } /** + * Test for method javax.script.ScriptEngineFactory.getClass().getResourcePositiveTest() + */ + protected void testGetResourcePositiveTest() { + Object resource; + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/AbstractScriptEngineClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/AbstractScriptEngineClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/BaseRhinoTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/BaseRhinoTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/BindingsClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/BindingsClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/BindingsTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/BindingsTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/CompilableClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/CompilableClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/CompilableTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/CompilableTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/CompiledScriptClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/CompiledScriptClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/CompiledScriptTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/CompiledScriptTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/Constants.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/Constants.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/InvocableClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/InvocableClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/InvocableTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/InvocableTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/JavaScriptSnippets.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/JavaScriptSnippets.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/JavaScriptsTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/JavaScriptsTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptContextClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptContextClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptContextTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptContextTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptEngineClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptEngineClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptEngineFactoryClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptEngineFactoryClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptEngineFactoryTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptEngineFactoryTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptEngineManagerClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptEngineManagerClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptEngineManagerTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptEngineManagerTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptEngineTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptEngineTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptExceptionClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptExceptionClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/ScriptExceptionTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/ScriptExceptionTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/SimpleBindingsClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/SimpleBindingsClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/SimpleBindingsTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/SimpleBindingsTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/SimpleScriptContextClassTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/SimpleScriptContextClassTest.class\") returns null"); + resource = this.scriptEngineFactoryClass.getResource("/org/RhinoTests/SimpleScriptContextTest.class"); + assertNotNull(resource, "getResource(\"/org/RhinoTests/SimpleScriptContextTest.class\") returns null"); + } + + /** * Test for method javax.script.ScriptEngineFactory.getClass().getResourceAsStreamNegativeTest() */ protected void testGetResourceAsStreamNegativeTest() { From jvanek at redhat.com Tue Apr 1 09:45:36 2014 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 01 Apr 2014 11:45:36 +0200 Subject: [rfc][icedtea-web] Translation of 1.5 In-Reply-To: <5339D12E.6060900@gmx.de> References: <53306BD5.8040902@redhat.com> <5339BACC.9060300@gmx.de> <5339C13C.4040807@redhat.com> <5339D12E.6060900@gmx.de> Message-ID: <533A8AC0.5080007@redhat.com> On 03/31/2014 10:33 PM, Jacob Wisor wrote: > On 03/31/2014 09:25 PM, Jiri Vanek wrote: >> On 03/31/2014 08:58 PM, Jacob Wisor wrote: >> Hello and thank you very much! >> >> >> Few nits: >> >> -BOredirect = Allow to follow 301, 302, 303, 307 and 308 redirections >> +BOredirect = Follows HTTP redirects. >> >> There are even ore then those 4 redirections. The missing two are *not* >> follwoed. So I would ratehr keep the numbers eg in brackets att the end of string. > > No. Remember KISS? Those HTTP response codes are a piece of information for the documentation (not > the UI). If anyone really needs to know the exact codes affected by this switch, this is where they > should/would look. I thought you will say something like this. So ok from my side (the CZ adaptation will follow after your push. > >> >> ... -> Expunge .. >> >> Expunge??? Isnt this error? :)) > > Does it sound too radical? :-D Well, "Purge" would be another suitable term. In any case, "Clear all > cache" sounds simply ..., lets say somehow awkward. So, this should better be adapted. > Oh regardless of the final text; there should really be a message box popping up and asking the user > to affirm this action, to prevent any accidental hitting of the button. ;-) > >> You yourself renamed it: >> -CONSOLEClean=Clean all >> +CONSOLEClean=Clear >> >> Which I personally probably do not care, but et least it should be used instead >> of Expunge, or not? I overlooekd: -CVCPCleanCache=Clean all cache +CVCPCleanCache=Expunge So ok on my side. > > Yeah, we could stick to "Clear" everywhere where applicable. This would make the language more > streamlined. > >>> Phew, I have finally made it. 1.5.1 has seen a lot new messages, far more than >>> I have initially >>> expected. But here they are. >>> >>> However, I was again occasionally grinding over the quite poor quality of many >>> English sources. >>> Therefore, I have made some tiny modifications to Messages.properties. The >>> modifications are meant >>> as proposals only and by far do not encompass all modification I would like to >>> make. >>> >>> As usual, localized messages are preceded by its original message as a comment >>> for your convenience >>> only while reviewing, and will be removed before committing. >> >> hmhmh - >> >> MissingPermissionsMainTitle >> ALACAMatchingMainTitle >> ALACAMissingMainTitle >> >> Are missing. I think the other ALACA nd Permission strings are also missing - >> are you ging to fix those? > > I have left those out on purpose because I was not sure whether these would change before release or > not, or maybe even after release. I think they are now final. > >> Also - how PL? > > I have made it through partially so far. So, as you can see, quite a lot of stuff has accumulated > since the last release, so it won't be before some time. Of course! For PL transaltion 1.5.1 can be released :) > >> >> >> whole test log: >> >> Warning! Items equals for: AboutDialogueTabGPLv2 = GPLv2 but are in allowed subset >> Warning! Items equals for: ButOk = OK but are in allowed subset >> Warning! Items equals for: LSFatal = Fatal but are in allowed subset >> Warning! Items equals for: COPcode = Code but are in allowed subset >> Warning! Items equals for: CVSystem = System but are in allowed subset >> Warning! Items equals for: COPinfo = Info but are in allowed subset >> Warning! Items equals for: CVDetails = Details but are in allowed subset >> Warning! Items equals for: PEOpenMenuItemMnemonic = 79 but are in allowed subset >> Warning! Items equals for: PEExitMenuItemMnemonic = 88 but are in allowed subset >> Warning! Items equals for: PESaveMenuItemMnemonic = 83 but are in allowed subset >> Warning! Items equals for: APSLabelFTP = FTP but are in allowed subset >> Warning! Items equals for: APPEXTSECguiPanelAppletInfoHederPart1 = {0} {1} but >> are in allowed subset >> Warning! Items equals for: PEAddCodebaseMnemonic = 78 but are in allowed subset >> Warning! Items equals for: APSLabelSocks = Socks but are in allowed subset >> Warning! Items equals for: SPLASHurlLooks = >> http://icedtea.classpath.org/wiki/IcedTea-Web but are in allowed subset >> Warning! Items equals for: COPjava = Java but are in allowed subset >> Warning! Items equals for: SPLASHurl = >> http://icedtea.classpath.org/wiki/IcedTea-Web#Filing_bugs but are in allowed subset >> Warning! Items equals for: Version = Version but are in allowed subset >> Warning! Items equals for: SPLASHhomepage = Homepage but are in allowed subset >> Warning! Items equals for: CVCPColName = Name but are in allowed subset > > Many of these seem to occur twice. Yes, even in the sources??? :-o > >> Warning! Items equals for: BAboutITW = The IcedTea-Web project provides a Free >> Software web browser plugin running applets written in the Java programming >> language and an implementation of Java Web Start, originally based on the NetX >> project. Visit the IcedTea-Web homepage: >> http://icedtea.classpath.org/wiki/IcedTea-Web . Use "man javaws" or "javaws >> -help" for more information. but are in allowed subset > > Yeah, I have realized that I had missed this one just after hitting the send button on my last e-mail. > >> Warning! Items equals for: COPitw = IcedTea-Web but are in allowed subset >> Warning! Items equals for: APSLabelHTTP = HTTP but are in allowed subset >> Warning! Items equals for: Name = Name but are in allowed subset >> Error! Items equals for: MissingPermissionsMainTitle = Application > color='red'> {0} from {1} is missing the >> permissions attribute. Applications without this attribute should not be >> trusted. Do you wish to allow this application to run? >> Warning! Items equals for: MissingPermissionsInfo = For more information you can >> visit:
> href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#permissions"> >> JAR File Manifest Attributes
and
> href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> >> Preventing the repurposing of Applications but are in allowed subset >> Warning! Items equals for: ALACAMissingInfo = For more information see:
> href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library"> >> JAR File Manifest Attributes
and
> href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> >> Preventing the Repurposing of an Application but are in allowed subset >> Error! Items equals for: ALACAMatchingMainTitle = The application > color='red'> {0} from {1} uses resources from >> the following remote locations:
{2}
Are you sure you want to run this >> application? >> Warning! Items equals for: ALACAMatchingInfo = For more information you can >> visit:
> href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library"> >> JAR File Manifest Attributes
and
> href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> >> Preventing the Repurposing of an Application but are in allowed subset >> Error! Items equals for: ALACAMissingMainTitle = The application > color='red'> {0} from {1} uses resources from >> the following remote locations: {2} Are you sure you want to run this application? > > These seem to have been added just recently. Well, at least after I started localizing. > > So, back to work! :-D Sure! No worries! Looking forward for email and do as you wish! J. the origianlly attache daptch is ok to push. Thanx! From jvanek at redhat.com Tue Apr 1 11:38:12 2014 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 01 Apr 2014 13:38:12 +0200 Subject: [rfc][icedtea-web] Permissions manifest attribute fix In-Reply-To: <20140331213014.GD15901@redhat.com> References: <5339A5AC.1070004@redhat.com> <5339CBCC.4000508@redhat.com> <5339D185.5080905@redhat.com> <20140331213014.GD15901@redhat.com> Message-ID: <533AA524.8000405@redhat.com> On 03/31/2014 11:30 PM, Omair Majid wrote: > * Andrew Azores [2014-03-31 16:35]: >> On 03/31/2014 04:10 PM, Andrew Azores wrote: >>> On 03/31/2014 01:28 PM, Andrew Azores wrote: >>> Small refactor. Rather than the new RequestedPermissionLevel being >>> available from SecurityDesc and PluginBridge only, it's also >>> available from JNLPFile. PluginBridge, being a JNLPFile subclass, >>> then overrides the method and provides the correct implementation >>> for HTML applets. This just makes things more coherent IMO. >>> >>> Thanks, >>> >> >> And another, as discussed with Omair on IRC. Just extracted the >> common checks for HTML and JNLP into a new method and call this >> method once, before the split check for HTML/JNLP divergence. So >> long as the spec doesn't diverge the two any further, then this >> should be okay. Also remove an unnecessary typecast (made >> unnecessary in the last refactor due to new method and override, but >> forgot to fix). > > I am far from an expert on this code, so please take this 'review' with > a grain of salt. > > Also, I am a little hesitant about such (potentially) invasive code > going in at the last minute. > >> +++ b/netx/net/sourceforge/jnlp/runtime/ManifestAttributesChecker.java > >> + final RequestedPermissionLevel requested = file.getRequestedPermissionLevel(); >> + validateRequestedPermissionLevelMatchesManifestPermissions(requested, permissions); >> + if (file instanceof PluginBridge) { // HTML applet >> + if (requested == RequestedPermissionLevel.NONE) { >> + if (permissions == ManifestBoolean.TRUE && signing != SigningState.NONE) { >> + // http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#permissions >> + // FIXME: attempting to follow the spec, but it is too late now to actually set the applet >> + // to run in sandbox, so the applet will not be run at all, rather than run sandboxed! >> + //securityDelegate.setRunInSandbox(); > > I read this comment a few times and I couldn't figure out (without > asking you) how it relates to the current state. > > The "applet will not be run at all" bit completely threw me off. I read > this comment as: we can not set the sandbox state now (for some reason) > so by leaving this commented out, the applet will not run at all. Can > you clarify that not calling sandbox will let it run without any issues? > >> + if (requested == RequestedPermissionLevel.NONE) { >> + if (permissions == ManifestBoolean.TRUE && signing != SigningState.NONE) { > > Maybe call this variable `sandbox` rather than `permissions` to clarify > that TRUE means sandbox? I think that all *except* changes in ManifestAttributesChecker can go in as seaprate changeset. They are good an necessary to go. Nits - public enum RequestedPermissionLevel { + NONE, SANDBOX, J2SE, ALL + } may have toString, or if differe - toJnlpString and toHtmlString which will return the correct values, from which are created. NONE = > null or "null" SANDBOX => "sandbox" J2SE ALL It is defintley necessary to avoid duplicated, hardcoded strings. I also think that those strings already *are* somewhere in ITW! Well, I have not found it. So this can go later as separate chnageset, which will replace all hardcoed Strings with RequestedPermissionLevel.toString (including new, tests) Unittests for above functionality are attached As for ManifestAttributesChecker itself - why it is so complex??? I would expect you just repalce AppletSecurityLevel level = AppletStartupSecuritySettings.getInstance().getSecurityLevel(); by new getRequestedPermissionLevel Why the if nstacneof ? it seesm tome completely redundant... Thax for checking thi sissue and quick fix! J. -------------- next part -------------- diff -r 2670820a9609 tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java Tue Apr 01 11:34:16 2014 +0200 +++ b/tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java Tue Apr 01 13:34:24 2014 +0200 @@ -277,4 +277,65 @@ Assert.assertFalse(downloadOptions.useExplicitPack()); Assert.assertFalse(downloadOptions.useExplicitVersion()); } + + + String minimalJnlp = "\n" + + "\n" + + " \n" + + " Parsing Test\n" + + " IcedTea\n" + + " \n" + + "\n" + + " \n" + + "SECURITY" + + ""; + + @Test + public void testGetRequestedPermissionLevel1() throws MalformedURLException, ParseException { + String jnlpContents = minimalJnlp.replace("SECURITY", ""); + URL codeBase = new URL("http://icedtea.classpath.org"); + InputStream is = new ByteArrayInputStream(jnlpContents.getBytes()); + JNLPFile jnlpFile = new JNLPFile(is, codeBase, new ParserSettings(false, false, false)); + Assert.assertEquals(SecurityDesc.RequestedPermissionLevel.NONE, jnlpFile.getRequestedPermissionLevel()); + } + + @Test + public void testGetRequestedPermissionLevel2() throws MalformedURLException, ParseException { + String jnlpContents = minimalJnlp.replace("SECURITY", "

OpenJDK PowerPC Port

+ +

+This file contains some additional build instructions for +the OpenJDK PowerPC +Port for Linux and AIX. It complements the general +OpenJDK +README-builds.html file. +

+ +

Building on Linux/PPC64

+ +

+Currently, i.e. all versions after +revision ppc-aix-port-b01, +should successfully build and run on Linux/PPC64. Passing +CORE_BUILD=true on the build comamnd line will instruct the build +system to create an interpreter-only version of the VM which is in general about +an order of magnitude slower than a corresponding server VM with JIT +compiler. But it is still fully functional (e.g. it passes JVM98) and can even +be used to bootstrap itself. Starting with +revision ppc-aix-port-b03, +it is possible to build without CORE_BUILD=true and create a +JIT-enabled version of the VM (containing the C2 "Server" JIT +compiler). +

+ +

+Our current build system is a Power6 box running +SLES 10.3 with gcc version 4.1.2 (in general, more recent Linux distributions +should work as well). +

+ +

Building with the OpenJDK Linux/PPC64 port as bootstrap JDK

+ +

+A precompiled build of ppc-aix-port-b03 is available +for download. +With it and together with the other build dependencies fulfilled as described +in the +main +README-builds.html file you can build a debug version of the JDK from the +top-level source directory with the following command line (additionally +pass CORE_BUILD=true to build an interpreter-only version of the VM): +

+ +

+> make FT_CFLAGS=-m64 LANG=C \
+  ALT_BOOTDIR=<path_to>/jdk1.7.0-ppc-aix-port-b01 \
+  ARCH_DATA_MODEL=64 \
+  HOTSPOT_BUILD_JOBS=8 \
+  PARALLEL_COMPILE_JOBS=8 \
+  ALT_FREETYPE_LIB_PATH=/usr/local/lib \
+  ALT_FREETYPE_HEADERS_PATH=/usr/local/include \
+  ANT_HOME=/usr/local/apache-ant-1.8.4 \
+  VERBOSE=true \
+  CC_INTERP=true \
+  OPENJDK=true \
+  debug_build 2>&1 | tee build_ppc-aix-port_dbg.log
+

+ +

+After the build finished successfully the results can be found under +./build/linux-ppc64-debug/. Product and fastdebug versions can be +build with the make targets product_build and +fastdebug_build respectively (the build results will be located under +./build/linux-ppc64/ and ./build/linux-ppc64-fastdebug/). On +our transitional ppc-aix-port +project page you can find the build logs of our regular nightly makes. +

+ +

Problems with pre-installed ANT on newer Linux distros

+ +

+Notice that pre-installed ANT version (i.e. ANT versions installed with the +corresponding system package manager) may cause problems in conjunction with +our bootstrap JDK. This is because they use various scripts from the +jpackage project to locate specific Java +libraries and jar files. These scripts (in particular +set_jvm_dirs() +in /usr/share/java-utils/java-functions) expect that executing +"java -fullversion" will return a string starting with "java" but +our OpenJDK port returns a string starting with "openjdk" instead. +

+ +

+The problem can be easily solved by either editing the regular expressions +which parse the version string +in /usr/share/java-utils/java-functions (or the respective file of +your Linux distribution) or by installing a plain version of ANT +from http://ant.apache.org/bindownload.cgi +and passing its installation directory to the build via +the ANT_HOME environment variable. +

+ +

Building with the IBM JDK for Linux/PPC64 as bootstrap JDK

+ +

+It is also possible to build with an IBM +JDK 7 bootstrap JDK (after all this is how we initially bootstrapped the +port). But because the IBM JDK uses a different default implementation of the +idlj and rmic compilers you will have to add the following +two additional variables to the build command line to force the IBM JDK to +fall back to the default Sun/Oracle version of the mentioned compilers (notice +that the single quotes are crucial here to prevent the immediate expansion of +$(ALT_BOOTDIR)): +

+ +

+IDLJ='$(ALT_BOOTDIR)/bin/java -cp $(ALT_BOOTDIR)/lib/tools.jar com.sun.tools.corba.se.idl.toJavaPortable.Compile'
+RMIC='$(ALT_BOOTDIR)/bin/java -cp $(ALT_BOOTDIR)/lib/tools.jar sun.rmi.rmic.Main'
+

+ +

+We successfully used build pxp6470-20110827_01 of the IBM JDK but +there have been reports +on the ppc-aix-port-dev +mailing list that newer version of the IBM JDK (starting with build pxp6470sr1-20120330_01(SR1)) require some additional +tweaking. Neil Richards advised in that mail thread to "Just rename lib/ibmorbtools.jar to be something else. +As the tools.jar tries to chain onto a file of that name, and that file +contains the rmicext.properties files with the IBM-impl settings, moving +that file off to one side should consistently cause rmic invocations to +use the OpenJDK rmic IIOP generator. +Approaching things this way would also mean one would not need to use +the RMIC setting. +(NB: One still need to use the IDLJ setting to use the OpenJDK idlj +implementation, especially as moving the ibmorbtools.jar file aside also +eliminates the IBM idlj implementation from the classpath)." +

+ +

+For historical reasons two old build logs of a debug and a product build +bootstrapped with the IBM JDK are still available for inspection: output_ppc-aix-port_dbg.log, +output_ppc-aix-port_opt.log. +

+ +

Running the OpenJDK Linux/PPC64 port

From andrew at icedtea.classpath.org Wed Apr 2 01:20:32 2014 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Apr 2014 01:20:32 +0000 Subject: /hg/release/icedtea7-forest-2.5/corba: 12 new changesets Message-ID: changeset 1a3aa4637b80 in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=1a3aa4637b80 author: katleman date: Thu Jan 16 11:51:53 2014 -0800 Added tag jdk7u60-b03 for changeset d7e98ed925a3 changeset 753698a91016 in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=753698a91016 author: katleman date: Wed Jan 22 12:33:37 2014 -0800 Added tag jdk7u60-b04 for changeset 1a3aa4637b80 changeset 9852efe6d6b9 in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=9852efe6d6b9 author: katleman date: Wed Feb 05 12:30:51 2014 -0800 Added tag jdk7u60-b05 for changeset 753698a91016 changeset 84a18429f247 in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=84a18429f247 author: katleman date: Wed Feb 12 14:56:11 2014 -0800 Added tag jdk7u60-b06 for changeset 9852efe6d6b9 changeset 8469bc00ddca in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=8469bc00ddca author: katleman date: Wed Feb 19 14:03:58 2014 -0800 Added tag jdk7u60-b07 for changeset 84a18429f247 changeset 7abca119f954 in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=7abca119f954 author: katleman date: Wed Feb 26 12:46:04 2014 -0800 Added tag jdk7u60-b08 for changeset 8469bc00ddca changeset e9aa813a3345 in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=e9aa813a3345 author: katleman date: Wed Mar 05 12:26:44 2014 -0800 Added tag jdk7u60-b09 for changeset 7abca119f954 changeset 015ce293909d in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=015ce293909d author: mfang date: Wed Mar 05 09:12:38 2014 -0800 8035988: 7u60 l10n resource file translation update 1 Reviewed-by: naoto, yhuang changeset 1861f1f59972 in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=1861f1f59972 author: lana date: Wed Mar 05 16:24:49 2014 -0800 Merge changeset a429ff635395 in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=a429ff635395 author: katleman date: Wed Mar 12 14:35:15 2014 -0700 Added tag jdk7u60-b10 for changeset 1861f1f59972 changeset d581875525aa in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=d581875525aa author: katleman date: Wed Mar 19 10:04:02 2014 -0700 Added tag jdk7u60-b11 for changeset a429ff635395 changeset 3a7c12d7b1cf in /hg/release/icedtea7-forest-2.5/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/corba?cmd=changeset;node=3a7c12d7b1cf author: andrew date: Wed Apr 02 02:15:58 2014 +0100 Merge jdk7u60-b12 diffstat: .hgtags | 24 + .jcheck/conf | 2 - make/Makefile | 2 +- make/common/Defs-aix.gmk | 397 ++++++++++ make/common/shared/Defs-java.gmk | 8 +- make/common/shared/Platform.gmk | 9 + src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties | 2 +- 7 files changed, 438 insertions(+), 6 deletions(-) diffs (truncated from 587 to 500 lines): diff -r d7e98ed925a3 -r 3a7c12d7b1cf .hgtags --- a/.hgtags Tue Dec 31 09:42:19 2013 -0800 +++ b/.hgtags Wed Apr 02 02:15:58 2014 +0100 @@ -50,6 +50,7 @@ b751c528c55560cf2adeaeef24b39ca1f4d1cbf7 jdk7-b73 5d0cf59a3203b9f57aceebc33ae656b884987955 jdk7-b74 0fb137085952c8e47878e240d1cb40f14de463c4 jdk7-b75 +d728db3889da23d9f74e45154b9261a43b4acd8d icedtea7-1.12 937144222e2219939101b0129d26a872a7956b13 jdk7-b76 6881f0383f623394b5ec73f27a5f329ff55d0467 jdk7-b77 a7f7276b48cd74d8eb1baa83fbf3d1ef4a2603c8 jdk7-b78 @@ -63,6 +64,7 @@ 6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86 09a41111a401d327f65e453384d976a10154d9ea jdk7-b87 39e14d2da687c7e592142137517aaf689544820f jdk7-b88 +e805b4155d76f76d40ffae36a74546f79218c539 icedtea7-1.13 bb4424c5e778b842c064a8b1aa902b35f4397654 jdk7-b89 56ce07b0eb47b93a98a72adef0f21e602c460623 jdk7-b90 bcd2fc089227559ac5be927923609fac29f067fa jdk7-b91 @@ -111,6 +113,7 @@ 918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136 +b62418551e20fa19fbf57c49d4378b7096809e60 icedtea-1.14 a66c01d8bf895261715955df0b95545c000ed6a8 jdk7-b137 78d8cf04697e9df54f7f11e195b7da29b8e345a2 jdk7-b138 60b074ec6fcf5cdf9efce22fdfb02326ed8fa2d3 jdk7-b139 @@ -123,6 +126,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147 +d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 @@ -141,6 +145,7 @@ 56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12 456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13 62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21 +ecb9fc90dea4720f5c1ba1354364ed610f463e41 icedtea-2.1-branchpoint 1b648adeeefa9b1fb022459e8e4f590b736c0fdd jdk7u3-b02 730fa05af5a9d10a3a7a1626d248b96d09f8069f jdk7u3-b03 7f7a9b1addb4925f4f6e17f6eb5cce986c3b626d jdk7u3-b04 @@ -157,6 +162,7 @@ 23777178e7eb61859be3f7240561aa1034ff9221 jdk7u4-b10 bdc37f3c09b6008667aff77432bb6d31cbae945e jdk7u4-b11 fddc26b35a31884d64315cf7c296570245e9c481 jdk7u4-b12 +9ffa2340e018131c900e9cc12c9f3a10698aa191 icedtea-2.2-branchpoint f7119745898016a98cddab3e69efb41c5a5aaf78 jdk7u4-b13 6a262c36caebb43972cbae5032cff632ce31d2cc jdk7u4-b14 d9bf21b76f093abfe451880d5db29e4932b1e72e jdk7u4-b15 @@ -186,11 +192,15 @@ c9f6750370c9a99d149d73fd32c363d9959d19d1 jdk7u6-b10 a2089d3bf5a00be50764e1ced77e270ceddddb5d jdk7u6-b11 34354c623c450dc9f2f58981172fa3d66f51e89c jdk7u6-b12 +325250aef90af0f5cd04b141f83a81638ae1e478 ppc-aix-port-b01 +325250aef90af0f5cd04b141f83a81638ae1e478 ppc-aix-port-b02 +325250aef90af0f5cd04b141f83a81638ae1e478 ppc-aix-port-b03 76bee3576f61d4d96fef118902d5d237a4f3d219 jdk7u6-b13 731d5dbd7020dca232023f2e6c3e3e22caccccfb jdk7u6-b14 8da4015f405b0fa267cca4780d20cd012d0a9cb4 jdk7u6-b15 7674c7ed99a53a8dcf654ab8a6963199ef562a08 jdk7u6-b16 e4a676826cb3fe2f84e19105a027c15c097f98f1 jdk7u6-b17 +68c35d6e9548bc7be9c3ce73774c6d53b0d72d3b icedtea-2.3-branchpoint b3d767dbd67f518168c561e078be5e860bc60cfc jdk7u6-b18 5c046510b9308bf514f078d48fcf0112a376ad41 jdk7u6-b19 f0c51b691d34b4a06c1e22c7960be71e0d0ee84e jdk7u6-b20 @@ -258,11 +268,13 @@ 7969d5f219248de033c296ef75fff7aae7545bbd jdk7u12-b07 6f4d4c7a254d4aca3a7f2caabb75e6559a290393 jdk7u12-b08 c8c261b2220c5b966c07784682057a915defb0da jdk7u12-b09 +efbe4cef7fe2d46a197c39eb7a94e127e0bb4c5d icedtea-2.4-branchpoint 3877f9ae971eefbfbbcb16f2ff79c72ac10ac4bd jdk7u14-b10 3bd891cd98773cf841ad65f52f25e3e6fa185cef jdk7u14-b11 fbb83600db33de6211fc58ba2a2bbb6b356aa9c2 jdk7u14-b12 cd7aaec5accf3f8fbb693153f8d9be846e0f8a05 jdk7u14-b13 9e8bde2586a1a7fd95f654c7d0043d1eb18f0793 jdk7u14-b14 +70af8b7907a504f7b6e4be1882054ca9f3ad1875 ppc-aix-port-b04 2b1fcbe4e78557822b2269b43c8b589aa1f0b522 jdk7u14-b15 622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01 30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02 @@ -381,6 +393,7 @@ 80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18 a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30 b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31 +c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00 d641ac83157ec86219519c0cbaf3122bdc997136 jdk7u45-b33 aa24e046a2da95637257c9effeaabe254db0aa0b jdk7u45-b34 b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u51-b00 @@ -402,3 +415,14 @@ c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00 a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01 d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02 +47343904e95d315b5d2828cb3d60716e508656a9 icedtea-2.5pre01 +16906c5a09dab5f0f081a218f20be4a89137c8b1 icedtea-2.5pre02 +d7e98ed925a3885380226f8375fe109a9a25397f jdk7u60-b03 +1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u60-b04 +753698a910167cc29c01490648a2adbcea1314cc jdk7u60-b05 +9852efe6d6b992b73fdbf59e36fb3547a9535051 jdk7u60-b06 +84a18429f247774fc7f1bc81de271da20b40845b jdk7u60-b07 +8469bc00ddca4de366b20b32d42548c882656cd8 jdk7u60-b08 +7abca119f9543489280d560dc11256d439004f0f jdk7u60-b09 +1861f1f599728c4f15a85a5980edef916552747b jdk7u60-b10 +a429ff635395688ded6c52cd21c0b4ce75e62168 jdk7u60-b11 diff -r d7e98ed925a3 -r 3a7c12d7b1cf .jcheck/conf --- a/.jcheck/conf Tue Dec 31 09:42:19 2013 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r d7e98ed925a3 -r 3a7c12d7b1cf make/Makefile --- a/make/Makefile Tue Dec 31 09:42:19 2013 -0800 +++ b/make/Makefile Wed Apr 02 02:15:58 2014 +0100 @@ -150,7 +150,7 @@ #----- bin.zip -BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl +BIN_ZIP_FILES = $(BUILD_DIR)/lib/orb.idl $(BUILD_DIR)/lib/ir.idl BIN_ZIP = $(LIB_DIR)/bin.zip $(BIN_ZIP): $(BIN_ZIP_FILES) diff -r d7e98ed925a3 -r 3a7c12d7b1cf make/common/Defs-aix.gmk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/common/Defs-aix.gmk Wed Apr 02 02:15:58 2014 +0100 @@ -0,0 +1,397 @@ +# +# Copyright (c) 1995, 2012, Oracle and/or its affiliates. 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. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# +# Makefile to specify compiler flags for programs and libraries +# targeted to Solaris. Should not contain any rules. +# +# WARNING: This file is shared with other workspaces. +# So when it includes other files, it must use JDK_TOPDIR. +# + +# Warning: the following variables are overridden by Defs.gmk. Set +# values will be silently ignored: +# CFLAGS (set $(OTHER_CFLAGS) instead) +# CPPFLAGS (set $(OTHER_CPPFLAGS) instead) +# CXXFLAGS (set $(OTHER_CXXFLAGS) instead) +# LDFLAGS (set $(OTHER_LDFAGS) instead) +# LDLIBS (set $(EXTRA_LIBS) instead) +# LDLIBS_COMMON (set $(EXTRA_LIBS) instead) +# LINTFLAGS (set $(OTHER_LINTFLAGS) instead) +# +# Note: CPPFLAGS are used in C and C++ compiles. +# + +# Get shared JDK settings +include $(JDK_MAKE_SHARED_DIR)/Defs.gmk + +# define these to avoid picking up ones from aliases or from +# non-standard locations +# + +AR = $(USRBIN_PATH)ar +BASENAME = $(UNIXCOMMAND_PATH)basename +CAT = $(UNIXCOMMAND_PATH)cat +# SAPJVM: Moved to shared/Compiler-aix.gmk +#CC = $(COMPILER_PATH)xlc_r +#CPP = $(COMPILER_PATH)xlc_r -E +#CXX = $(COMPILER_PATH)xlC_r +CD = cd # intrinsic unix command +CHMOD = $(UNIXCOMMAND_PATH)chmod +CMP = $(USRBIN_PATH)cmp +COMPRESS = $(USRBIN_PATH)compress +CP = $(UNIXCOMMAND_PATH)cp +CPIO = $(UNIXCOMMAND_PATH)cpio +CUT = $(USRBIN_PATH)cut +DATE = $(UNIXCOMMAND_PATH)date +DF = $(UNIXCOMMAND_PATH)df +DIFF = $(USRBIN_PATH)diff +DIRNAME = $(USRBIN_PATH)dirname +ECHO = echo # intrinsic unix command, with backslash-escaped character interpretation +EGREP = $(UNIXCOMMAND_PATH)egrep +EXPR = $(USRBIN_PATH)expr + +FIND = $(UNIXCOMMAND_PATH)find + +HEAD = $(USRBIN_PATH)head +GREP = $(UNIXCOMMAND_PATH)grep +GUNZIP = $(UNIXCOMMAND_PATH)gunzip +LEX = $(USRBIN_PATH)lex +LN = $(UNIXCOMMAND_PATH)ln +LS = $(UNIXCOMMAND_PATH)ls +M4 = $(USRBIN_PATH)m4 +MKDIR = $(UNIXCOMMAND_PATH)mkdir +MV = $(UNIXCOMMAND_PATH)mv +NAWK = $(USRBIN_PATH)awk +PWD = $(UNIXCOMMAND_PATH)pwd +#RM is defined by GNU Make as 'rm -f' +RMDIR = $(UNIXCOMMAND_PATH)rmdir +RPM = $(UNIXCOMMAND_PATH)rpm +SED = $(UNIXCOMMAND_PATH)sed +SH = $(UNIXCOMMAND_PATH)sh +SORT = $(UNIXCOMMAND_PATH)sort +STRIP = $(USRBIN_PATH)strip +TAIL = $(USRBIN_PATH)tail + +# SAPJVM: catch (gnu) tool by PATH environment variable +TAR = /usr/local/bin/tar + +TEST = $(USRBIN_PATH)test +TOUCH = $(UNIXCOMMAND_PATH)touch +TR = $(USRBIN_PATH)tr +TRUE = $(UNIXCOMMAND_PATH)true +UNAME = $(UNIXCOMMAND_PATH)uname +UNIQ = $(USRBIN_PATH)uniq +UNZIPSFX = $(USRBIN_PATH)unzipsfx +YACC = $(USRBIN_PATH)yacc + +# SAPJVM: catch (gnu) tool by PATH environment variable +ZIPEXE = $(UNIXCOMMAND_PATH)zip + +OS_VERSION = $(shell $(UNAME) -v) +OS_NAME = aix + +ARCH_DATA_MODEL=64 + +LIBARCH = ppc64 + +# Value of Java os.arch property +ARCHPROP = $(LIBARCH) + +BINDIR = $(OUTPUTDIR)/bin + +# where is unwanted output to be delivered? +DEV_NULL = /dev/null +export DEV_NULL + +CLASSPATH_SEPARATOR = : + +ifndef PLATFORM_SRC + PLATFORM_SRC = $(BUILDDIR)/../src/solaris +endif # PLATFORM_SRC + +# Location of the various .properties files specific to Linux platform +ifndef PLATFORM_PROPERTIES + PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib +endif # PLATFORM_SRC + +# Platform specific closed sources +ifndef OPENJDK + ifndef CLOSED_PLATFORM_SRC + CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris + endif +endif + +# SAPJVM: Set the source for the platform dependent sources of express +SAPJVMEXPRESS_PLATFORM_SRC=$(JDK_TOPDIR)/../../common/j2se/src/solaris + +# platform specific include files +PLATFORM_INCLUDE_NAME = $(PLATFORM) +PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME) + +# SAPJVM: OBJECT_SUFFIX, LIBRARY_SUFFIX, EXE_SUFFICS etc. are set in +# j2se/make/common/shared/Platform.gmk . Just override those which differ for AIX. +# suffix used for make dependencies files. +# SAPJVM AIX: -qmakedep outputs .u, not .d +override DEPEND_SUFFIX = u +# suffix used for lint files +LINT_SUFFIX = ln +# The suffix applied to the library name for FDLIBM +FDDLIBM_SUFFIX = a +# The suffix applied to scripts (.bat for windows, nothing for unix) +SCRIPT_SUFFIX = +# CC compiler object code output directive flag value +CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required! +CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required! + +# On AIX we don't have any issues using javah and javah_g. +JAVAH_SUFFIX = $(SUFFIX) + +# +# Default optimization +# + +ifndef OPTIMIZATION_LEVEL + ifeq ($(PRODUCT), java) + OPTIMIZATION_LEVEL = HIGHER + else + OPTIMIZATION_LEVEL = LOWER + endif +endif +ifndef FASTDEBUG_OPTIMIZATION_LEVEL + FASTDEBUG_OPTIMIZATION_LEVEL = LOWER +endif + +CC_OPT/LOWER = -O2 +CC_OPT/HIGHER = -O3 + +CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) + +# +# Selection of warning messages +# +CFLAGS_SHARED_OPTION=-qmkshrobj +CXXFLAGS_SHARED_OPTION=-qmkshrobj + +# +# If -Xa is in CFLAGS_COMMON it will end up ahead of $(POPT) for the +# optimized build, and that ordering of the flags completely freaks +# out cc. Hence, -Xa is instead in each CFLAGS variant. +# The extra options to the C++ compiler prevent it from: +# - adding runpath (dump -Lv) to *your* C++ compile install dir +# - adding stubs to various things such as thr_getspecific (hence -nolib) +# - creating Templates.DB in current directory (arch specific) +CFLAGS_COMMON = -qchars=signed +PIC_CODE_LARGE = -qpic=large +PIC_CODE_SMALL = -qpic=small +GLOBAL_KPIC = $(PIC_CODE_LARGE) +CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS) +# SAPJVM: +# save compiler options into object file +CFLAGS_COMMON += -qsaveopt + +# SAPJVM +# preserve absolute source file infos in debug infos +CFLAGS_COMMON += -qfullpath + +# SAPJVM +# We want to be able to debug an opt build as well. +CFLAGS_OPT = -g $(POPT) +CFLAGS_DBG = -g + +CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) +# SAPJVM +# We want to be able to debug an opt build as well. +CXXFLAGS_OPT = -g $(POPT) +CXXFLAGS_DBG = -g + +# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java +ifeq ($(FASTDEBUG), true) + CFLAGS_DBG += -O2 + CXXFLAGS_DBG += -O2 +endif + +CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' + +# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) +ifneq ($(ARCH),alpha) + CPP_ARCH_FLAGS += -D$(ARCH) +else + CPP_ARCH_FLAGS += -D_$(ARCH)_ +endif + +# SAPJVM. turn `=' into `+='. +CPPFLAGS_COMMON += -D$(ARCH) -DARCH='"$(ARCH)"' -DAIX $(VERSION_DEFINES) \ + -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT + +# SAPJVM: AIX port: zip lib +CPPFLAGS_COMMON += -DSTDC + +# turn on USE_PTHREADS +CPPFLAGS_COMMON += -DUSE_PTHREADS +CFLAGS_COMMON += -DUSE_PTHREADS + +CFLAGS_COMMON += -q64 +CPPFLAGS_COMMON += -q64 + +# SAPJVM. define PPC64 +CFLAGS_COMMON += -DPPC64 +CPPFLAGS_COMMON += -DPPC64 + +# SAPJVM +LDFLAGS_COMMON += -b64 + +# SAPJVM: enable dynamic runtime linking & strip the absolute paths from the coff section +LDFLAGS_COMMON += -brtl -bnolibpath + +# SAPJVM: Additional link parameters for AIX +LDFLAGS_COMMON += -liconv + +CPPFLAGS_OPT = +CPPFLAGS_DBG += -DDEBUG + +LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) +LDFLAGS_OPT = +LDFLAGS_DBG = + +# SAPJVM +# Export symbols +OTHER_LDFLAGS += -bexpall + +# +# Post Processing of libraries/executables +# +ifeq ($(VARIANT), OPT) + ifneq ($(NO_STRIP), true) + ifneq ($(DEBUG_BINARIES), true) + # Debug 'strip -g' leaves local function Elf symbols (better stack + # traces) + # SAPJVM + # We want to be able to debug an opt build as well. + # POST_STRIP_PROCESS = $(STRIP) -g + endif + endif +endif + +# javac Boot Flags +JAVAC_BOOT_FLAGS = -J-Xmx128m + +# +# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o +# +LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker + +# +# Support for Quantify. +# +ifdef QUANTIFY +QUANTIFY_CMD = quantify +QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes +LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS) +endif + +# +# Path and option to link against the VM, if you have to. Note that +# there are libraries that link against only -ljava, but they do get +# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas +# the library itself should not. +# +VM_NAME = server +JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm$(SUFFIX) +JAVALIB = -ljava$(SUFFIX) $(JVMLIB) + +# Part of INCREMENTAL_BUILD mechanism. +# Compiler emits things like: path/file.o: file.h +# We want something like: relative_path/file.o relative_path/file.d: file.h +CC_DEPEND = -qmakedep +#CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g' +CC_DEPEND_FILTER = $(SED) -e '/:[ ]*[/]/d' -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g' | $(SORT) -u + +# Runtime graphics library search paths... +OPENWIN_RUNTIME_LIB = +AWT_RUNPATH = + +# +# We want to privatize JVM symbols on Solaris. This is so the user can +# write a function called FindClass and this should not override the +# FindClass that is inside the JVM. At this point in time we are not +# concerned with other JNI libraries because we hope that there will +# not be as many clashes there. +# +PRIVATIZE_JVM_SYMBOLS = false + +USE_PTHREADS = true +#override ALT_CODESET_KEY = _NL_CTYPE_CODESET_NAME +override AWT_RUNPATH = +override HAVE_ALTZONE = false +override HAVE_FILIOH = false +override HAVE_GETHRTIME = false +override HAVE_GETHRVTIME = false +override HAVE_SIGIGNORE = true +override LEX_LIBRARY = -lfl +ifeq ($(STATIC_CXX),true) +override LIBCXX = -Wl,-bstatic -lc_r -Wl,-bdynamic +else +override LIBCXX = +endif +override LIBPOSIX4 = +override LIBSOCKET = +override LIBNSL = +override LIBTHREAD = +override MOOT_PRIORITIES = true +override OPENWIN_LIB = $(OPENWIN_HOME)/lib +override SUN_CMM_SUBDIR = +override THREADS_FLAG = native +override USE_GNU_M4 = true +override USING_GNU_TAR = true +override WRITE_LIBVERSION = false + +# USE_EXECNAME forces the launcher to look up argv[0] on $PATH, and put the +# resulting resolved absolute name of the executable in the environment +# variable EXECNAME. That executable name is then used that to locate the +# installation area. From andrew at icedtea.classpath.org Wed Apr 2 01:20:51 2014 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Apr 2014 01:20:51 +0000 Subject: /hg/release/icedtea7-forest-2.5/jaxp: 10 new changesets Message-ID: changeset 7215972c2c30 in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=7215972c2c30 author: katleman date: Thu Jan 16 11:52:08 2014 -0800 Added tag jdk7u60-b03 for changeset 359b79d99538 changeset 673ea3822e59 in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=673ea3822e59 author: katleman date: Wed Jan 22 12:34:06 2014 -0800 Added tag jdk7u60-b04 for changeset 7215972c2c30 changeset fd1cb0040a1d in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=fd1cb0040a1d author: katleman date: Wed Feb 05 12:31:10 2014 -0800 Added tag jdk7u60-b05 for changeset 673ea3822e59 changeset cd7c8fa7a057 in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=cd7c8fa7a057 author: katleman date: Wed Feb 12 14:56:29 2014 -0800 Added tag jdk7u60-b06 for changeset fd1cb0040a1d changeset b19c0f18b5a5 in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=b19c0f18b5a5 author: katleman date: Wed Feb 19 14:04:14 2014 -0800 Added tag jdk7u60-b07 for changeset cd7c8fa7a057 changeset 4bfece8a5148 in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=4bfece8a5148 author: katleman date: Wed Feb 26 12:46:35 2014 -0800 Added tag jdk7u60-b08 for changeset b19c0f18b5a5 changeset 28a6c0b3b225 in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=28a6c0b3b225 author: katleman date: Wed Mar 05 12:27:10 2014 -0800 Added tag jdk7u60-b09 for changeset 4bfece8a5148 changeset e57490e0b999 in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=e57490e0b999 author: katleman date: Wed Mar 12 14:35:39 2014 -0700 Added tag jdk7u60-b10 for changeset 28a6c0b3b225 changeset a9574b35f0af in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=a9574b35f0af author: katleman date: Wed Mar 19 10:04:16 2014 -0700 Added tag jdk7u60-b11 for changeset e57490e0b999 changeset 1fef0a819b0a in /hg/release/icedtea7-forest-2.5/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxp?cmd=changeset;node=1fef0a819b0a author: andrew date: Wed Apr 02 02:15:59 2014 +0100 Merge jdk7u60-b12 diffstat: .hgtags | 24 ++++++++++++++++++++++++ .jcheck/conf | 2 -- 2 files changed, 24 insertions(+), 2 deletions(-) diffs (111 lines): diff -r 359b79d99538 -r 1fef0a819b0a .hgtags --- a/.hgtags Thu Jan 02 09:44:24 2014 -0800 +++ b/.hgtags Wed Apr 02 02:15:59 2014 +0100 @@ -50,6 +50,7 @@ feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75 +fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78 @@ -63,6 +64,7 @@ 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88 +826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13 d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91 @@ -111,6 +113,7 @@ d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136 +1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137 be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138 28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139 @@ -123,6 +126,7 @@ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01 fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147 +b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint 104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02 64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03 2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04 @@ -141,6 +145,7 @@ 0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12 d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21 +7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02 604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03 551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04 @@ -157,6 +162,7 @@ 7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10 3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11 b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12 +c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint 7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13 82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14 36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01 @@ -186,11 +192,15 @@ f4e80156296e43182a0fea5f54032d8c0fd0b41f jdk7u6-b10 5078a73b3448849f3328af5e0323b3e1b8d2d26c jdk7u6-b11 c378e596fb5b2ebeb60b89da7ad33f329d407e2d jdk7u6-b12 +15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b01 +15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b02 +15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b03 15b71daf5e69c169fcbd383c0251cfc99e558d8a jdk7u6-b13 da79c0fdf9a8b5403904e6ffdd8f5dc335d489d0 jdk7u6-b14 94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15 0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16 5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17 +445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint 1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18 3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19 4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20 @@ -258,12 +268,14 @@ 1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07 427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08 366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09 +14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint 23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10 825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11 560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12 937bae61a48febcc948b7e10ae781c9077360241 jdk7u14-b13 7038ca4959e50a02f797e639daffe6b2b4065f86 jdk7u14-b14 aa6fb94c5e7bc645f478b6f60c5e6e06bebcc2bf jdk7u14-b15 +1d1e1fc3b88d2fda0c7da55ee3abb2b455e0d317 ppc-aix-port-b04 99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01 edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02 14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30 @@ -382,6 +394,7 @@ 4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18 a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30 3c34f244296e98d8ebb94973c752f3395612391a jdk7u45-b31 +d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00 056494e83d15cd1c546d32a3b35bdb6f670b3876 jdk7u45-b33 b5a83862ed2ab9cc2de3719e38c72519481a4bbb jdk7u45-b34 0a8b95184728548be4b20876e05f76e0262e4195 jdk7u51-b00 @@ -403,3 +416,14 @@ d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00 ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01 050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02 +74093b75ddd4fc2e578a3469d32b8bb2de3692d5 icedtea-2.5pre01 +d7085aad637fa90d027840c7f7066dba82b21667 icedtea-2.5pre02 +359b79d99538d17eeb90927a1e4883fcec31661f jdk7u60-b03 +7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u60-b04 +673ea3822e59de18ae5771de7a280c6ae435ef86 jdk7u60-b05 +fd1cb0040a1d05086ca3bf32f10e1efd43f05116 jdk7u60-b06 +cd7c8fa7a057e62e094cdde78dd632de54cedb8c jdk7u60-b07 +b19c0f18b5a508be894aead53617688342690b01 jdk7u60-b08 +4bfece8a5148947d268611cc1b4485e92960064e jdk7u60-b09 +28a6c0b3b22580101bf750383c2e48d34dea2124 jdk7u60-b10 +e57490e0b99917ea8e1da1bb4d0c57fd5b7705f9 jdk7u60-b11 diff -r 359b79d99538 -r 1fef0a819b0a .jcheck/conf --- a/.jcheck/conf Thu Jan 02 09:44:24 2014 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup From andrew at icedtea.classpath.org Wed Apr 2 01:21:12 2014 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Apr 2014 01:21:12 +0000 Subject: /hg/release/icedtea7-forest-2.5/jaxws: 10 new changesets Message-ID: changeset bef313c7ff7a in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=bef313c7ff7a author: katleman date: Thu Jan 16 11:52:10 2014 -0800 Added tag jdk7u60-b03 for changeset d4ba4e1ed3ec changeset 30afd3e2e704 in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=30afd3e2e704 author: katleman date: Wed Jan 22 12:34:09 2014 -0800 Added tag jdk7u60-b04 for changeset bef313c7ff7a changeset dc6017fb9cde in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=dc6017fb9cde author: katleman date: Wed Feb 05 12:31:12 2014 -0800 Added tag jdk7u60-b05 for changeset 30afd3e2e704 changeset 0380cb9d4dc2 in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=0380cb9d4dc2 author: katleman date: Wed Feb 12 14:56:32 2014 -0800 Added tag jdk7u60-b06 for changeset dc6017fb9cde changeset d3896e59b04d in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=d3896e59b04d author: katleman date: Wed Feb 19 14:04:17 2014 -0800 Added tag jdk7u60-b07 for changeset 0380cb9d4dc2 changeset c85645aa77ce in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=c85645aa77ce author: katleman date: Wed Feb 26 12:46:38 2014 -0800 Added tag jdk7u60-b08 for changeset d3896e59b04d changeset 79501d4561e4 in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=79501d4561e4 author: katleman date: Wed Mar 05 12:27:14 2014 -0800 Added tag jdk7u60-b09 for changeset c85645aa77ce changeset 5d848774565b in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=5d848774565b author: katleman date: Wed Mar 12 14:35:40 2014 -0700 Added tag jdk7u60-b10 for changeset 79501d4561e4 changeset 9d34f726e35b in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=9d34f726e35b author: katleman date: Wed Mar 19 10:04:21 2014 -0700 Added tag jdk7u60-b11 for changeset 5d848774565b changeset c3f7dc317cdb in /hg/release/icedtea7-forest-2.5/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=c3f7dc317cdb author: andrew date: Wed Apr 02 02:16:00 2014 +0100 Merge jdk7u60-b12 diffstat: .hgtags | 24 ++++++++++ .jcheck/conf | 2 - build.properties | 3 + build.xml | 14 ++++- src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 +++ 5 files changed, 45 insertions(+), 6 deletions(-) diffs (172 lines): diff -r d4ba4e1ed3ec -r c3f7dc317cdb .hgtags --- a/.hgtags Thu Jan 02 09:45:01 2014 -0800 +++ b/.hgtags Wed Apr 02 02:16:00 2014 +0100 @@ -50,6 +50,7 @@ 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75 +0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78 @@ -63,6 +64,7 @@ 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88 +1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91 @@ -111,6 +113,7 @@ 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 +339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139 @@ -123,6 +126,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 +e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 @@ -141,6 +145,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04 @@ -157,6 +162,7 @@ 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12 +1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01 @@ -186,11 +192,15 @@ c08f88f5ae98917254cd38e204393adac22823a6 jdk7u6-b10 a37ad8f90c7bd215d11996480e37f03eb2776ce2 jdk7u6-b11 95a96a879b8c974707a7ddb94e4fcd00e93d469c jdk7u6-b12 +4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b01 +4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b02 +4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b03 e0a71584b8d84d28feac9594d7bb1a981d862d7c jdk7u6-b13 9ae31559fcce636b8c219180e5db1d54556db5d9 jdk7u6-b14 f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17 +8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20 @@ -258,11 +268,13 @@ 42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07 66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08 c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09 +a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint 9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10 444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11 40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12 4fe9a362c3277cd4c7a5149853e5cf59dbba7cb7 jdk7u14-b13 a2b2e716637acdb9884d21fc4b9aef3c8b59e702 jdk7u14-b14 +53bd8e6a5ffabdc878a312509cf84a72020ddf9a ppc-aix-port-b04 b5c8ac5253ef735e5aa770b7325843ec89b56633 jdk7u14-b15 abcaebcead605f89cd0919add20d8ac16637ddc2 jdk7u15-b01 62f9e7f5eb644fedd93dd93bd36bcf817a8d9c8a jdk7u15-b02 @@ -381,6 +393,7 @@ 65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18 c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30 6802a1c098c48b2c8336e06f1565254759025bab jdk7u45-b31 +cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00 e040abab3625fbced33b30cba7c0307236268211 jdk7u45-b33 e7df5d6b23c64509672d262187f51cde14db4e66 jdk7u45-b34 5524cced32d3959d95ed414add230273bc10c38d jdk7u51-b00 @@ -402,3 +415,14 @@ cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00 f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01 8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02 +3f7212cae6eb1fe4b257adfbd05a7fce47c84bf0 icedtea-2.5pre01 +4aeccc3040fa45d7156dccb03984320cb75a0d73 icedtea-2.5pre02 +d4ba4e1ed3ecdef1ef7c3b7aaf62ff69fc105cb2 jdk7u60-b03 +bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u60-b04 +30afd3e2e7044b2aa87ce00ab4301990e6d94d27 jdk7u60-b05 +dc6017fb9cde43bce92d403abc2821b741cf977c jdk7u60-b06 +0380cb9d4dc27ed8e2c4fc3502e3d94b0ae0c02d jdk7u60-b07 +d3896e59b04dc4022c3e0d04e8750b281249bbd2 jdk7u60-b08 +c85645aa77cedabeeb6e01373cdd81afd56c602e jdk7u60-b09 +79501d4561e4cfa96fd77e2e92eb6a1b6ad61005 jdk7u60-b10 +5d848774565b5e188d7ba915ce1cb09d8f3fdb87 jdk7u60-b11 diff -r d4ba4e1ed3ec -r c3f7dc317cdb .jcheck/conf --- a/.jcheck/conf Thu Jan 02 09:45:01 2014 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r d4ba4e1ed3ec -r c3f7dc317cdb build.properties --- a/build.properties Thu Jan 02 09:45:01 2014 -0800 +++ b/build.properties Wed Apr 02 02:16:00 2014 +0100 @@ -58,6 +58,9 @@ build.dir=${output.dir}/build build.classes.dir=${build.dir}/classes +# JAXP built files +jaxp.classes.dir=${output.dir}/../jaxp/build/classes + # Distributed results dist.dir=${output.dir}/dist dist.lib.dir=${dist.dir}/lib diff -r d4ba4e1ed3ec -r c3f7dc317cdb build.xml --- a/build.xml Thu Jan 02 09:45:01 2014 -0800 +++ b/build.xml Wed Apr 02 02:16:00 2014 +0100 @@ -135,9 +135,15 @@ - + - + diff -r d4ba4e1ed3ec -r c3f7dc317cdb src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Thu Jan 02 09:45:01 2014 -0800 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Wed Apr 02 02:16:00 2014 +0100 @@ -67,6 +67,14 @@ SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); sf.setErrorHandler(errorFilter); + try { + // By default the SchemaFactory imposes a limit of 5000 on + // xsd:sequence maxOccurs if a SecurityManager is + // installed. This breaks the specification of xjc, + // causing TCK failures. + sf.setProperty("http://apache.org/xml/properties/security-manager", null); + } catch (SAXException e) { + } if( entityResolver != null ) { sf.setResourceResolver(new LSResourceResolver() { public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { From andrew at icedtea.classpath.org Wed Apr 2 01:21:22 2014 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Apr 2014 01:21:22 +0000 Subject: /hg/release/icedtea7-forest-2.5/langtools: 16 new changesets Message-ID: changeset 772aad4e9681 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=772aad4e9681 author: katleman date: Thu Jan 16 11:52:25 2014 -0800 Added tag jdk7u60-b03 for changeset 4170784840d5 changeset 744287fccf3b in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=744287fccf3b author: katleman date: Wed Jan 22 12:34:48 2014 -0800 Added tag jdk7u60-b04 for changeset 772aad4e9681 changeset 8f6db72756f3 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=8f6db72756f3 author: katleman date: Wed Feb 05 12:31:51 2014 -0800 Added tag jdk7u60-b05 for changeset 744287fccf3b changeset e63a64c50c0c in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=e63a64c50c0c author: katleman date: Wed Feb 12 14:57:01 2014 -0800 Added tag jdk7u60-b06 for changeset 8f6db72756f3 changeset ff6a1c2be8b8 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=ff6a1c2be8b8 author: bpatel date: Mon Feb 10 09:50:12 2014 -0800 8016328: Regression : Javadoc i18n regression caused by fix for 8012375 Reviewed-by: jjg changeset da87f2bc8fd9 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=da87f2bc8fd9 author: vromero date: Tue Feb 11 21:01:12 2014 +0000 8033294: javac, spurious warning for instanceof operator Reviewed-by: jjg, jlahoda changeset 02f050bc5569 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=02f050bc5569 author: lana date: Sat Feb 15 17:58:10 2014 -0800 Merge changeset be8e34e4920e in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=be8e34e4920e author: katleman date: Wed Feb 19 14:04:42 2014 -0800 Added tag jdk7u60-b07 for changeset 02f050bc5569 changeset 3f8b585403e5 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=3f8b585403e5 author: katleman date: Wed Feb 26 12:47:21 2014 -0800 Added tag jdk7u60-b08 for changeset be8e34e4920e changeset 5048b510be42 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=5048b510be42 author: katleman date: Wed Mar 05 12:27:59 2014 -0800 Added tag jdk7u60-b09 for changeset 3f8b585403e5 changeset f5883f43767d in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=f5883f43767d author: mfang date: Wed Mar 05 09:16:34 2014 -0800 8035988: 7u60 l10n resource file translation update 1 Reviewed-by: naoto, yhuang changeset 661c81c7f560 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=661c81c7f560 author: kizune date: Wed Feb 26 17:51:19 2014 +0400 7186887: Test T6567415.java can fail on a slow machine Reviewed-by: jjg, ksrini changeset 3ee98cd07065 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=3ee98cd07065 author: lana date: Wed Mar 05 16:26:11 2014 -0800 Merge changeset 3cc64ba8cf85 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=3cc64ba8cf85 author: katleman date: Wed Mar 12 14:36:05 2014 -0700 Added tag jdk7u60-b10 for changeset 3ee98cd07065 changeset b79b8b1dc88f in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=b79b8b1dc88f author: katleman date: Wed Mar 19 10:04:37 2014 -0700 Added tag jdk7u60-b11 for changeset 3cc64ba8cf85 changeset f38810d86876 in /hg/release/icedtea7-forest-2.5/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/langtools?cmd=changeset;node=f38810d86876 author: andrew date: Wed Apr 02 02:16:03 2014 +0100 Merge jdk7u60-b12 diffstat: .hgtags | 24 +++ .jcheck/conf | 2 - make/Makefile | 4 + make/build.properties | 3 +- make/build.xml | 2 +- src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java | 8 +- src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java | 45 ++++++- src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java | 11 +- src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties | 14 +- src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties | 46 ++++-- src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties | 14 +- src/share/classes/com/sun/tools/javac/code/Type.java | 6 +- src/share/classes/com/sun/tools/javac/code/Types.java | 52 ++++--- src/share/classes/com/sun/tools/javac/resources/javac_ja.properties | 10 +- src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties | 4 +- src/share/classes/com/sun/tools/javap/resources/javap_ja.properties | 63 ++++++++++ src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties | 63 ++++++++++ test/com/sun/javadoc/testHref/TestHref.java | 12 +- test/com/sun/javadoc/testJavascript/TestJavascript.java | 13 +- test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java | 10 +- test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java | 6 +- test/tools/javac/6567415/T6567415.java | 4 +- test/tools/javac/T5090006/broken.jar | Bin test/tools/javac/T8033294/RedundantWarningInIntersectionTest.java | 58 +++++++++ 24 files changed, 386 insertions(+), 88 deletions(-) diffs (truncated from 918 to 500 lines): diff -r 4170784840d5 -r f38810d86876 .hgtags --- a/.hgtags Thu Jan 02 10:11:59 2014 -0800 +++ b/.hgtags Wed Apr 02 02:16:03 2014 +0100 @@ -50,6 +50,7 @@ 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75 +83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78 @@ -63,6 +64,7 @@ ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88 +681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91 @@ -111,6 +113,7 @@ 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136 +8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139 @@ -123,6 +126,7 @@ 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01 58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147 +fb7fb3071b642334520e5b9f4a87ce28717af61c icedtea-2.0-branchpoint cd2cc8b5edb045b950aed46d159b4fb8fc2fd1df jdk7u1-b02 82820a30201dbf4b80f1916f3d0f4a92ad21b61a jdk7u1-b03 baa2c13c70fea3d6e259a34f0903197fdceb64b5 jdk7u1-b04 @@ -141,6 +145,7 @@ f0802d8a0909f66ce19d3d44b33ddf4943aee076 jdk7u2-b12 f474527e77e4797d78bd6c3b31923fddcfd9d5c6 jdk7u2-b13 fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u2-b21 +58f6a950cd726220e81eddb126ca5c57e3b368f2 icedtea-2.1-branchpoint fc0769df8cd03fffc38c7a1ab6b2e2e7cc2506a8 jdk7u3-b02 0ffc4995457773085f61c39f6d33edc242b41bcf jdk7u3-b03 f6de36b195cd315646213c7affd2cc15702edbfb jdk7u3-b04 @@ -157,6 +162,7 @@ 8919b2b02fcba65f833c68374f3bfdd9bc3ba814 jdk7u4-b10 4672e092f0968d503dc37f860b15ae7e2653f8d7 jdk7u4-b11 a4bf6a1aff54a98e9ff2b3fb53c719f658bec677 jdk7u4-b12 +e3537a4f75c7fcca16c349c3175bb0cdc2fbc29c icedtea-2.2-branchpoint 56eb9150d9ffdb71c47d72871e8ecc98b5f402de jdk7u4-b13 0e55881c2ee2984048c179d1e031cefb56a36bec jdk7u4-b14 0bea057f7ce1577e1b0306f2027c057e35394398 jdk7u5-b01 @@ -186,11 +192,15 @@ 21d2313dfeac8c52a04b837d13958c86346a4b12 jdk7u6-b10 13d3c624291615593b4299a273085441b1dd2f03 jdk7u6-b11 f0be10a26af08c33d9afe8fe51df29572d431bac jdk7u6-b12 +e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b01 +e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b02 +e3eeee75b861baf378d41adcd29ae70ed047eae7 ppc-aix-port-b03 fcebf337f5c1d342973573d9c6f758443c8aefcf jdk7u6-b13 35b2699c6243e9fb33648c2c25e97ec91d0e3553 jdk7u6-b14 47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15 5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16 66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17 +cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint 6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18 474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19 32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20 @@ -258,11 +268,13 @@ 382bab6d9682eefa2185a1643dfa32d65b6c20e5 jdk7u12-b07 7c0c3aeb2c603baba2cabba9adc5a0a49afb4f47 jdk7u12-b08 96c4f3ec63552a87a825baabd7f0dfafec299483 jdk7u12-b09 +85fb9d7ce4af53f0a47d2b73d983c96239f9ff33 icedtea-2.4-branchpoint e5b1403fa68abe3ac7174c031f19e6ecf77624a0 jdk7u14-b10 db94066df63468172e074d59e71d82dc874ed7cb jdk7u14-b11 f9a326e92fafc4724f0af550c2cba82fea202a31 jdk7u14-b12 5a52c6cc8db94b68eaacb42a9b4df30a40b09d82 jdk7u14-b13 5febc4e479fad801424cdcce90a0d463a2ef9223 jdk7u14-b14 +d52538e72925a1da7b1fcff051b591beeb2452b4 ppc-aix-port-b04 5fdb509d1f1a0533b14c61c92d77ff21e0ce2488 jdk7u14-b15 1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01 8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02 @@ -382,6 +394,7 @@ ba3ff27d4082f2cf0d06e635b2b6e01f80e78589 jdk7u45-b18 164cf7491ba2f371354ba343a604eee4c61c529d jdk7u45-b30 7f5cfaedb25c2c2774d6839810d6ae543557ca01 jdk7u45-b31 +849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00 ef7bdbe7f1fa42fd58723e541d9cdedcacb2649a jdk7u45-b33 bcb3e939d046d75436c7c8511600b6edce42e6da jdk7u45-b34 18d1864abca976ca68cb71612e9b20c908455d3d jdk7u51-b00 @@ -403,3 +416,14 @@ 849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00 b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01 954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02 +0d89cc5766d72e870eaf16696ec9b7b1ca4901fd icedtea-2.5pre01 +f75a642c2913e1ecbd22fc46812cffa2e7739169 icedtea-2.5pre02 +4170784840d510b4e8ae7ae250b92279aaf5eb25 jdk7u60-b03 +772aad4e9681828b8ee193b9ed971cbfe6c7f347 jdk7u60-b04 +744287fccf3b2c4fba2abf105863f0a44c3bd4da jdk7u60-b05 +8f6db72756f3e4c3cca8731d20e978fb741846d2 jdk7u60-b06 +02f050bc5569fb058ace44ed705bbb0f9022a6fe jdk7u60-b07 +be8e34e4920ebd1cfb89739d636e363c7881a548 jdk7u60-b08 +3f8b585403e596b7eadc231484f5480361c52c4b jdk7u60-b09 +3ee98cd07065dfa9a982e6692a3e875684a7e820 jdk7u60-b10 +3cc64ba8cf85942929b15c5ef21360f96db3b99c jdk7u60-b11 diff -r 4170784840d5 -r f38810d86876 .jcheck/conf --- a/.jcheck/conf Thu Jan 02 10:11:59 2014 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup diff -r 4170784840d5 -r f38810d86876 make/Makefile --- a/make/Makefile Thu Jan 02 10:11:59 2014 -0800 +++ b/make/Makefile Wed Apr 02 02:16:03 2014 +0100 @@ -111,6 +111,10 @@ ANT_OPTIONS += -Ddebug.classfiles=true endif +ifeq ($(JAVAC_WARNINGS_FATAL), false) + ANT_OPTIONS += -Djavac.warnings.fatal= +endif + # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # and the somewhat misnamed CLASS_VERSION (-target NN) ifdef TARGET_CLASS_VERSION diff -r 4170784840d5 -r f38810d86876 make/build.properties --- a/make/build.properties Thu Jan 02 10:11:59 2014 -0800 +++ b/make/build.properties Wed Apr 02 02:16:03 2014 +0100 @@ -68,7 +68,8 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = # in time, there should be no exceptions to -Xlint:all -javac.lint.opts = -Xlint:all,-deprecation -Werror +javac.warnings.fatal = -Werror +javac.lint.opts = -Xlint:all,-deprecation ${javac.warnings.fatal} # options for the task for javac #javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff -r 4170784840d5 -r f38810d86876 make/build.xml --- a/make/build.xml Thu Jan 02 10:11:59 2014 -0800 +++ b/make/build.xml Wed Apr 02 02:16:03 2014 +0100 @@ -877,7 +877,7 @@ + classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/> diff -r 4170784840d5 -r f38810d86876 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Thu Jan 02 10:11:59 2014 -0800 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Wed Apr 02 02:16:03 2014 +0100 @@ -181,12 +181,14 @@ String label, boolean strong, String stylename, String title, String target) { StringBuffer retlink = new StringBuffer(); + StringBuilder lnk = new StringBuilder(); retlink.append(" 127) {" + DocletConstants.NL + " allowNumber = true;" + DocletConstants.NL + " allowSep = true;" + DocletConstants.NL + " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL + diff -r 4170784840d5 -r f38810d86876 src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties --- a/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Thu Jan 02 10:11:59 2014 -0800 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties Wed Apr 02 02:16:03 2014 +0100 @@ -25,7 +25,7 @@ doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF doclet.Href_Class_Or_Interface_Title={0}\u5185\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -doclet.Summary=\u6982\u8981: +doclet.Summary=\u30B5\u30DE\u30EA\u30FC: doclet.Detail=\u8A73\u7D30: doclet.navNested=\u30CD\u30B9\u30C8 doclet.navAnnotationTypeOptionalMember=\u30AA\u30D7\u30B7\u30E7\u30F3 @@ -68,7 +68,7 @@ doclet.see.class_or_package_not_found=\u30BF\u30B0{0}: \u53C2\u7167\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: {1} doclet.see.class_or_package_not_accessible=\u30BF\u30B0{0}: \u53C2\u7167\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093: {1} doclet.see.malformed_tag={0}\u30BF\u30B0: \u4E0D\u6B63\u306A{1}\u30BF\u30B0 -doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u6982\u8981 +doclet.Inherited_API_Summary=\u7D99\u627F\u3055\u308C\u305FAPI\u306E\u30B5\u30DE\u30EA\u30FC doclet.Deprecated_API=\u975E\u63A8\u5968\u306EAPI doclet.Deprecated_Packages=\u975E\u63A8\u5968\u306E\u30D1\u30C3\u30B1\u30FC\u30B8 doclet.Deprecated_Classes=\u975E\u63A8\u5968\u306E\u30AF\u30E9\u30B9 @@ -135,18 +135,18 @@ doclet.Help_title=API\u30D8\u30EB\u30D7 doclet.Window_Help_title=API\u30D8\u30EB\u30D7 doclet.Help_line_1=API\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u69CB\u6210 -doclet.Help_line_2=\u3053\u306EAPI(Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002 -doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002 -doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u6982\u8981\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002 +doclet.Help_line_2=\u3053\u306EAPI (Application Programming Interface)\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306B\u306F\u3001\u6B21\u306B\u8AAC\u660E\u3059\u308B\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306B\u3042\u308B\u9805\u76EE\u306B\u5BFE\u5FDC\u3059\u308B\u30DA\u30FC\u30B8\u304C\u542B\u307E\u308C\u307E\u3059\u3002 +doclet.Help_line_3={0}\u30DA\u30FC\u30B8\u306FAPI\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D5\u30ED\u30F3\u30C8\u30FB\u30DA\u30FC\u30B8\u3067\u3001\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30B5\u30DE\u30EA\u30FC\u3092\u542B\u3080\u5168\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30EA\u30B9\u30C8\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u4E00\u9023\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u5168\u4F53\u7684\u306A\u8AAC\u660E\u3082\u8868\u793A\u3055\u308C\u307E\u3059\u3002 +doclet.Help_line_4=\u5404\u30D1\u30C3\u30B1\u30FC\u30B8\u306B\u306F\u3001\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8\u3068\u3001\u305D\u308C\u305E\u308C\u306E\u30B5\u30DE\u30EA\u30FC\u3092\u542B\u3080\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306F6\u3064\u306E\u30AB\u30C6\u30B4\u30EA\u3067\u69CB\u6210\u3055\u308C\u307E\u3059\u3002 doclet.Help_line_5=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u6982\u8981\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002 +doclet.Help_line_6=\u5404\u30AF\u30E9\u30B9\u3001\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u3001\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u500B\u5225\u306E\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30DA\u30FC\u30B8\u306B\u306F\u6B21\u306E\u3088\u3046\u306B\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E\u3068\u3001\u30B5\u30DE\u30EA\u30FC\u8868\u304A\u3088\u3073\u30E1\u30F3\u30D0\u30FC\u306E\u8A73\u7D30\u8AAC\u660E\u304C\u542B\u307E\u308C\u307E\u3059\u3002 doclet.Help_line_7=\u30AF\u30E9\u30B9\u968E\u5C64\u8868\u793A doclet.Help_line_8=\u76F4\u7CFB\u306E\u30B5\u30D6\u30AF\u30E9\u30B9 doclet.Help_line_9=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8 doclet.Help_line_10=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8 doclet.Help_line_11=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u5BA3\u8A00 doclet.Help_line_12=\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u8AAC\u660E -doclet.Help_line_13=\u5404\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306B\u306F\u3001\u305D\u306E\u9805\u76EE\u306E\u8A73\u7D30\u306A\u8AAC\u660E\u306E\u4E2D\u304B\u30891\u884C\u76EE\u306E\u6587\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u8A73\u7D30\u306A\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u304C\u3001\u6982\u8981\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u306B\u4E26\u3079\u3089\u308C\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002 +doclet.Help_line_13=\u5404\u30B5\u30DE\u30EA\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306B\u306F\u3001\u305D\u306E\u9805\u76EE\u306E\u8A73\u7D30\u8AAC\u660E\u306E\u4E2D\u304B\u30891\u884C\u76EE\u306E\u6587\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002\u30B5\u30DE\u30EA\u30FC\u30FB\u30A8\u30F3\u30C8\u30EA\u306F\u30A2\u30EB\u30D5\u30A1\u30D9\u30C3\u30C8\u9806\u3067\u3059\u304C\u3001\u8A73\u7D30\u8AAC\u660E\u306F\u30BD\u30FC\u30B9\u30FB\u30B3\u30FC\u30C9\u306B\u73FE\u308C\u308B\u9806\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u3053\u308C\u306B\u3088\u3063\u3066\u3001\u30D7\u30ED\u30B0\u30E9\u30DE\u304C\u8A2D\u5B9A\u3057\u305F\u8AD6\u7406\u7684\u306A\u30B0\u30EB\u30FC\u30D7\u5206\u3051\u304C\u4FDD\u6301\u3055\u308C\u307E\u3059\u3002 doclet.Help_line_14=\u4F7F\u7528 doclet.Help_line_15=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002 doclet.Help_line_16=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64) diff -r 4170784840d5 -r f38810d86876 src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Thu Jan 02 10:11:59 2014 -0800 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Wed Apr 02 02:16:03 2014 +0100 @@ -66,22 +66,22 @@ doclet.malformed_html_link_tag= \u30BF\u30B0\u306E\u5F62\u5F0F\u304C\u4E0D\u6B63:\n"{0}" doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002 doclet.javafx_tag_misuse=\u30BF\u30B0 at propertyGetter\u3001 at propertySetter\u304A\u3088\u3073 at propertyDescription\u306F\u3001JavaFX\u306E\u30D7\u30ED\u30D1\u30C6\u30A3getter\u3068setter\u306E\u307F\u3067\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 -doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u6982\u8981 -doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u6982\u8981 -doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u6982\u8981 -doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u6982\u8981 -doclet.Exception_Summary=\u4F8B\u5916\u306E\u6982\u8981 -doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u6982\u8981 -doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u6982\u8981 -doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u6982\u8981 -doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u6982\u8981 -doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u6982\u8981 -doclet.Field_Summary=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u6982\u8981 -doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u6982\u8981 -doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u6982\u8981 -doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u6982\u8981 -doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981 -doclet.Factory_Method_Summary=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u6982\u8981 +doclet.Package_Summary=\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Interface_Summary=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Annotation_Types_Summary=\u6CE8\u91C8\u578B\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Enum_Summary=\u5217\u6319\u578B\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Exception_Summary=\u4F8B\u5916\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Error_Summary=\u30A8\u30E9\u30FC\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Class_Summary=\u30AF\u30E9\u30B9\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Nested_Class_Summary=\u30CD\u30B9\u30C8\u3055\u308C\u305F\u30AF\u30E9\u30B9\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Annotation_Type_Optional_Member_Summary=\u4EFB\u610F\u8981\u7D20\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Annotation_Type_Required_Member_Summary=\u5FC5\u9808\u8981\u7D20\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Field_Summary=\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Property_Summary=\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Enum_Constant_Summary=\u5217\u6319\u578B\u5B9A\u6570\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC +doclet.Factory_Method_Summary=static\u30D5\u30A1\u30AF\u30C8\u30EA\u30FB\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 doclet.Enums=\u5217\u6319\u578B doclet.AnnotationTypes=\u6CE8\u91C8\u578B @@ -180,6 +180,16 @@ doclet.0_and_1={0}\u3068{1} #Documentation for Enums -doclet.enum_values_doc=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n

\nfor({0} c: {0}.values())\n  System.out.println(c);\n

\n at return \u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\n\u542B\u3080\u914D\u5217 +doclet.enum_values_doc.main=\n\u3053\u306E\u5217\u6319\u578B\u306E\u5B9A\u6570\u3092\u542B\u3080\u914D\u5217\u3092\u5BA3\u8A00\u3055\u308C\u3066\u3044\u308B\u9806\u5E8F\u3067\u8FD4\u3057\u307E\u3059\u3002\n\u3053\u306E\u30E1\u30BD\u30C3\u30C9\u306F\u6B21\u306E\u3088\u3046\u306B\u3057\u3066\u5B9A\u6570\u3092\u53CD\u5FA9\u3059\u308B\u305F\u3081\u306B\n\u4F7F\u7528\u3067\u304D\u307E\u3059:\n

\nfor({0} c: {0}.values())\n  System.out.println(c);\n

\nfor ({0} c : {0}.values())\n    System.out.println(c);\n

\n at return \u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4 +doclet.enum_values_doc.main=\n\u6309\u7167\u58F0\u660E\u8BE5\u679A\u4E3E\u7C7B\u578B\u7684\u5E38\u91CF\u7684\u987A\u5E8F, \u8FD4\u56DE\n\u5305\u542B\u8FD9\u4E9B\u5E38\u91CF\u7684\u6570\u7EC4\u3002\u8BE5\u65B9\u6CD5\u53EF\u7528\u4E8E\u8FED\u4EE3\n\u5E38\u91CF, \u5982\u4E0B\u6240\u793A:\n

\nfor ({0} c : {0}.values())\n    System.out.println(c);\n