--- a/.hgtags	Tue May 06 11:30:23 2014 -0700
+++ b/.hgtags	Fri May 09 09:07:21 2014 -0700
@@ -408,6 +408,8 @@
 b83f5194edf23b752fe2c0a9be361455f87196df jdk7u55-b32
 01a4cd03a6c85abb62eb5d1c2b5bf7d2f544c04e jdk7u55-b33
 3f54f8a387c1a908c07106b685183b19a5fc1064 jdk7u55-b34
+2cdc52ec4813abe38b4e52ae9c9f0ff5dcc87faa jdk7u55-b35
+6845d311ff990d422f9376d37e3e82d5d06bff3f jdk7u55-b36
 db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
 def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01
 ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02
@@ -428,6 +430,7 @@
 e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17
 e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b18
 c220d329a78161f79df73048ed55db91f538e3b7 jdk7u65-b01
+7190843ddaf4f3ad158c3071be0f4ca42a5802dc jdk7u60-b19
 a42a3bb22f6991d8f6a30e4f1782ad620c40eb65 jdk7u65-b02
 756071871d61e1ca410c63a3f1c4dabcc51a90df jdk7u65-b03
 bac16c82c14a35d1e9d3c4d0bd317dbbb296f34e jdk7u65-b04

--- a/make/java/util/FILES_properties.gmk	Tue May 06 11:30:23 2014 -0700
+++ b/make/java/util/FILES_properties.gmk	Fri May 09 09:07:21 2014 -0700
@@ -107,6 +107,7 @@
         sun/util/resources/CalendarData_pl.properties \
         sun/util/resources/CalendarData_pt.properties \
         sun/util/resources/CalendarData_pt_PT.properties \
+        sun/util/resources/CalendarData_pt_BR.properties \
         sun/util/resources/CalendarData_ro.properties \
         sun/util/resources/CalendarData_ru.properties \
         sun/util/resources/CalendarData_sk.properties \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/classes/sun/util/resources/CalendarData_pt_BR.properties	Fri May 09 09:07:21 2014 -0700
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2014, 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.
+#
+
+# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
+# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved
+#
+# The original version of this source code and documentation
+# is copyrighted and owned by Taligent, Inc., a wholly-owned
+# subsidiary of IBM. These materials are provided under terms
+# of a License Agreement between Taligent and Sun. This technology
+# is protected by multiple US and International patents.
+#
+# This notice and attribution to Taligent may not be removed.
+# Taligent is a registered trademark of Taligent, Inc.
+
+
+firstDayOfWeek=1
+minimalDaysInFirstWeek=1

