Merge

4690407: JAR tool: option -i can't be combined with other options Summary: -i can't combined with cxut, do sanity check on options Reviewed-by: martin

Merge

4691425: GZIPInputStream fails to read concatenated .gz files Summary: to support concatenated .gz streams Reviewed-by: martin

6932525: Incorrect encryption types of KDC_REQ_BODY of AS-REQ with pre-authentication Reviewed-by: valeriep

6948781: CertificateFactory.generateCertificate doesn't throw CertificateException for malformed certificate Reviewed-by: mullan

6882687: KerberosTime too imprecise Reviewed-by: valeriep

6954621: small error in 6948909 Reviewed-by: xuelei

6948803: CertPath validation regression caused by SHA1 replacement root and MD2 disable feature Reviewed-by: xuelei, mullan

6773270: java.net.URI fails to escape \u0000 Summary: check for \u0000 Reviewed-by: alanb

6954064: Fix the windows arch settings in the makefiles and chmod logic in test/Makefile Reviewed-by: wetmore

6945564: Unicode script support in Character class 6948903: Make Unicode scripts available for use in regular expressions Summary: added Unicode script suport Reviewed-by: martin

6951599: Rename package of security tools for modularization Summary: Move PolicyTool to sun.security.tools.policytool package Reviewed-by: weijun

4853493: GZIPOutputStream passes a reference to a private array into an untrusted method Summary: create a new header byte array for each header writeout Reviewed-by: martin

4813885: RFE: GZIPOutputStream should implement flush using Z_SYNC_FLUSH Summary: Added new constructors to allow flush() work in Z_SYNC_FLUSH mode Reviewed-by: martin

4465490: Suspicious about double-check locking idiom being used in the code Summary: to use volatile for the double-checked object Reviewed-by: weijun

4263582: RFE: GZIPInputStream throws IOException on non-gzipped data Summary: throw ZipException instead of IOException Reviewed-by: martin

6952701: Use http://www.ietf.org/rfc for rfc references in jdk public APIs Summary: replace www.isi.edu/in-notes with www.ietf.org/rfc Reviewed-by: martin

6952330: Fix for 6933217 broke contract of StringBuffer.ensureCapacity Summary: make sure to grow with size => size * 2 + 2 Reviewed-by: dholmes, chegar, ohair

6951064: Typo in javadoc for ZipException ctors Summary: fixed the doc typo Reviewed-by: martin

6951887: Wrong redirection useage in test sun/nio/cs/Test4200310.sh Summary: Testcase correction. Reviewed-by: sherman

6943915: Adjust jdk/test/Makefile to deal with .dll and .so libraries needing execute permissions Summary: And adjustments to test problem list. Reviewed-by: jjg

6951661: Eliminate jvmstat dependency on sun.management.counter Summary: jvmstat keeps its own copy of Units and Variability class Reviewed-by: alanb

Merge

Merge

6670274: Incorrect tab titles for JTabbedPane if using HTML (BasicTabbedPanelUI problem) Reviewed-by: rupashka

6889007: No resize cursor during hovering mouse over JTable Reviewed-by: rupashka

6954231: SynthTextPaneUI.installUI() doesn't set component to opaque even if prop was not set by client progr Reviewed-by: alexp

6929507: Build error on file swing.plaf.synth.SynthUI Reviewed-by: rupashka

6925473: REGRESSION: JOptionPane in dialog is full-screen height Reviewed-by: peterz

6632959: swing html parser doesn't know € or › Reviewed-by: alexp

6884066: JTableHeader listens mouse in disabled state and doesn't work when not attached to a table Reviewed-by: rupashka

6768387: REGRESSION: JTable no longer serializable Reviewed-by: rupashka

6937798: Nimbus: Issues with JTable grid Reviewed-by: rupashka

6786238: api/javax_swing/DefaultDesktopManager/descriptions.html#xxxFrame Fails with NPE since 6u12 b02 Reviewed-by: rupashka

Merge

6953396: javax.swing.plaf.basic.BasicViewportUI.uninstallDefaults() is not called when UI is uninstalled Reviewed-by: rupashka

6910490: MatteBorder JScrollpane interaction Reviewed-by: alexp

6479191: LTP: XMLEncoder does not update initialized property of GridBagConstraints type Reviewed-by: rupashka

6953294: Fix for 6909002 was incorrectly merged Reviewed-by: okutsu

6938481: 4906607 is not fixed for NIMBUS L&F Reviewed-by: alexp

Merge

6307603: [X11] Use RENDER extension for complex operations done in software Reviewed-by: bae, igor, prr

6954424: Support OpenType/CFF fonts in JDK 7 Reviewed-by: bae, igor

Added tag jdk7-b96 for changeset ba0f3e4fc590

Merge

Added tag hs19-b02 for changeset 95a32517326e

Added tag jdk7-b96 for changeset 95a32517326e

Added tag jdk7-b96 for changeset 1496a9cbeac4

Added tag jdk7-b96 for changeset d260f892491e

Merge

Merge

Merge

6956202: Fix a few missed rebranding issues, please contact lines etc. Reviewed-by: darcy, jjg, weijun

Added tag jdk7-b95 for changeset f8f961ea5739

Merge

Added tag jdk7-b95 for changeset 8971a47eb364

Merge

Added tag jdk7-b95 for changeset eca8ec9ea1e6

Merge

Merge

6956930: Remove unused OS_VENDOR make variable Reviewed-by: trims

6956202: Fix a few missed rebranding issues, please contact lines etc. Reviewed-by: jjg, darcy, weijun

Merge