/hg/release/icedtea7-forest-2.3/langtools: 63 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Aug 9 04:23:03 PDT 2013
changeset f7bb6dfa188a in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=f7bb6dfa188a
author: katleman
date: Fri Aug 17 11:58:23 2012 -0700
Added tag jdk7u6-b31 for changeset 2d6017454236
changeset 6e926880b893 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=6e926880b893
author: asaha
date: Thu Sep 13 18:32:32 2012 -0700
Merge
changeset 5d1a6a593fa1 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5d1a6a593fa1
author: asaha
date: Fri Oct 12 12:40:30 2012 -0700
Merge
changeset 0abc443a6867 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=0abc443a6867
author: katleman
date: Fri Mar 01 11:55:37 2013 -0800
Added tag jdk7u17-b02 for changeset 2782a1c60faf
changeset ded093700aef in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=ded093700aef
author: katleman
date: Thu Feb 07 14:21:18 2013 -0800
Added tag jdk7u21-b01 for changeset 8a12629ea213
changeset 82103a284427 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=82103a284427
author: ewendeli
date: Mon Feb 11 21:11:10 2013 +0100
Merge
changeset 9adfe6a84c38 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=9adfe6a84c38
author: katleman
date: Thu Feb 14 14:12:04 2013 -0800
Added tag jdk7u21-b02 for changeset 82103a284427
changeset dd2aef354fed in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=dd2aef354fed
author: katleman
date: Tue Feb 19 17:14:11 2013 -0800
Added tag jdk7u21-b03 for changeset 9adfe6a84c38
changeset 1d37792f52db in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=1d37792f52db
author: dmeetry
date: Wed Dec 05 23:44:21 2012 +0400
7192744: fix up tests to accommodate jtreg spec change
Reviewed-by: jjg
changeset c84d318736e4 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=c84d318736e4
author: dmeetry
date: Wed Dec 05 23:48:19 2012 +0400
7192449: fix up tests to accommodate jtreg spec change
Reviewed-by: jjg
changeset 71704143744e in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=71704143744e
author: dmeetry
date: Sat Dec 08 15:04:47 2012 +0400
8004391: Bug fix in jtreg causes test failures in pre jdk 8 langtools tests
Reviewed-by: jjg
changeset 884621bb9042 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=884621bb9042
author: katleman
date: Tue Feb 26 12:45:32 2013 -0800
Added tag jdk7u21-b04 for changeset 71704143744e
changeset acd27fc7fcf3 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=acd27fc7fcf3
author: katleman
date: Tue Oct 16 14:56:05 2012 -0700
Added tag jdk7u9-b31 for changeset 5d1a6a593fa1
changeset bcf19df20e97 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=bcf19df20e97
author: katleman
date: Wed Oct 31 10:13:07 2012 -0700
Added tag jdk7u9-b32 for changeset acd27fc7fcf3
changeset 57ef63c9c509 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=57ef63c9c509
author: asaha
date: Tue Dec 04 11:52:10 2012 -0800
Merge
changeset db426c20b069 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=db426c20b069
author: asaha
date: Wed Dec 05 15:34:54 2012 -0800
Merge
changeset 7a39876a28df in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=7a39876a28df
author: katleman
date: Fri Dec 07 08:19:37 2012 -0800
Added tag jdk7u10-b31 for changeset db426c20b069
changeset 92de02b43596 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=92de02b43596
author: ewendeli
date: Tue Jan 15 08:24:45 2013 +0100
Merge
changeset 309b5ccd0501 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=309b5ccd0501
author: katleman
date: Wed Jan 16 13:57:50 2013 -0800
Added tag jdk7u11-b32 for changeset 92de02b43596
changeset 04893d094547 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=04893d094547
author: katleman
date: Tue Jan 29 14:11:47 2013 -0800
Added tag jdk7u11-b33 for changeset 309b5ccd0501
changeset 39714d28cab1 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=39714d28cab1
author: asaha
date: Fri Feb 08 19:27:53 2013 -0800
Merge
changeset 2c82a733594a in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=2c82a733594a
author: asaha
date: Mon Feb 11 11:18:51 2013 -0800
Merge
changeset efb510942bb8 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=efb510942bb8
author: katleman
date: Tue Feb 12 12:33:27 2013 -0800
Added tag jdk7u15-b31 for changeset 2c82a733594a
changeset 5639dfc55f77 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5639dfc55f77
author: asaha
date: Thu Feb 14 13:25:53 2013 -0800
Merge
changeset 77d06fdfd5f4 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=77d06fdfd5f4
author: katleman
date: Tue Feb 19 12:03:22 2013 -0800
Added tag jdk7u15-b33 for changeset 5639dfc55f77
changeset e356f850e57e in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e356f850e57e
author: asaha
date: Fri Mar 01 16:15:57 2013 -0800
Merge
changeset e77e67364607 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e77e67364607
author: cl
date: Sat Mar 02 09:48:10 2013 -0800
Added tag jdk7u17-b30 for changeset 0abc443a6867
changeset 1a9b32d36ff8 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=1a9b32d36ff8
author: asaha
date: Sat Mar 02 14:41:25 2013 -0800
Merge
changeset a91bdaf125d8 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=a91bdaf125d8
author: cl
date: Sat Mar 02 18:57:01 2013 -0800
Added tag jdk7u17-b31 for changeset 1a9b32d36ff8
changeset 0970c2290284 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=0970c2290284
author: asaha
date: Mon Mar 04 11:49:57 2013 -0800
Merge
changeset 5e0127eb56c3 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5e0127eb56c3
author: katleman
date: Tue Mar 05 16:46:38 2013 -0800
Added tag jdk7u21-b05 for changeset 0970c2290284
changeset 08034557136e in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=08034557136e
author: katleman
date: Tue Mar 12 14:44:28 2013 -0700
Added tag jdk7u21-b06 for changeset 5e0127eb56c3
changeset f3c75c441d56 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=f3c75c441d56
author: katleman
date: Tue Mar 19 14:34:10 2013 -0700
Added tag jdk7u21-b07 for changeset 08034557136e
changeset b6c7a18b668b in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=b6c7a18b668b
author: katleman
date: Wed Mar 20 14:47:51 2013 -0700
Added tag jdk7u21-b08 for changeset f3c75c441d56
changeset de06078efe70 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=de06078efe70
author: katleman
date: Tue Mar 26 15:00:49 2013 -0700
Added tag jdk7u21-b09 for changeset b6c7a18b668b
changeset e120818fc321 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e120818fc321
author: katleman
date: Sun Mar 31 03:47:06 2013 -0700
Added tag jdk7u21-b10 for changeset de06078efe70
changeset ff6f8ab2635c in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=ff6f8ab2635c
author: katleman
date: Thu Apr 04 15:48:50 2013 -0700
Added tag jdk7u21-b11 for changeset e120818fc321
changeset a87ad97e80ae in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=a87ad97e80ae
author: katleman
date: Fri Apr 05 12:49:15 2013 -0700
Added tag jdk7u21-b30 for changeset ff6f8ab2635c
changeset ac996e233aa3 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=ac996e233aa3
author: katleman
date: Sun Apr 07 16:35:05 2013 -0700
Added tag jdk7u21-b12 for changeset a87ad97e80ae
changeset 1311e3618232 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=1311e3618232
author: katleman
date: Tue Mar 12 14:45:32 2013 -0700
Added tag jdk7u25-b01 for changeset 884621bb9042
changeset 18678048fc76 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=18678048fc76
author: katleman
date: Tue Mar 19 14:32:03 2013 -0700
Added tag jdk7u25-b02 for changeset 1311e3618232
changeset 8dc40e209a12 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=8dc40e209a12
author: coffeys
date: Thu Mar 21 22:39:38 2013 +0000
Merge
changeset d7f974b867c4 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=d7f974b867c4
author: katleman
date: Tue Mar 26 14:18:11 2013 -0700
Added tag jdk7u25-b03 for changeset 8dc40e209a12
changeset 1a955ffd506d in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=1a955ffd506d
author: katleman
date: Tue Apr 02 12:12:31 2013 -0700
Added tag jdk7u25-b04 for changeset d7f974b867c4
changeset 481a0485b4db in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=481a0485b4db
author: coffeys
date: Fri Apr 05 21:35:21 2013 +0100
Merge
changeset 5fd3518bb375 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5fd3518bb375
author: katleman
date: Mon Mar 04 14:17:33 2013 -0800
Added tag jdk7u17-b32 for changeset a91bdaf125d8
changeset 98645465330d in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=98645465330d
author: asaha
date: Mon Apr 08 16:01:09 2013 -0700
Merge
changeset e8d01d8ee8f5 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e8d01d8ee8f5
author: asaha
date: Mon Apr 08 16:35:49 2013 -0700
Merge
changeset 25489e38393b in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=25489e38393b
author: katleman
date: Wed Apr 10 12:43:17 2013 -0700
Added tag jdk7u25-b05 for changeset e8d01d8ee8f5
changeset 11fd425a3ebe in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=11fd425a3ebe
author: katleman
date: Tue Apr 16 11:28:18 2013 -0700
Added tag jdk7u25-b06 for changeset 25489e38393b
changeset edaa697ef947 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=edaa697ef947
author: katleman
date: Thu Apr 18 11:44:35 2013 -0700
Added tag jdk7u25-b07 for changeset 11fd425a3ebe
changeset 4dbd21d15a39 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=4dbd21d15a39
author: katleman
date: Tue Apr 23 16:23:22 2013 -0700
Added tag jdk7u25-b08 for changeset edaa697ef947
changeset 17ee569d0c01 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=17ee569d0c01
author: bpatel
date: Fri Apr 26 15:24:12 2013 -0700
8012375: Improve Javadoc framing
Reviewed-by: mduigou, jlaskey
changeset 41c1b02cd6a8 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=41c1b02cd6a8
author: katleman
date: Tue Apr 30 12:25:50 2013 -0700
Added tag jdk7u25-b09 for changeset 17ee569d0c01
changeset 0da9ef0d9fc5 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=0da9ef0d9fc5
author: katleman
date: Tue May 07 12:57:11 2013 -0700
Added tag jdk7u25-b10 for changeset 41c1b02cd6a8
changeset 28358b2489b2 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=28358b2489b2
author: katleman
date: Wed May 15 13:31:33 2013 -0700
Added tag jdk7u25-b11 for changeset 0da9ef0d9fc5
changeset 5ed8c4534800 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5ed8c4534800
author: katleman
date: Wed May 22 15:45:12 2013 -0700
Added tag jdk7u25-b12 for changeset 28358b2489b2
changeset c6342ec6a12f in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=c6342ec6a12f
author: katleman
date: Fri May 24 16:20:45 2013 -0700
Added tag jdk7u25-b13 for changeset 5ed8c4534800
changeset e1f27e4e180d in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=e1f27e4e180d
author: katleman
date: Tue Jun 04 10:47:59 2013 -0700
Added tag jdk7u25-b14 for changeset c6342ec6a12f
changeset 3b8323e24a63 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=3b8323e24a63
author: bpatel
date: Wed Jun 05 14:31:54 2013 -0700
8015998: Additional improvement in Javadoc framing
Reviewed-by: jjg
changeset 5d95c1e7c091 in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=5d95c1e7c091
author: katleman
date: Thu Jun 06 11:41:55 2013 -0700
Added tag jdk7u25-b15 for changeset 3b8323e24a63
changeset 7294a7be7dbd in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=7294a7be7dbd
author: katleman
date: Tue Jun 11 11:45:38 2013 -0700
Added tag jdk7u25-b30 for changeset 5d95c1e7c091
changeset f5971bf5bc5e in /hg/release/icedtea7-forest-2.3/langtools
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools?cmd=changeset;node=f5971bf5bc5e
author: andrew
date: Thu Aug 08 23:17:58 2013 +0100
Merge jdk7u25-b16
diffstat:
.hgtags | 106 ++++++++++
.jcheck/conf | 2 -
make/Makefile | 4 +
make/build.properties | 3 +-
make/build.xml | 2 +-
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java | 38 +++-
test/com/sun/javadoc/testJavascript/TestJavascript.java | 42 +++-
test/tools/javac/processing/6348499/T6348499.java | 5 +-
test/tools/javac/processing/6414633/T6414633.java | 17 +-
test/tools/javac/processing/6430209/T6430209.java | 5 +-
test/tools/javac/processing/T6920317.java | 6 +-
11 files changed, 210 insertions(+), 20 deletions(-)
diffs (458 lines):
diff -r 2d6017454236 -r f5971bf5bc5e .hgtags
--- a/.hgtags Mon Aug 13 14:20:12 2012 -0700
+++ b/.hgtags Thu Aug 08 23:17:58 2013 +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
@@ -191,6 +197,7 @@
47ae28da508861d77ee6dd408d822acf507b28ec jdk7u6-b15
5c7763489f4d2727c6d9de11f4114fb8ed839042 jdk7u6-b16
66c671f28cb2840ceec5b44c44bac073fc0b4256 jdk7u6-b17
+cee31ee38a190f77b1e21c0515bb28802dcd9678 icedtea-2.3-branchpoint
6aa859ef42876c51bb1b1d7fb4db32a916a7dcaa jdk7u6-b18
474a52eeeafb1feccffda68b96f651e65415c01d jdk7u6-b19
32acb67a79531daf678577c7ef1bde1867da807d jdk7u6-b20
@@ -199,3 +206,102 @@
dd3e29d8892fcaba6d76431d5fa9d49e7c088f76 jdk7u6-b23
6aac89e84fc96d15bb78b13aa71c9e6b73d7237e jdk7u6-b24
bcd1d067d525065630deb98b678bc00b499adbe1 jdk7u6-b30
+ca0a82364e5fe1ae03911c90732b226d2482b77c icedtea-2.3
+4ccca0a55ed66de7e7482b5f2a9222ec44bea699 icedtea-2.3.1
+0cf6181d44db827cb1a341f5936ce43cc489fd08 icedtea-2.3.2
+867d5041bee60ea67ee56c5990a82a0215cc4959 icedtea-2.3.3
+ec73c6927fb72f1034cde0be9dadb4eaffd6b338 icedtea-2.3.4
+946195011b307a48ad0d9f1aecfb689bba7c5d82 icedtea-2.3.5
+afdfcc0ca555b69a5d9ddec458c0036a318b63b9 icedtea-2.3.6
+afdfcc0ca555b69a5d9ddec458c0036a318b63b9 icedtea-2.3.6
+0000000000000000000000000000000000000000 icedtea-2.3.6
+2d6017454236d4e95aad7feaff5fc92a612598f4 jdk7u6-b31
+2d6017454236d4e95aad7feaff5fc92a612598f4 jdk7u7-b10
+27041587508dbc4e08c956ba98a11ce0d5608dc4 jdk7u7-b30
+b92a9f4f6bce4ec500ed3adb8203e6424b579f94 jdk7u7-b11
+f0fd7463f02ea681ca53022d6d0d425ec1584b34 jdk7u7-b31
+6bfc26fc14a0650805dd6583048db0b4f8669844 jdk7u7-b01
+0d4cb328938002fa9a2efc8190ea97beae3230a9 jdk7u7-b02
+04848e261e42c697cb70401f8059186434855f33 jdk7u9-b03
+0000000000000000000000000000000000000000 jdk7u7-b01
+6bfc26fc14a0650805dd6583048db0b4f8669844 jdk7u9-b01
+0000000000000000000000000000000000000000 jdk7u7-b02
+0d4cb328938002fa9a2efc8190ea97beae3230a9 jdk7u9-b02
+9148cdb9a18b55ad7d51bb9644b6db812de34eea jdk7u9-b04
+1de4a0865a714076b4922a9a7119adb98aee23f2 jdk7u9-b05
+5d1a6a593fa17933683b34ea3a55c7d13c028a13 jdk7u9-b31
+acd27fc7fcf3e9dc0a1ae7e101cc036e960b6295 jdk7u9-b32
+8dfbebb98865d822ddd9e0b9641d21e8bdb8a866 jdk7u10-b10
+01c6dde274bd520067264231b3015c37e8e62d24 jdk7u10-b11
+1fb02747d3bce646374c2cab95048c516cec6b01 jdk7u10-b12
+14735b3d8bdffc7892f1db04b6262bdaad2eb9d7 jdk7u10-b13
+f555fcdbd07156ee11b25fb4ac106065bbf496b4 jdk7u10-b14
+dfcd16ac3fbcabed815b8ef4e792716cce0bce21 jdk7u10-b15
+eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u10-b16
+7101b3e80e96b000b0b4f0bd7fe4dd7910d02f74 jdk7u10-b17
+4f529e320d83f517a55065b4710c7f1e5ff692c9 jdk7u10-b18
+1e5aed8511b9bea5c2ebe51a2d9094be8bac73cc jdk7u10-b30
+db426c20b06918feeeaa036d52a5096c2bb646b0 jdk7u10-b31
+b01338429ab6821f44d19601de433b538942b53d jdk7u11-b20
+aeef1c7e43bc2d4a0960ebf42b642f7a34ec8afc jdk7u11-b21
+92de02b43596ea1d01c87d56dbc9acc0960a90c3 jdk7u11-b32
+309b5ccd0501d48fa7eed29e45197b4101de4683 jdk7u11-b33
+eaa8a0141c35edc382d7ce0b1148912db8422b16 jdk7u11-b03
+e8071ede35dc5948f5ed127941be192a4a8c1ebd jdk7u11-b04
+17b9bb22f3fd6a624879a29a3fc4b252327c113d jdk7u11-b05
+96c8b3b817aa3e672f78f1d5006616104378ff29 jdk7u11-b06
+c5d3dabddff76c92425cbf6a99ed4e066d16b4fd jdk7u11-b07
+a0d9abc405580d6fa0ae217fab96608285a38c41 jdk7u11-b08
+a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u13-b09
+0000000000000000000000000000000000000000 icedtea-2.3.6
+812eeff322ccb47cd1aa9b6f1dd9c9587c3fe911 icedtea-2.3.6
+e0739a8783d19aded13ea9160fa2c87419b98664 icedtea-2.3.7
+b5006c3285c6a39e2b33d5f38b8e72329136ee81 icedtea-2.3.8
+761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b10
+8a12629ea21378f96666628f472cd9a6936a4933 jdk7u13-b30
+761b933e269693fd689c2af5d8317201b2172dbb jdk7u13-b20
+1298307076c2f0c2a4acd3a2a132cbe98d399009 jdk7u15-b01
+8db0105f00ce9fe6899ece52d46d78995111c456 jdk7u15-b02
+b00c1580ffa95d9edd567835e1b9a77cf8ca2af6 jdk7u15-b30
+2c82a733594aef14f7a91a910c6b7b20e6220078 jdk7u15-b31
+5639dfc55f771823fab02438e5c89c6b18f57d07 jdk7u15-b33
+c160d7d1616d099afad0986b7d06aee2d9405e57 jdk7u15-b03
+a778aaf53c52f78c92f29a1220d9f46de94c9247 jdk7u15-b32
+edfcf07c2877af8efa649e514167b22b7f6fc0b4 jdk7u17-b01
+fd956199cb8213f9af95b694ebdde6aa1fd7f53a icedtea-2.3.9
+8cf15d334ad372f540d7504212cc21ff7a223852 icedtea-2.3.10
+e2c5f493844a842ec31d5979825e4f35d9dd9bdb icedtea-2.3.11
+6c9b532f428152081b7a610de342e6e90d9cbcb3 icedtea-2.3.12
+2782a1c60faf7585dee0af0ef585aeed3288e521 jdk7u17-b02
+0abc443a68676c7231b274a324d27204c735acac jdk7u17-b30
+1a9b32d36ff86136549f20156cf3e821295228a0 jdk7u17-b31
+a91bdaf125d89b8b2c6ff86c8055aab3b7d2546c jdk7u17-b32
+8a12629ea21378f96666628f472cd9a6936a4933 jdk7u21-b01
+82103a284427a2512fe884d8f232f1a83d46beb6 jdk7u21-b02
+9adfe6a84c3884d5c24f6655e89546a6e0a80129 jdk7u21-b03
+71704143744ee46f105bf1bf3e4b7aecaf9c1003 jdk7u21-b04
+0970c229028499d5348d77712edf42d712538441 jdk7u21-b05
+5e0127eb56c3f70bdf67a5b2c57cf218838371ae jdk7u21-b06
+08034557136e484b3a7c4d0ec9b21e57ea9cd30b jdk7u21-b07
+f3c75c441d5623186e43de0b5a645e12fc360c29 jdk7u21-b08
+b6c7a18b668b85bdc41914b2b354c1928deb659e jdk7u21-b09
+de06078efe709392d7faf44803d54b74599f6bda jdk7u21-b10
+e120818fc321b5d9d8573a58bf5f6a6eb7471229 jdk7u21-b11
+ff6f8ab2635c6e0b0f6bb1a68dca48b4fc31b107 jdk7u21-b30
+a87ad97e80ae1861143b477d8a8990dc6ecc9173 jdk7u21-b12
+884621bb9042cd4a06e230307f1e26f1c518346d jdk7u25-b01
+1311e3618232058b09fe7ea25eda4af8d3fe6807 jdk7u25-b02
+8dc40e209a12638ea18bb7ee436051768afa5d39 jdk7u25-b03
+d7f974b867c4cf771ab749871c2ff4d3f869f13f jdk7u25-b04
+e8d01d8ee8f547f97d8670157ddf5a798459b85a jdk7u25-b05
+25489e38393b7c70fb826069d50860fbc409d11d jdk7u25-b06
+11fd425a3ebee6fa02bd684d356300b3619e5e7a jdk7u25-b07
+edaa697ef947de30b940bef0a546590d09c99cd3 jdk7u25-b08
+17ee569d0c0130824ba27bc1b090114e6075c5f2 jdk7u25-b09
+41c1b02cd6a8fa7746752cc911da3dd4d380098d jdk7u25-b10
+0da9ef0d9fc5b017f960d65ae0cd07860a259621 jdk7u25-b11
+28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12
+5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13
+c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14
+3b8323e24a636ac0638604d19fc116eb0eef6cdb jdk7u25-b15
+5d95c1e7c0913ad4bc0b5f0b559510d32557def2 jdk7u25-b30
diff -r 2d6017454236 -r f5971bf5bc5e .jcheck/conf
--- a/.jcheck/conf Mon Aug 13 14:20:12 2012 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 2d6017454236 -r f5971bf5bc5e make/Makefile
--- a/make/Makefile Mon Aug 13 14:20:12 2012 -0700
+++ b/make/Makefile Thu Aug 08 23:17:58 2013 +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 2d6017454236 -r f5971bf5bc5e make/build.properties
--- a/make/build.properties Mon Aug 13 14:20:12 2012 -0700
+++ b/make/build.properties Thu Aug 08 23:17:58 2013 +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 <javadoc> task for javac
#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
diff -r 2d6017454236 -r f5971bf5bc5e make/build.xml
--- a/make/build.xml Mon Aug 13 14:20:12 2012 -0700
+++ b/make/build.xml Thu Aug 08 23:17:58 2013 +0100
@@ -877,7 +877,7 @@
</javac>
<taskdef name="genstubs"
classname="GenStubs$$Ant"
- classpath="${build.toolclasses.dir}/"/>
+ classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
</target>
<target name="-def-javadoc-tool" depends="-check-target.java.home">
diff -r 2d6017454236 -r f5971bf5bc5e src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Mon Aug 13 14:20:12 2012 -0700
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Thu Aug 08 23:17:58 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -312,8 +312,42 @@
String scriptCode = DocletConstants.NL + " targetPage = \"\" + window.location.search;" + DocletConstants.NL +
" if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
" targetPage = targetPage.substring(1);" + DocletConstants.NL +
- " if (targetPage.indexOf(\":\") != -1)" + DocletConstants.NL +
+ " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
" targetPage = \"undefined\";" + DocletConstants.NL +
+ " function validURL(url) {" + DocletConstants.NL +
+ " var pos = url.indexOf(\".html\");" + DocletConstants.NL +
+ " if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL +
+ " return false;" + DocletConstants.NL +
+ " var allowNumber = false;" + DocletConstants.NL +
+ " var allowSep = false;" + DocletConstants.NL +
+ " var seenDot = false;" + DocletConstants.NL +
+ " for (var i = 0; i < url.length - 5; i++) {" + DocletConstants.NL +
+ " var ch = url.charAt(i);" + DocletConstants.NL +
+ " if ('a' <= ch && ch <= 'z' ||" + DocletConstants.NL +
+ " 'A' <= ch && ch <= 'Z' ||" + DocletConstants.NL +
+ " ch == '$' ||" + DocletConstants.NL +
+ " ch == '_') {" + DocletConstants.NL +
+ " allowNumber = true;" + DocletConstants.NL +
+ " allowSep = true;" + DocletConstants.NL +
+ " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL +
+ " || ch == '-') {" + DocletConstants.NL +
+ " if (!allowNumber)" + DocletConstants.NL +
+ " return false;" + DocletConstants.NL +
+ " } else if (ch == '/' || ch == '.') {" + DocletConstants.NL +
+ " if (!allowSep)" + DocletConstants.NL +
+ " return false;" + DocletConstants.NL +
+ " allowNumber = false;" + DocletConstants.NL +
+ " allowSep = false;" + DocletConstants.NL +
+ " if (ch == '.')" + DocletConstants.NL +
+ " seenDot = true;" + DocletConstants.NL +
+ " if (ch == '/' && seenDot)" + DocletConstants.NL +
+ " return false;" + DocletConstants.NL +
+ " } else {" + DocletConstants.NL +
+ " return false;"+ DocletConstants.NL +
+ " }" + DocletConstants.NL +
+ " }" + DocletConstants.NL +
+ " return true;" + DocletConstants.NL +
+ " }" + DocletConstants.NL +
" function loadFrames() {" + DocletConstants.NL +
" if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
" top.classFrame.location = top.targetPage;" + DocletConstants.NL +
diff -r 2d6017454236 -r f5971bf5bc5e test/com/sun/javadoc/testJavascript/TestJavascript.java
--- a/test/com/sun/javadoc/testJavascript/TestJavascript.java Mon Aug 13 14:20:12 2012 -0700
+++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java Thu Aug 08 23:17:58 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4665566 4855876 7025314
+ * @bug 4665566 4855876 7025314 8012375 8015998
* @summary Verify that the output has the right javascript.
* @author jamieh
* @library ../lib/
@@ -35,7 +35,7 @@
public class TestJavascript extends JavadocTester {
//Test information.
- private static final String BUG_ID = "4665566-4855876";
+ private static final String BUG_ID = "4665566-4855876-8012375";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
@@ -53,8 +53,42 @@
" targetPage = \"\" + window.location.search;" + NL +
" if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
" targetPage = targetPage.substring(1);" + NL +
- " if (targetPage.indexOf(\":\") != -1)" + NL +
+ " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
" targetPage = \"undefined\";" + NL +
+ " function validURL(url) {" + NL +
+ " var pos = url.indexOf(\".html\");" + NL +
+ " if (pos == -1 || pos != url.length - 5)" + NL +
+ " return false;" + NL +
+ " var allowNumber = false;" + NL +
+ " var allowSep = false;" + NL +
+ " var seenDot = false;" + NL +
+ " for (var i = 0; i < url.length - 5; i++) {" + NL +
+ " var ch = url.charAt(i);" + NL +
+ " if ('a' <= ch && ch <= 'z' ||" + NL +
+ " 'A' <= ch && ch <= 'Z' ||" + NL +
+ " ch == '$' ||" + NL +
+ " ch == '_') {" + NL +
+ " allowNumber = true;" + NL +
+ " allowSep = true;" + NL +
+ " } else if ('0' <= ch && ch <= '9'" + NL +
+ " || ch == '-') {" + NL +
+ " if (!allowNumber)" + NL +
+ " return false;" + NL +
+ " } else if (ch == '/' || ch == '.') {" + NL +
+ " if (!allowSep)" + NL +
+ " return false;" + NL +
+ " allowNumber = false;" + NL +
+ " allowSep = false;" + NL +
+ " if (ch == '.')" + NL +
+ " seenDot = true;" + NL +
+ " if (ch == '/' && seenDot)" + NL +
+ " return false;" + NL +
+ " } else {" + NL +
+ " return false;" + NL +
+ " }" + NL +
+ " }" + NL +
+ " return true;" + NL +
+ " }" + NL +
" function loadFrames() {" + NL +
" if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
" top.classFrame.location = top.targetPage;" + NL +
diff -r 2d6017454236 -r f5971bf5bc5e test/tools/javac/processing/6348499/T6348499.java
--- a/test/tools/javac/processing/6348499/T6348499.java Mon Aug 13 14:20:12 2012 -0700
+++ b/test/tools/javac/processing/6348499/T6348499.java Thu Aug 08 23:17:58 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -47,6 +47,7 @@
public static void main(String... args) {
String testSrc = System.getProperty("test.src", ".");
String testClasses = System.getProperty("test.classes");
+ String testClassPath = System.getProperty("test.class.path", testClasses);
String A_java = new File(testSrc, "A.java").getPath();
JavacTool tool = JavacTool.create();
MyDiagListener dl = new MyDiagListener();
@@ -55,7 +56,7 @@
fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, "A.java")));
Iterable<String> opts = Arrays.asList("-proc:only",
"-processor", "A",
- "-processorpath", testClasses);
+ "-processorpath", testClassPath);
StringWriter out = new StringWriter();
JavacTask task = tool.getTask(out, fm, dl, opts, null, files);
task.call();
diff -r 2d6017454236 -r f5971bf5bc5e test/tools/javac/processing/6414633/T6414633.java
--- a/test/tools/javac/processing/6414633/T6414633.java Mon Aug 13 14:20:12 2012 -0700
+++ b/test/tools/javac/processing/6414633/T6414633.java Thu Aug 08 23:17:58 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -43,20 +43,20 @@
public static void main(String... args) {
String testSrc = System.getProperty("test.src", ".");
String testClasses = System.getProperty("test.classes", ".");
+ String testClassPath = System.getProperty("test.class.path", testClasses);
JavacTool tool = JavacTool.create();
MyDiagListener dl = new MyDiagListener();
StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null);
try {
- fm.setLocation(StandardLocation.CLASS_PATH, Arrays.asList(new File(testClasses)));
+ fm.setLocation(StandardLocation.CLASS_PATH, pathToFiles(testClassPath));
} catch (IOException e) {
throw new AssertionError(e);
}
Iterable<? extends JavaFileObject> files =
fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, A.class.getName()+".java")));
String[] opts = { "-proc:only",
- "-processor", A.class.getName(),
- "-classpath", testClasses + System.getProperty("path.separator") + "../../lib" };
+ "-processor", A.class.getName() };
JavacTask task = tool.getTask(null, fm, dl, Arrays.asList(opts), null, files);
task.call();
@@ -65,6 +65,15 @@
throw new AssertionError(dl.diags + " diagnostics reported");
}
+ private static List<File> pathToFiles(String path) {
+ List<File> list = new ArrayList<File>();
+ for (String s: path.split(File.pathSeparator)) {
+ if (!s.isEmpty())
+ list.add(new File(s));
+ }
+ return list;
+ }
+
private static class MyDiagListener implements DiagnosticListener<JavaFileObject>
{
public void report(Diagnostic d) {
diff -r 2d6017454236 -r f5971bf5bc5e test/tools/javac/processing/6430209/T6430209.java
--- a/test/tools/javac/processing/6430209/T6430209.java Mon Aug 13 14:20:12 2012 -0700
+++ b/test/tools/javac/processing/6430209/T6430209.java Thu Aug 08 23:17:58 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -56,6 +56,7 @@
// -proc:only -processor b6341534 -cp . ./src/*.java
String testSrc = System.getProperty("test.src", ".");
String testClasses = System.getProperty("test.classes") + System.getProperty("path.separator") + "../../lib";
+ String testClassPath = System.getProperty("test.class.path", testClasses);
JavacTool tool = JavacTool.create();
MyDiagListener dl = new MyDiagListener();
StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null);
@@ -64,7 +65,7 @@
new File(testSrc, "test0.java"), new File(testSrc, "test1.java")));
Iterable<String> opts = Arrays.asList("-proc:only",
"-processor", "b6341534",
- "-processorpath", testClasses);
+ "-processorpath", testClassPath);
StringWriter out = new StringWriter();
JavacTask task = tool.getTask(out, fm, dl, opts, null, files);
task.call();
diff -r 2d6017454236 -r f5971bf5bc5e test/tools/javac/processing/T6920317.java
--- a/test/tools/javac/processing/T6920317.java Mon Aug 13 14:20:12 2012 -0700
+++ b/test/tools/javac/processing/T6920317.java Thu Aug 08 23:17:58 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -156,7 +156,9 @@
String expect = null;
opts.add("-processorpath");
- opts.add(System.getProperty("test.classes"));
+ String testClasses = System.getProperty("test.classes");
+ String testClassPath = System.getProperty("test.class.path", testClasses);
+ opts.add(testClassPath);
opts.add("-processor");
opts.add(Processor.class.getName());
opts.add("-proc:only");
More information about the distro-pkg-dev
mailing list