--- a/src/windows/classes/sun/awt/windows/WToolkit.java	Tue May 06 11:30:23 2014 -0700
+++ b/src/windows/classes/sun/awt/windows/WToolkit.java	Fri May 09 09:07:21 2014 -0700
@@ -864,18 +864,12 @@
      * Windows doesn't always send WM_SETTINGCHANGE when it should.
      */
     private void windowsSettingChange() {
-        if (AppContext.getAppContext() == null) {
-            // No AppContext, so we can update properties on the current thread,
-            // DesktopPropertyChangeSupport will only post events.
-            updateProperties();
-        } else {
-            EventQueue.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    updateProperties();
-                }
-            });
-        }
+        EventQueue.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                updateProperties();
+            }
+        });
     }
 
     private synchronized void updateProperties() {

--- a/test/java/awt/Toolkit/ToolkitPropertyTest/NoAppContextTest.java	Tue May 06 11:30:23 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- *
- * 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.
- */
-
-/**
- * @test
- * @bug 8032960
- * @summary checks that desktop properties work if Toolkit thread has no AppContext
- * @author Petr Pchelko
- */
-
-import sun.awt.OSInfo;
-import sun.awt.SunToolkit;
-
-import javax.swing.*;
-import java.awt.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-public class NoAppContextTest {
-
-    private static final ThreadGroup stubGroup = new ThreadGroup("stub");
-    private static final ThreadGroup awtGroup = new ThreadGroup("AWT");
-    private static final AtomicBoolean propertyChangeFired = new AtomicBoolean(false);
-    private static Frame frame;
-
-    private static final Object LOCK = new Object();
-
-    public static void main(String[] args) throws Exception {
-
-        if (OSInfo.getOSType() != OSInfo.OSType.WINDOWS) {
-            // The test is for Windows platform only
-            return;
-        }
-
-        createStubContext();
-
-        Thread awtThread = new Thread(awtGroup, new Runnable() {
-            @Override
-            public void run() {
-                SunToolkit.createNewAppContext();
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        synchronized (LOCK) {
-                            frame = new Frame();
-                            frame.setBounds(100, 100, 100, 100);
-                            frame.setVisible(true);
-                            Toolkit.getDefaultToolkit().addPropertyChangeListener("win.propNames", new PropertyChangeListener() {
-                                @Override
-                                public void propertyChange(PropertyChangeEvent ev) {
-                                    propertyChangeFired.set(true);
-                                }
-                            });
-                        }
-                    }
-                });
-            }
-        });
-        awtThread.start();
-        awtThread.join();
-        sync();
-
-        final GraphicsDevice device = GraphicsEnvironment.getLocalGraphicsEnvironment()
-                .getDefaultScreenDevice();
-
-        final AtomicReference<DisplayMode> originalRef = new AtomicReference<>();
-        try {
-            final AtomicBoolean isSupported = new AtomicBoolean(true);
-            invokeInAWT(new Runnable() {
-                @Override
-                public void run() {
-                    if (device.isFullScreenSupported()) {
-                        device.setFullScreenWindow(frame);
-                    } else {
-                        isSupported.set(false);
-                    }
-                }
-            });
-            if (!isSupported.get()) {
-                return;
-            }
-            invokeInAWT(new Runnable() {
-                @Override
-                public void run() {
-                    if (device.isDisplayChangeSupported()) {
-                        DisplayMode original = device.getDisplayMode();
-                        originalRef.set(original);
-                        try {
-                            DisplayMode[] modes = device.getDisplayModes();
-                            for (DisplayMode mode : modes) {
-                                if (!mode.equals(original)) {
-                                    device.setDisplayMode(mode);
-                                    break;
-                                }
-                            }
-                        } finally {
-                            device.setDisplayMode(original);
-                        }
-                    } else {
-                        isSupported.set(false);
-                    }
-                }
-            });
-            if (!isSupported.get()) {
-                return;
-            }
-        } finally {
-            invokeInAWT(new Runnable() {
-                @Override
-                public void run() {
-                    device.setDisplayMode(originalRef.get());
-                    frame.dispose();
-                }
-            });
-        }
-
-        if (!propertyChangeFired.get()) {
-            throw new RuntimeException("Failed: PropertyChange did not fire");
-        }
-    }
-
-    private static void invokeInAWT(final Runnable r) throws InterruptedException {
-        Thread awtThread = new Thread(awtGroup, new Runnable() {
-            @Override
-            public void run() {
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        synchronized (LOCK) {
-                            r.run();
-                        }
-                    }
-                });
-            }
-        });
-        awtThread.start();
-        awtThread.join();
-        sync();
-    }
-
-    private static void createStubContext() throws InterruptedException {
-        Thread stub = new Thread(stubGroup, new Runnable() {
-            @Override
-            public void run() {
-                SunToolkit.createNewAppContext();
-            }
-        });
-        stub.start();
-        stub.join();
-    }
-
-    /**
-     * Runs realSync on a thread with an AppContext and waits for it to finish
-     */
-    private static void sync() throws InterruptedException {
-        final AtomicReference<InterruptedException> exc = new AtomicReference<>(null);
-
-        Thread syncThread = new Thread(awtGroup, new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    ((SunToolkit) Toolkit.getDefaultToolkit()).realSync();
-                    Thread.sleep(2000);
-                } catch (InterruptedException e) {
-                    exc.set(e);
-                }
-            }
-        });
-        syncThread.start();
-        syncThread.join();
-        if (exc.get() != null) {
-            throw exc.get();
-        }
-    }
-}
-

--- a/test/sun/text/resources/LocaleData	Tue May 06 11:30:23 2014 -0700
+++ b/test/sun/text/resources/LocaleData	Fri May 09 09:07:21 2014 -0700
@@ -11,7 +11,7 @@
 # bug #4052679
 LocaleNames/fr/fr=fran\u00e7ais
 
-# bug #4055602, 4290801
+# bug #4055602, 4290801, 8013836
 CurrencyNames/pt_BR/BRL=R$
 FormatData/pt_BR/NumberPatterns/0=#,##0.###;-#,##0.###
 # FormatData/pt_BR/NumberPatterns/1=R$ #,##0.##;-R$ #,##0.## # Changed; see bug 4122840
@@ -37,7 +37,7 @@
 FormatData/pt_BR/DayNames/0=Domingo
 FormatData/pt_BR/DayNames/1=Segunda-feira
 FormatData/pt_BR/DayNames/2=Ter\u00e7a-feira
-CalendarData/pt_BR/firstDayOfWeek=2
+CalendarData/pt_BR/firstDayOfWeek=1
 CalendarData/pt_BR/minimalDaysInFirstWeek=1
 FormatData/pt_BR/MonthNames/0=Janeiro
 FormatData/pt_BR/MonthNames/1=Fevereiro

--- a/test/sun/text/resources/LocaleDataTest.java	Tue May 06 11:30:23 2014 -0700
+++ b/test/sun/text/resources/LocaleDataTest.java	Fri May 09 09:07:21 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2014, 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
@@ -34,7 +34,7 @@
  *      6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
  *      6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
  *      6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7189611
- *      7171028
+ *      7171028 8013836
  * @summary Verify locale data
  *
  */