flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [50/62] [abbrv] [partial] Merged Apache Flex 4.9.0 release branch
Date Tue, 08 Oct 2013 14:04:05 GMT
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 46661d6..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Flex is an effort undergoing incubation at The Apache 
-Software Foundation (ASF), sponsored by the Apache Incubator. 
-Incubation is required of all newly accepted projects until a further 
-review indicates that the infrastructure, communications, and decision 
-making process have stabilized in a manner consistent with other 
-successful ASF projects. While incubation status is not necessarily a 
-reflection of the completeness or stability of the code, it does indicate 
-that the project has yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index 46218b7..75dc18e 100644
--- a/KEYS
+++ b/KEYS
@@ -262,3 +262,63 @@ j7fbBfvl1NNzxoXm+WgO2/W1DSJDxO00rZboj/wOvff7YpXjqJ3Rgb5CDnLcTGSu
 EyHfcH1CYCaCMPEP2x5gPuQKWd2U
 =EadN
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub   4096R/AEEAD151 2012-10-20
+uid                  Justin Mclean <jmclean@apache.org>
+sig 3        AEEAD151 2012-10-20  Justin Mclean <jmclean@apache.org>
+sub   4096R/A7926E70 2012-10-20
+sig          AEEAD151 2012-10-20  Justin Mclean <jmclean@apache.org>
+
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+mQINBFCCDvYBEADuxrUv8i8fiU13BzGi2xfeotZejJSQnNgJ87hWyhATcko32UIZ
+5a52tKEMNaagNljTT3hexb3i1VsVagQ89eK9UUKk8a3/NfPvaqD3eyiB1ayAcOq1
+Ns1s/kpkXKh0HDPz7xwCkIGT3C7JSbQsz5jgfPI0EhKKrT2UjQYCe5zL34+fioWU
+I5+6PS6+HJMu9ylRsFra6WuzhQoUMp1Z9dD1t4cCQ9uPFE2wmheZIjwPBvkIWqgR
+1lC3pTx2HvY5UoAUvGaJCyf2tJPW4QnNKAgMlnmY8DDZrkJt0FmK6g2nosGBgxVe
+7GXCeOBGu/X52VAZ2PLOlr/r4e8AlvDM9iw2lR4lP/wp6CqpeWmzTv/I/mKltqfg
+nPEYTmpCHLyrDiyLHxuW2xq/qhJXzzAfPqV8M8Va9TVNvAK1vWITD3r52fwJV/YP
+cl7HEWF1bgC4nJH+y5NUgbFJ5p2waVMXNEhgfxQL/TrJO/e+Z7oWOyJp7jERAAiq
+m04+y5lKfaOzGTDlOi+XN4zSJwFf4C8NdYh1nQb8ze3R/4AikvzsR7aJPcQkvf1H
+XOgsUSbYwi3oFCcUxGVN+vn71sMX4/Z8m1NYhy/tidRwl4r5EULB52VujR/V5LtK
+X2IkcAZ72Adk+Kui01Cn8eEOYd/SJ542Vn0gZ6BItV8ClN3Q0tOvtN2AqQARAQAB
+tCJKdXN0aW4gTWNsZWFuIDxqbWNsZWFuQGFwYWNoZS5vcmc+iQI3BBMBCgAhBQJQ
+gg72AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEODyhZOu6tFRMjMP/2Zw
+kYu7+I5RFEAabW+s/9OxnQsQzk2+tmPKzaNo+z+A3CYcVKTYM8HzjmkX+xxzj8rp
+YiwkFZfAs4TSnhMZ+rB5wVKQq4cis8xJahNwrB4ZGawZGkUF0HkegHwQqbsX5OcX
+vYvZDrbvVCuxrOTHNh4M0wip1bD3GnsNCjK+RuyGMNR1tDchNWqKxSCJsjB3n9SK
+yqc4y8cVDTxQfqMS0Um13vQUXJqW9goUIBpjiG44fqN/JghOqCiHMGqgGaSO1mHH
+u90eUHsMJbOCLuGDymaQW4NTn/o4GDjsOlPzm/fqHjINLOCRU/JJx4h9zF6vjSlj
+/yK/HsZcJ9x9B0IaYsie0VaBSlvBIcAlCd9BG0BMEOkTTryJA/4wfLuEapYMd5iK
+ewG21ZHFElBFgcEGk6CtZ9TrjU6IDf33WkkV0lUuAETlKsqk3V4kD4Sxqnb2ShkC
+DPARKNfM2sq5sY3chjx1UDTzTKNbtjrx36YdjJBzd+WWaFeDx7JwOevF+fqHSzNx
+jRbknp8R2pXphO3oYtloNqdh7gUMOYeS2W3CwZvZhsp2hlCHg6Nbsf8jtSgddQWa
+dE5MLyR4dywR/5Q6avI3YcguLGi0MFzzOeGWD/MPDWflWSN+duRndVM6ls4oSPft
+UBEkRI1DsgB9MzHZPDHbTEazxvwpHGPwIc/xDmZNuQINBFCCDvYBEADOjpMMPQGn
+L3XH5/h4wQTkWsAf7eq3ycG5lyDYZxwUi22Cn7uJZqLCJns4Ve3aC1LhwfJOYiLp
+KUwv5lmKdVGu3dsAZ5ES6eqKipoaOz9DSK0tPV2MxfNvfJ1olpgZn5GE2HQ9i1mh
+1+8+gSjVI/KNxhubVhrDbglgqpc8seIMlWqeYmoEOOo/RmyJYnqwQimtVqUu8PRH
+lUf3ItXxUOLr12uQKXoYPIMttf+Y85Id3Fp/+TBlBWSDIp4bSW1CSNlYEPl7Iopr
+yHUbAH8De9CGUeC7dhjj+C5a1QNG+3+lgW6g2mb3RJ6b8/iqUPCWyqDzMhFhdc+H
+zkHhOvRY1uRM6N7M1kA0WP99d5Y0L45+R13vs2eyg2iVsfRPeBV2uDfJIW6CQmrF
+I3vzfDGalgaE6RpppJAT8ZP0PCc8M/hIl18Ol7Epfxx3r2kikuwA31ebxh3cV9rt
+QajAuoCQPwGXpUnLxPZCl3qAhfPxldGAg3/q8E11Lt0f7ePe1u9r/34mDyYjj65d
+19xmczknaZ7lDPkieRaEsNgWSM5K74lWAvjBX6NW/ds1PHpkO6ex1KWVrhPRwYmQ
+fomXLkilWRGP6X6F3GEm0d+/nfkuu5WHN9a84VKNFVeE0JHUxmy6RbUUu468AN5Q
+GfLn6+IFSH99aH/xoag5c8HRiNAx5r/5nQARAQABiQIfBBgBCgAJBQJQgg72AhsM
+AAoJEODyhZOu6tFR5IoP/2Rd8ebwZVf4Eya4T1e0OF7m2tzlNod2fN3Du8wmmmGu
+YXXVKPdmLpiO3KJvbLLi+0bZml+RX0b/tgU9xa21ztTSZYWR+Tw9OvzEro1vAEHN
+9Jqc21adrKKBatuk5mAZpzEllO4d4uaoLL8FV55+9tQC5M1k73pl1fkcSlnOYfqV
+r4NXLaVxHDibeTJTQZhpqj3odpx4TF3FA4Cizd7W9ylye/KjLYnOjJys1yCvhpSK
+MyQR4rVYAIGYABMvjt2kI8eBzWk4u/OVU5nJajC6Bb8mWaW96TxbQxSGrChnsCq0
+lRsUtGDW7YwlrUBs+PUD3+sUnGYUOGAX9PXGmi+1dqIm6D7Egy/xww1Jo8N4e3Ed
+eYUriCYSy7cR/2TsxWifrUidfDJ2NP5p2RR7J8JI9LTbSsZMlXqnb9WAK/XLjFYV
+FyUxMyOnYe/HV/0/Dl/5w/4uDZYIsxrqqQlZGw0zqcdvwumfG4DZ3sb1mmYyHT9H
+491yeIIC/cu5eJm1uIGHM6dTxZVXw/H/6bGgn9WT4rrdpixCWrdSCTGYY7f4wuXs
+/YuUemeBKv11iBnjIJuPWpa50d1h4uhzmmZa50zcnhsidqbCk7IMo0ntx1I+LP2S
+Q96oD9lJJ/uXMjjXLnyp35MHRfAPMfmuBL0s9rRSGW3yxRinY0cLv1+qOx6VTyti
+=Kaki
+-----END PGP PUBLIC KEY BLOCK-----

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b8fef9c..ac731dd 100644
--- a/NOTICE
+++ b/NOTICE
@@ -25,7 +25,3 @@ The Batik SVG toolkit source contains code from the International Organisation f
 The Open Source Media Framework used by the video components is licensed under the 
     Mozilla Public License Version 1.1.  The source code can be found here:
     http://sourceforge.net/projects/osmf.adobe/files/OSMF%201.0%20%28final%20source%2C%20ASDocs%2C%20PDF%20guides%2C%20and%20release%20notes%29/OSMF_1.0.zip
-
-The Adobe Text Layout Framework used by the Spark text components is licensed under the 
-    Mozilla Public License Version 1.1.  The source code can be found here:
-    http://sourceforge.net/projects/tlf.adobe/files/2.0/232/textLayout_build.zip

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/README
----------------------------------------------------------------------
diff --git a/README b/README
index 3729439..89aa04f 100644
--- a/README
+++ b/README
@@ -3,12 +3,20 @@ Apache Flex (Flex)
 
     Apache Flex is an application framework for easily building Flash-based applications 
     for mobile devices, the browser and desktop.
-    
+
+    Apache Flex 4.9 is a follow up release to Apache Flex 4.8 which was a parity release
+    of Adobe Flex 4.6.  This version adds new features and implements bug fixes that were
+    unavailable in previous versions.  It is compatible with most code written to target
+    Adobe Flex 4.6.
+
     For detailed information about Apache Flex please visit 
-    http://incubator.apache.org/flex/
+    http://incubator.apache.org/flex/ 
+    
+    The Apache Flex project has just graduated to be a top level Apache project and the
+    project's URL will be soon be changing to http://flex.apache.org/.
 
     Apache Flex is a large project with many pieces.  The framework is implemented
-    in Actionscript and the compiler is implemented in Java.
+    in ActionScript and the compiler is implemented in Java.
 
     Currently supported platforms include:
 
@@ -27,22 +35,45 @@ Apache Flex (Flex)
 Getting the latest sources via Subversion
 =========================================
 
+    This is the recommended way to get Apache Flex.  We offer an automated installer
+    along with binary distributions on our website at http://incubator.apache.org/flex.
+
     You can always checkout the latest source via subversion using the following
     command:
 
     svn co https://svn.apache.org/repos/asf/incubator/flex/trunk flex
 
     For further information visit http://incubator.apache.org/flex/source.html
-    
-Building Apache Flex 4.8
+
+
+Getting the convenience packages for Apache Flex
+================================================
+
+    The Apache Flex SDK Installer is an application that simplifies the download and
+    installation of the Apache Flex SDK and its (required) components. It is aimed at
+    anyone who wants to use the latest release of the Apache Flex SDK, but who might not
+    necessarily be familiar with the tools and procedures required to compile the Apache
+    Flex SDK from source code. The application will grab the binary distribution of the
+    SDK from apache.org or one of its mirrors, install it onto your computer and prepare
+    it for use with your favorite IDE such as Adobe Flash Builder or JetBrains IntelliJ.
+
+    You can get the SDK Installer from the Apache Flex website at
+
+      http://incubator.apache.org/flex/installer.html
+
+    You can also get just the binaries from our website as well.  These binaries do not
+    include the dependencies, so additional software may need to be downloaded and installed.
+
+      http://incubator.apache.org/flex/download.html
+
+Building Apache Flex 4.9
 ========================
 
-    Apache Flex 4.8 is a parity release from Apache of Adobe Flex 4.6.
-    
     Apache Flex is a large project. It requires some build tools which must be installed
     prior to building Flex and it depends on some external software which
-    are downloaded as part of the build process.  See the Software Dependencies
-    section for more information on the external software dependencies.
+    are downloaded as part of the build process.  Some of these have different licenses.
+    See the Software Dependencies section for more information on the external software
+    dependencies.
     
     From Apache's perspective, the Adobe Flash Player and Adobe AIR have excluded
     licenses so they can not be bundled with the Apache Flex binaries.  They must be
@@ -51,21 +82,18 @@ Building Apache Flex 4.8
 Install Prerequisites
 ---------------------
 
-    Adobe Flex 4.6 was certified with AIR 3.1 and Flash Player 11.1.  Adobe Flex 4.8
-    will continue to use these.
-
     Before building Flex you must install the following software and set the
     corresponding environment variables using absolute file paths.  Relative file paths
     will result in build errors.
-	
-	The environment variables PLAYERGLOBAL_HOME, AIR_HOME, FLASHPLAYER_DEBUGGER,
-	PIXELBENDER_HOME and ADOBE_EXTENSION_MANAGER can also be set in the property file 
-	called env.properties. See the env-template.properties file for instructions.
+    
+    The environment variables PLAYERGLOBAL_HOME, AIR_HOME, FLASHPLAYER_DEBUGGER,
+    PIXELBENDER_HOME and ADOBE_EXTENSION_MANAGER can also be set in the property file 
+    called env.properties. See the env-template.properties file for instructions.
     
     The Adobe Flash Player playerglobal.swc is needed to compile all the components
     with the exception of the airframework and airspark components which require
     airglobal.swc from the AIR Integration Kit.  The AIR Integration kit is also needed
-    to build and debug mobile applications.  The Flash Player content debugger is
+    to build and debug mobile applications.  The Adobe Flash Player content debugger is
     used by checkintests and other pieces of the test subsystem to run compiled
     applications.  The Adobe Pixel Bender Toolkit is needed to build some
     files needed for effects.
@@ -74,25 +102,25 @@ Install Prerequisites
     SOFTWARE                                    ENVIRONMENT VARIABLE (absolute paths)
     ==================================================================================
     
-    Java SDK 1.5 (0_13 or greater)              JAVA_HOME
-    or Java SDK 1.6 (*1)
-     -- Java SDK 1.7 is not supported
-
-    Ant 1.7.0 or greater (*1)                   ANT_HOME
-    
+    Java SDK 1.6 or greater (*1)                JAVA_HOME
+        (for Java 1.7 see note at (*2))
+        
+    Ant 1.7.1 or greater (*1)                   ANT_HOME
+        (for Java 1.7 see note at (*2))
+        
     Cygwin, git bash 
     or other unix-like shell
     (if Windows)
     
-    Adobe AIR Integration Kit (*2)              AIR_HOME 
+    Adobe AIR Integration Kit (*3)              AIR_HOME 
     
-    Adobe Flash Player Content Debugger (*3)    FLASHPLAYER_DEBUGGER
+    Adobe Flash Player Content Debugger (*4)    FLASHPLAYER_DEBUGGER
         
-    Adobe Pixel Bender Toolkit (*4)             PIXELBENDER_HOME
+    Adobe Pixel Bender Toolkit (*5)             PIXELBENDER_HOME
     
-    Adobe Flash Player (*5)                     PLAYERGLOBAL_HOME
+    Adobe Flash Player (*6)                     PLAYERGLOBAL_HOME
 
-    Adobe Extension Manager CS5 (*6)            ADOBE_EXTENSION_MANAGER
+    Adobe Extension Manager CS5 (*7)            ADOBE_EXTENSION_MANAGER
 
     ==================================================================================
         
@@ -105,46 +133,68 @@ Install Prerequisites
         On the Mac (bash), set PATH to
             
             export PATH="$PATH:$ANT_HOME/bin:$JAVA_HOME/bin"
-    
-    *2) The Adobe AIR integration kit for Windows can be downloaded from:
-                http://airdownload.adobe.com/air/win/download/3.1/AdobeAIRSDK.zip
+
+    *2)  If you are using Java SDK 1.7 or greater on a Mac you must use Ant 1.8 or 
+         greater. If you use Java 1.7 with Ant 1.7, ant reports the java version as 1.6 
+         so the JVM args for the data model (-d32/-d64) will not be set correctly and you
+         will get compile errors.
         
-         The Adobe AIR integration kit for Mac can be downloaded from:
-            http://airdownload.adobe.com/air/mac/download/3.1/AdobeAIRSDK.tbz2
+    *3) The Adobe AIR integration kit for Windows can be downloaded from:
+                http://airdownload.adobe.com/air/win/download/3.4/AdobeAIRSDK.zip
         
+         The Adobe AIR integration kit for Mac can be downloaded from:
+            http://airdownload.adobe.com/air/mac/download/3.4/AdobeAIRSDK.tbz2
+
+        This version of Apache Flex was certified for use with AIR 3.4, and should
+        be compatible with other versions of AIR newer than 3.1. However it hasn't
+        been tested on AIR 3.2, 3.3 or 3.5.
+
         Download the AIR SDK for your platform and unzip it.  Set AIR_HOME to the absolute 
         path of the AIR SDK directory.
                
-    *3) The Adobe Flash Player content debuggers can be found here:
+    *4) The Adobe Flash Player content debuggers can be found here:
             http://www.adobe.com/support/flashplayer/downloads.html
+
+        This version of Apache Flex was certified for use with Adobe Flash Player 11.1, and
+        is compatible with versions 10.2 through 11.5. It has been tested with versions 11.1
+        and 11.5 on Windows and Mac. It has been compiled against other Adobe Flash Player
+        versions but has not been fully tested.
             
         On Windows, set FLASHPLAYER_DEBUGGER to the absolute path of FlashPlayerDebugger.exe
         
         On the Mac, set FLASHPLAYER_DEBUGGER to the absolute path of 
         Flash Player Debugger.app/Contents/MacOS/Flash Player Debugger
         
-        On Linux, set set FLASHPLAYER_DEBUGGER to the absolute path of flashplayerdebugger
+        On Linux, set FLASHPLAYER_DEBUGGER to the absolute path of flashplayerdebugger
             
-    *4) The Adobe Pixel Bender Toolkit for Windows can be downloaded from:
+    *5) The Adobe Pixel Bender Toolkit for Windows can be downloaded from:
             http://www.adobe.com/go/pixelbender_toolkit_zip/
         
          The Adobe Pixel Bender Toolkit for Mac can be downloaded from:
             http://www.adobe.com/go/pixelbender_toolkit_dmg/
         
         Download the Pixel Bender Toolkit for your platform and install or unzip it.
-	    Set PIXELBENDER_HOME to the absolute path of the Pixel Bender Toolkit directory.
+        Set PIXELBENDER_HOME to the absolute path of the Pixel Bender Toolkit directory.
 
-    *5) The Adobe Flash Player playerglobal.swc for 11.1 can be downloaded from:
+    *6) The Adobe Flash Player playerglobal.swc for 11.1 can be downloaded from:
             http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc 
         
         Use URL above to download playerglobal11_1.swc. Create the directory, player/11.1
         and copy playerglobal11_1.swc to player/11.1/playerglobal.swc.
         
         Set PLAYERGLOBAL_HOME to the absolute path of the player directory (not including
-		the version subdirectory). The target-version option controls which 
-		PLAYERGLOBAL_HOME subdirectory is used.
-
-    *6) The Adobe Extension Manager is only required for those creating release or testing
+        the version subdirectory). The target-player option controls which 
+        PLAYERGLOBAL_HOME subdirectory is used.
+
+        Other more recent versions of Adode Flash Player playergloal.swc can be downloaded from:
+            http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_2.swc
+            http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_3.swc
+            http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_4.swc
+            http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_5.swc
+            
+        These can be used with Apache Flex but have not been fully tested.
+        
+    *7) The Adobe Extension Manager is only required for those creating releases or testing
             changes to the flash-integration swc.  Not that if you change APIs on classes
             that flash-integration depends on, you may need to update flash-integration.
 
@@ -161,12 +211,108 @@ Install Prerequisites
 FlashPlayer Configuration
 -------------------------
 
-    For testing, the Flash Player's mm.cfg file must have the following entries
+    For testing, the Adobe Flash Player's mm.cfg file must have the following entries
     
         ErrorReportingEnable=1
         TraceOutputFileEnable=1
     
     and a FlashPlayerTrust file must allow local SWFs to access local files.
+    
+Other Locale Support
+--------------------
+
+    The Apache Flex SDK defaults to using the en_US locale and SDK error messages are by default
+    displayed in American English.
+    
+    To compile the SDK for another locale either:
+
+    Change the locale in the build.properties file to have a value other than "en_US". For this new
+    locale to take effect the SDK needs to be recompiled. For example, to use the Australian English
+    locale change locale to have a value of "en_AU" like so:
+     
+        locale = en_AU
+        
+    OR
+    
+    Compile the SDK with a -Dlocale=<locale> option, where <locale> is the new locale to compile the
+    SDK against.
+
+    The list of supported locales include:
+        da_DK    el_GR    en_GB    fi_FI    ja_JP    nl_NL    ru_RU    zh_TW
+        de_CH    en_AU    en_US    fr_FR    ko_KR    pt_BR    sv_SE
+        de_DE    en_CA    es_ES    it_IT    nb_NO    pt_PT    zh_CN
+
+    The Apache Flex SDK has only been tested for the en_US locale, however there is unlikely to be any
+    issues with a SDK compiled for another locales.
+    
+Adobe Flash Player Version Support
+----------------------------------
+
+    The Apache Flex SDK defaults to using the Adobe Flash Player 11.1. The SDK can be
+    compiled for Flash Player versions 10.2, 10.3, 11.0, 11.0, 11.1, 11.2, 11.3, 11.4 and 11.5.
+
+    To compile the SDK for another version of the Adobe Flash Player either:
+
+    Change the playerglobal.version in the build.properties file to have a value other than "11.1".
+    For this change to take effect the SDK needs to be recompiled. For example to compile against the
+    lastest version of the Adobe Flash Player set the value of playerglobal.version to be "11.5" like so:
+     
+        playerglobal.version = 11.5
+        
+    OR
+    
+    Compile the SDK with a -Dplayerglobal.version=<version> option, where <version> is the 
+    Adobe Flash Player version to compile the SDK against.
+    
+    
+    Different versions of the Adobe Flash Player require different versions of playerglobal.swc.
+    
+    These can be found at:
+    
+    http://fpdownload.macromedia.com/get/flashplayer/installers/archive/playerglobal/playerglobal10_2.swc
+    http://fpdownload.macromedia.com/get/flashplayer/installers/archive/playerglobal/playerglobal10_3.swc
+    http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_0.swc 
+    http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc
+    http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_2.swc
+    http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_3.swc
+    http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_4.swc
+    http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_5.swc
+    
+    Copy the target playerglobal.swc to the directory:
+    
+        frameworks/libs/player/<version>/playerglobal.swf
+    
+    Where <version> is the major and minor version numbers of the Adobe Flash Player 
+    separated by a period or full stop.
+    
+    If all of the playerglobal swcs where installed the frameworks/libs/player directory
+    structure would look like this.
+    
+        /frameworks
+            /libs
+                /player
+                    /10.2
+                         /playerglobal.swc
+                    /10.3
+                         /playerglobal.swc
+                    /11.0
+                         /playerglobal.swc
+                    /11.2
+                         /playerglobal.swc
+                    /11.2
+                         /playerglobal.swc
+                    /11.3
+                         /playerglobal.swc
+                    /11.4
+                         /playerglobal.swc
+                    /11.5
+                         /playerglobal.swc     
+                                                                                                                                
+    Apache Flex has been tested with Adobe Flash Player 11.1 and 11.5 on Windows and Mac.
+    
+    It compiles against other Adobe Flash Player versions and is expected to work but they 
+    may be some issues, particularly with the earlier 10.2 and 10.3 versions of the 
+    Adobe Flash Player.
 
 Software Dependencies
 ---------------------
@@ -197,8 +343,7 @@ Software Dependencies
     downloaded to your system. These files are installed in frameworks/libs.
         
         osmf.swc            
-            frameworks/libs
-            
+
             Open Source Media Framework v1.0 used for video components
         
             This file is extracted from:
@@ -206,18 +351,7 @@ Software Dependencies
             
             This software is released under the Mozilla Public License Version 1.1:
             <http://www.mozilla.org/MPL/>
-        
-        textLayout.swc
-            framework/libs
-            
-            Text Layout Format v2.0 used for text in Spark components
-        
-            This file is extracted from:
-            http://sourceforge.net/projects/tlf.adobe/files/2.0/232/textLayout_build.zip/download
-    
-            This software is released under the Mozilla Public License Version 1.1:
-            <http://www.mozilla.org/MPL/>
-            
+                    
     The following dependencies have licenses which Apache considers to be not compatible 
     with the Apache License Version 2.0. You will be prompted to read and agree to the 
     license terms of the dependency before the software can be downloaded to your system.  
@@ -248,7 +382,7 @@ Software Dependencies
 Using the Binary Distribution
 -----------------------------
 
-    You must download the thirdparty dependencies.
+    You must download the third-party dependencies.
 
     When you have all the prerequisites in place and the environment variables set, 
     (see Install Prerequisites above), use
@@ -268,7 +402,7 @@ Building the Framework in a Binary Distribution
         cd <flex.dir>/frameworks
         ant main        (or just ant since the default target is main)
     
-    to download the thirdparty dependencies and build the Flex framework.  You may be 
+    to download the third-party dependencies and build the Flex framework.  You may be 
     prompted to acknowledge some of the downloads.  Since the third-party dependencies 
     take a little while to download and they don't change very often, they are not 
     cleaned with the regular clean target.
@@ -301,6 +435,10 @@ Building the Source in the Source Distribution
     dependencies take a little while to download and they don't change very often, they 
     are not cleaned with the regular clean target.
     
+    If you would like to build the RSLs, use
+    
+        ant frameworks-rsls
+        
     To clean the build, of everything other than the downloaded third-party dependencies 
     use
     
@@ -329,4 +467,4 @@ Building the Source in the Source Distribution
 Thanks for using Apache Flex.
 
                                           The Apache Flex Project
-                                          <http://incubator.apache.org/flex/>
+                                          <http://incubator.apache.org/flex>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 498fab6..edc7b4b 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,14 +1,40 @@
-Apache Flex 4.8.0
+Apache Flex 4.9.0
 =================
 
-This is a parity release with Adobe Flex 4.6.0.
+This is first release after the Apache Flex 4.8.0 parity release.
 
 The official Apache distribution is the source kit which can contain only source.
 Because of this, and various licensing constraints, there must be a few differences.  
 
 ====> Please see the README, especially the "Install Prerequisites" section. <====
   
-  Differences:
+  Differences from Apache Flex 4.8.0:
+  - New locales for Apache Flex including Australian, British, Canadian, Greek, Switzerland (German) and Portuguese
+  - Apache Flex SDK can be compiled for any version of the Flash Player from 10.2 to 11.5
+  - New PostCodeFormatter and PostCodeValidator classes for international postcode formatting and validation
+  - New VectorList and VectorCollection classes for lists and collections of vectors
+  - New version of the TLF (Text Layout Framework), the TLF 3.0.33 source code is now included as it is now part
+    of the Apache Flex donation.
+  - Can use Java 7 to compile SDK (see README for instructions)
+  - Many improvements and updates to Mustella tests
+  - An SDK installer has also been created and is the recommended way of installing the Apache Flex SDK in an IDE.
+    For more information see http://incubator.apache.org/flex/installer.html
+  
+  Several bug have also been fixed including (but not limited to):
+  FLEX-33272 A #1010 error occurred while trying to hide columns of an AdvancedDataGrid having lockedColumnCount
+             greater than 0
+  FLEX-33263 FocusOut in datagrid causes RTE if target.parent is null
+  FLEX-33248 Spark GridItemEditor cannot edit nested properties
+  FLEX-33216 Chart initialization performance degradation between Flex 3 and Flex 4
+  FLEX-33110 Building the SDK with Java 7
+  FLEX-29002 RunTime Error #1009 at mx.managers::PopUpManagerImpl/addModalPopUpAccessibility() when displaying more
+             than one modal popup via PopUpManager on top of each other. On Windows 7 running on some PCs
+  FLEX-28982 DropDownController - Null Object Reference
+  FLEX-27758 Keyboard navigation stops working in mx:DataGrid
+  
+  For a full list see https://issues.apache.org/jira/browse/FLEX
+  
+  Differences from Adobe Flex 4.6.0:
   
   - BlazeDS integration is an optional feature (Adobe license)
   - Adobe embedded font support is an optional feature  
@@ -24,9 +50,6 @@ Because of this, and various licensing constraints, there must be a few differen
   - the frameworks/rsls directory contains unsigned RSL for libraries we build
     
   - the frameworks/osmf src is not included which means there is not an osmf RSL.  
-
-  - the frameworks/textLayout src is not included which means there is not a textLayout 
-    RSL.  We expect this difference to be limited to this release.
   
   - the ASDoc in the asdoc package no longer has active links for Adobe Flash,
     Adobe Air, the Open Source Media Framework (OSMF) or Text Layout Format (TLF).

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/SVN-TEST.txt
----------------------------------------------------------------------
diff --git a/SVN-TEST.txt b/SVN-TEST.txt
index 43fe27c..d7487bd 100644
--- a/SVN-TEST.txt
+++ b/SVN-TEST.txt
@@ -51,3 +51,15 @@ Dear diary: Jackpot. -Glen Quagmire (via jonbcampos)
 "Money is only important to those who don't have any" (via quetwo)
 
 "Beware the young doctor and old barber" (Ben Franklin)
+
+The World was all before them, where to choose
+Thir place of rest, and Providence thir guide:
+They hand in hand with wandring steps and slow,
+Through Eden took thir solitarie way.
+(John Milton, last lines of Paradise Lost, via gordonsmith)
+
+"We can do so much more. We can save this world... with the right leadership." (Adrian Veidt, Ozymandias in Watchmen Graphic Novel, via carlosrovira)
+
+Frédéric Thomas (fthomas)
+
+

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/asdoc/build.xml
----------------------------------------------------------------------
diff --git a/asdoc/build.xml b/asdoc/build.xml
index a346cc5..eefb43c 100644
--- a/asdoc/build.xml
+++ b/asdoc/build.xml
@@ -24,6 +24,7 @@
 
     <property file="${FLEX_HOME}/env.properties"/>
     <property environment="env"/>
+	<property file="${FLEX_HOME}/build.properties"/>
 
 	<target name="main" depends="clean,doc" description="Clean build of all ASDocs"/>
 
@@ -45,12 +46,13 @@
 	        <os family="unix"/>
 	    </condition>
 
-	    <available property="flexTasksJar" value="${FLEX_HOME}/lib/flexTasks.jar" file="${FLEX_HOME}/lib/flexTasks.jar"/>
-	    <available property="flexTasksJar" value="${FLEX_HOME}/ant/lib/flexTasks.jar" file="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
-
-		<!-- Load the <asdoc> task. We can't do this at the <project> level -->
-		<!-- because targets that run before flexTasks.jar gets built would fail. -->
-		<taskdef resource="flexTasks.tasks" classpath="${flexTasksJar}"/>
+        <path id="flexTasks.path">
+            <fileset dir="${FLEX_HOME}">
+                <include name="lib/flexTasks.jar" />
+                <include name="ant/lib/flexTasks.jar" />
+            </fileset>
+        </path>
+        <taskdef resource="flexTasks.tasks" classpathref="flexTasks.path"/>
 
 		<!-- Call asdoc to generate dita xml files -->
 		<asdoc output="${FLEX_HOME}/asdoc-output" lenient="true" failonerror="true" warnings="false" strict="false" locale="en_US" fork="true">
@@ -66,9 +68,9 @@
 		    <doc-classes class="MobileComponentsClasses"/>		    
 		    <doc-classes class="SparkDmvClasses"/>
 	    		    
-			<!--doc-classes class="flashx.textLayout.CoreClasses"/-->
-			<!--doc-classes class="flashx.textLayout.EditClasses"/-->
-			<!--doc-classes class="flashx.textLayout.ConversionClasses"/-->
+			<doc-classes class="flashx.textLayout.CoreClasses"/>
+			<doc-classes class="flashx.textLayout.EditClasses"/>
+			<doc-classes class="flashx.textLayout.ConversionClasses"/>
 
 			<!-- source path for asdoc -->
 			<compiler.source-path path-element="${flexlib}/projects/airframework/src"/>
@@ -79,7 +81,7 @@
 			<compiler.source-path path-element="${flexlib}/projects/mx/src"/>
 			<compiler.source-path path-element="${flexlib}/projects/sparkskins/src"/>
 			<compiler.source-path path-element="${flexlib}/projects/rpc/src"/>
-		    <!--compiler.source-path path-element="${flexlib}/projects/textLayout/src"/-->
+		    <compiler.source-path path-element="${flexlib}/projects/textLayout/${tlf.version}/src"/>
 			<!--compiler.source-path path-element="${flexlib}/projects/osmf/src"/-->
 			<compiler.source-path path-element="${flexlib}/projects/advancedgrids/src"/>
 			<compiler.source-path path-element="${flexlib}/projects/charts/src"/>
@@ -92,14 +94,14 @@
 		    <doc-namespaces uri="library://ns.adobe.com/flex/spark"/>
 		    <doc-namespaces uri="http://www.adobe.com/2006/mxml"/>
 		    <doc-namespaces uri="http://www.adobe.com/2006/rpcmxml"/>
- 			<!--doc-namespaces uri="library://ns.adobe.com/flashx/textLayout"/-->
+ 			<doc-namespaces uri="library://ns.adobe.com/flashx/textLayout"/>
  			<doc-namespaces uri="http://ns.adobe.com/2009/mx-mxml"/>
  			<doc-namespaces uri="http://www.adobe.com/2006/advancedgridsmxml"/>
  			<doc-namespaces uri="http://www.adobe.com/2006/charts"/>
  			<doc-namespaces uri="library://ns.adobe.com/flex/spark-mobilecomponents"/>
  			<doc-namespaces uri="library://ns.adobe.com/flex/spark-dmv"/>
  			
-		    <!--namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${flexlib}/projects/textLayout/manifest.xml"/-->
+		    <namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${flexlib}/projects/textLayout/${tlf.version}/manifest.xml"/>
 
 			<!-- namespace declaration for asdoc -->
 		    <namespace uri="http://www.adobe.com/2006/airmxml" manifest="${flexlib}/projects/airframework/manifest.xml"/>
@@ -124,7 +126,7 @@
 		    	<!-- if no osfm sources -->
 		    	<include name="osmf.swc" />
 		    	<!-- if no textLayout sources -->
-		    	<include name="textLayout.swc" />
+		    	<!--include name="textLayout.swc" /-->
 		    </external-library-path>
 
 			<jvmarg line="${asdoc.jvm.args}"/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/asc.bat
----------------------------------------------------------------------
diff --git a/bin/asc.bat b/bin/asc.bat
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/asdoc
----------------------------------------------------------------------
diff --git a/bin/asdoc b/bin/asdoc
index cb8e5bc..0b74986 100755
--- a/bin/asdoc
+++ b/bin/asdoc
@@ -30,35 +30,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to asdoc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to asdoc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to asdoc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
+    # set FLEX_HOME relative to asdoc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
 
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/compc
----------------------------------------------------------------------
diff --git a/bin/compc b/bin/compc
index 79d5c29..5009701 100755
--- a/bin/compc
+++ b/bin/compc
@@ -30,36 +30,37 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to compc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to compc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to compc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-	
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
-	
+    # set FLEX_HOME relative to compc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+    
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+        D32='-d32'
+    fi
+    
 fi
 
 # don't use $FLEX_HOME in this variable because it may contain spaces,

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/copylocale
----------------------------------------------------------------------
diff --git a/bin/copylocale b/bin/copylocale
index 24c46c9..c48ed6b 100755
--- a/bin/copylocale
+++ b/bin/copylocale
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to copylocale if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to copylocale if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to copylocale if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to copylocale if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/digest
----------------------------------------------------------------------
diff --git a/bin/digest b/bin/digest
index fbead63..055d01b 100755
--- a/bin/digest
+++ b/bin/digest
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to digest if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to digest if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to digest if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to digest if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/fcsh
----------------------------------------------------------------------
diff --git a/bin/fcsh b/bin/fcsh
index 19c2ebe..28ece27 100755
--- a/bin/fcsh
+++ b/bin/fcsh
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to fcsh if not set
-	test "$FLEX_HOME" = "" && {
-		FLEX_HOME=`dirname $0`/..
-		FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to fcsh if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to fcsh if not set
-	test "$FLEX_HOME" = "" && {
-		FLEX_HOME=`dirname "$0"`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to fcsh if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/fdb
----------------------------------------------------------------------
diff --git a/bin/fdb b/bin/fdb
index 2ea72c7..beb415d 100755
--- a/bin/fdb
+++ b/bin/fdb
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to fdb if not set
-	test "$FLEX_HOME" = "" && {
-		FLEX_HOME=`dirname $0`/..
-		FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to fdb if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to fdb if not set
-	test "$FLEX_HOME" = "" && {
-		FLEX_HOME=`dirname "$0"`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to fdb if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/mxmlc
----------------------------------------------------------------------
diff --git a/bin/mxmlc b/bin/mxmlc
index bcc021b..791bbec 100755
--- a/bin/mxmlc
+++ b/bin/mxmlc
@@ -30,35 +30,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to mxmlc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to mxmlc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to mxmlc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-	
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to mxmlc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+    
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+        D32='-d32'
+    fi
 fi
 
 # don't use $FLEX_HOME in this variable because it may contain spaces,

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/optimizer
----------------------------------------------------------------------
diff --git a/bin/optimizer b/bin/optimizer
index eed0fe2..e40a4d4 100755
--- a/bin/optimizer
+++ b/bin/optimizer
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to optimizer if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to optimizer if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to optimizer if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-	
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-		isOSX="`uname | grep -i Darwin`"
-		
-		if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-			D32='-d32'
-	fi
+    # set FLEX_HOME relative to optimizer if not set
+    test "$FLEX_HOME" = "" && {
+    FLEX_HOME=`dirname "$0"`/..
+    }
+    
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+        D32='-d32'
+    fi
 fi
 
 # don't use $FLEX_HOME in this variable because it may contain spaces,

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/bin/swfdump
----------------------------------------------------------------------
diff --git a/bin/swfdump b/bin/swfdump
index 03a1cf5..2529472 100755
--- a/bin/swfdump
+++ b/bin/swfdump
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to swfdump if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to swfdump if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to swfdump if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to swfdump if not set
+    test "$FLEX_HOME" = "" && {
+    FLEX_HOME=`dirname $0`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then
+        D32='-d32'
+    fi
 fi
 
 VMARGS="-ea -Dapplication.home=$FLEX_HOME -Xms32m -Xmx384m "

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index f499dc4..899d748 100644
--- a/build.properties
+++ b/build.properties
@@ -31,12 +31,21 @@ locale = en_US
 qa.dir = ${basedir}/../qa
 asc = ${basedir}/bin/asc
 
-local.d32 = 
+# TextLayoutFormat version.  This is a sub-directory in frameworks/textLayout.
+tlf.version = 3.0.33
+
+# For Java 7 on Mac OS X, you need an Intel-based Mac running Mac OS X version 10.7.3 
+# (Lion) and above.  Only the 64-bit data model is available so leave this blank.
+# Since ant properties are immutable, if this property is set in the build file before
+# this file is included, setting it to nothing here is a no-op.
+local.d32 =
+
 src.depend = true
 src.debug = on
 
 # JVM options for <compc> and <mxmlc> tasks
 jvm.args = ${local.d32} -Xms64m -Xmx384m -ea -Dapple.awt.UIElement=true
+    # -d32/-d64 for 32-bit/64-bit code model (or don't specify for the default)
 	# -Xms64m: start out with a 64 MB heap
 	# -Xmx384m: allow the heap to grow to 384 MB
 	# -ea: enable Java assertions

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 398ac32..84e1f8c 100644
--- a/build.xml
+++ b/build.xml
@@ -22,12 +22,15 @@
 
     <property name="FLEX_HOME" location="${basedir}"/>
     
-    <!-- Required for OSX 10.6 / Snow Leopard Performance -->
-    <condition property="local.d32" value="-d32" >
+    <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+    <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+    <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
+    <condition property="local.d32" value="-d32">
         <and>
+            <os family="windows"/>
             <equals arg1="${sun.arch.data.model}" arg2="64"/>
             <equals arg1="${os.arch}" arg2="x86_64"/>
-                <os family="mac"/>
+            <equals arg1="${ant.java.version}" arg2="1.6"/>
         </and>
     </condition>
 
@@ -40,7 +43,7 @@
     <property name="strict" value="true"/>
     <property name="javac.src" value="1.5"/>
     
-    <property name="kit.prefix" value="apache-flex-sdk-${release.version}-incubating"/>
+    <property name="kit.prefix" value="apache-flex-sdk-${release.version}"/>
     <property name="source.kit" value="${kit.prefix}-src"/>
     <property name="binary.kit" value="${kit.prefix}-bin"/>
       
@@ -121,7 +124,12 @@
         description="Stuff that needs to be done before any builds." />
 
     <target name="check-compile-env" depends="check-playerglobal-home,check-air-home,check-pixelbender-home"
-        description="Check for the required environment variables for compilation."/>
+        description="Check for the required environment variables for compilation.">
+            <echo>OS: ${os.name} / ${os.version} / ${os.arch}</echo>
+            <echo>VM: ${java.vm.name} / ${java.vm.version}</echo>
+            <echo>Java: ${java.version}</echo>
+            <echo>Ant: ${ant.version} Ant Java Version: ${ant.java.version}</echo>
+    </target>
 
     <target name="check-playerglobal-home" unless="playerglobal.swc.exists"
         description="Check PLAYERGLOBAL_HOME for both a directory and a swc file">
@@ -402,6 +410,8 @@
     </macrodef>
 
 	<target name="frameworks-rsls" description="Build signed framework RSLs">
+		<!-- textLayout RSL -->
+		<create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="textLayout" build-number="${release.version}.${build.number}"/>
 		<!-- framework RSL -->
 		<create-rsl rsl-dir="${basedir}/frameworks/rsls" swc-dir="${basedir}/frameworks/libs" swc-name="framework" build-number="${release.version}.${build.number}"/>
 		<!-- mx RSL -->
@@ -506,7 +516,6 @@
 				<include name="env-template.properties"/>
                 <include name="flex-sdk-description.xml"/>
                 <include name="CHANGES"/>
-                <include name="DISCLAIMER"/>
                 <include name="LICENSE"/>
                 <include name="NOTICE"/>
                 <include name="README"/>
@@ -562,8 +571,9 @@
              either type of line endings but the converse is often not true.             
              The bin directory is handled in stage-bin.
         -->
-        <fixcrlf srcdir="${basedir}/temp" eol="crlf">
+        <fixcrlf srcdir="${basedir}/temp" eol="crlf" fixlast="false">
             <exclude name="bin/**"/>
+            <exclude name="**/assets/**"/>
             <exclude name="**/*.fla"/>
             <exclude name="**/*.flv"/>
             <exclude name="**/*.gif"/>
@@ -579,7 +589,7 @@
             Unix shell scripts need the correct line endings. 
             The bin directory is handled in stage-bin.
         -->      
-        <fixcrlf srcdir="${basedir}/temp" eol="unix">  
+        <fixcrlf srcdir="${basedir}/temp" eol="unix" fixlast="false">  
             <include name="**.sh"/>
             <exclude name="bin/**"/>
         </fixcrlf>
@@ -599,9 +609,9 @@
                 <exclude name="test*/**"/>
                 <exclude name="javascript/**"/>
                 <exclude name="projects/air/**"/>
-                <exclude name="projects/textLayout/**"/>
                 <exclude name="projects/spark/manifest.xml"/>
                 <exclude name="projects/*/bundles.properties"/>
+                <exclude name="projects/*/.settings/**"/>
             </fileset>
         </copy>
 
@@ -649,12 +659,12 @@
             </fileset>
         </copy>
         
-        <fixcrlf srcdir="${basedir}/temp/bin" eol="crlf">
+        <fixcrlf srcdir="${basedir}/temp/bin" eol="crlf" fixlast="false">
             <include name="**/*.bat"/>
         </fixcrlf>
   
           <!-- Unix shell scripts need the correct line endings. -->      
-        <fixcrlf srcdir="${basedir}/temp/bin" eol="unix">  
+        <fixcrlf srcdir="${basedir}/temp/bin" eol="unix" fixlast="false">  
             <exclude name="**/*.bat"/>
         </fixcrlf>
     </target>
@@ -702,8 +712,8 @@
                 <exclude name="as3/src/mustella/ContinueAfterRuntimeException/**"/>
                 <exclude name="as3/src/mustella/ExcludeList.txt"/>
                 <exclude name="as3/src/mustella/IncludeList.txt"/>
-                <exclude name="**/*.air"/>
-                <exclude name="**/*.swf"/>
+                <exclude name="as3/**/*.air"/>
+                <exclude name="as3/**/*.swf"/>
                 <include name="build.xml"/>
                 <include name="local.properties"/>
                 <include name="MustellaResultsParser.java"/>
@@ -793,15 +803,16 @@
             </fileset>
         </copy>
 
-
         <!-- frameworks/libs -->
         <copy todir="${basedir}/temp/frameworks/libs">
             <fileset dir="${basedir}/frameworks/libs">
                 <include name="air/airframework.swc"/>
                 <include name="air/airspark.swc"/>
                 <include name="mobile/mobilecomponents.swc"/>
+                <include name="apache.swc"/>
                 <include name="authoringsupport.swc"/>
                 <include name="core.swc"/>
+                <include name="experimental.swc"/>
                 <include name="spark.swc"/>
                 <include name="framework.swc"/>
                 <include name="mx/mx.swc"/>
@@ -812,10 +823,8 @@
                 <include name="charts.swc"/>
                 <include name="advancedgrids.swc"/>
                 <include name="spark_dmv.swc"/>
+            	<include name="textLayout.swc"/>
                 <exclude name="osmf.swc"/>
-            	<exclude name="textLayout.swc"/>
-            	<exclude name="apache.swc"/>
-                <exclude name="experimental.swc"/>
             </fileset>
         </copy>
 
@@ -910,30 +919,21 @@
         -->
         <copy todir="${basedir}/temp/lib/external">
             <fileset dir="${basedir}/lib/external">
+                <!-- required license and notice files -->
+                <include name="*LICENSE*/**"/>
+                <include name="*NOTICE*/**"/>
+                <include name="*README*"/>
+                <!-- jar files -->
                 <include name="commons-collections.jar"/>
-                <include name="commons-collections-LICENSE*"/>
-                <include name="commons-collections-NOTICE*/**"/>
                 <include name="commons-discovery.jar"/>
-                <include name="commons-discovery-LICENSE*"/>
-                <include name="commons-discovery-NOTICE*/**"/>
                 <include name="commons-logging.jar"/>
-                <include name="commons-logging-LICENSE*"/>
-                <include name="commons-logging-NOTICE*/**"/>
                 <include name="javacc.jar"/>
-                <include name="javacc-LICENSE*"/>
                 <include name="saxon9.jar"/>
-                <include name="saxon9-LICENSE*"/>
-                <include name="saxon9-NOTICE*/**"/>
                 <include name="xalan.jar"/>
-                <include name="xalan-LICENSE*"/>
-                <include name="xalan-NOTICE*/**"/>
                 <include name="xercesImpl.jar"/>
                 <include name="xercesPatch.jar"/>
-                <include name="xerces-LICENSE*/**"/>
-                <include name="xerces-NOTICE*/**"/>
+                <include name="xml-apis-ext.jar"/>
                 <include name="xml-apis.jar"/>
-                <include name="xml-batik-LICENSE*"/>
-                <include name="xml-batik-NOTICE*/**"/>
                 <exclude name="optional/**"/>
             </fileset>
         </copy>
@@ -1200,7 +1200,6 @@
             <fileset dir="${basedir}">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
-                <include name="DISCLAIMER" />
             </fileset>
         </copy>
         <zip file="${basedir}/out/${kit.prefix}-asdocs.zip" basedir="${basedir}/temp"/>
@@ -1245,7 +1244,7 @@
         </copy>
     </target>
 
-    <target name="clean-temp">
+    <target name="clean-temp" unless="noclean.temp">
         <delete dir="${basedir}/temp" failonerror="false" includeEmptyDirs="true"/>
     </target>
 
@@ -1275,9 +1274,9 @@
     <target name="airmobile-basictests-mustella" depends="mustella-setup,airmobile-basictests"/>
 
     <target name="mustella-setup" depends="runtime-setup" description="compile mustella java file">
-        <!-- delete and rebuild mustella.swc -->
-        <ant dir="${basedir}/mustella" target="cleanmustellaswc"/>
-        <ant dir="${basedir}/mustella" target="makemustellaswc"/>
+        <ant dir="${basedir}/mustella" target="makemustellaswc">
+            <property name="use_mustella_framework_dir" value="false"/>
+        </ant>
         <property name="moreCompilerArgs" value=""/>
         <!-- compile the results parser -->
         <javac srcdir="mustella" includes="MustellaResultsParser.java"/>
@@ -1612,16 +1611,13 @@
     <target name="rat-check" depends="rat-taskdef" if="have.rattasks"
         description="Report on licenses in source kit.">
     
-        <!-- Unzip the source kit -->
-        <antcall target="clean-temp" />
-        <unzip src="${basedir}/out/${source.kit}.zip" dest="${basedir}/temp"/>
-        
         <property name="rat.dir" value="${basedir}/temp"/>
-
-        <echo message="Checking files at ${rat.dir}, report is ${basedir}/rat.report"/>
+        <antcall target="rat-unzip" />
+        
+        <property name="rat.report" value="${basedir}/rat.report"/>
+        <echo message="Checking files at ${rat.dir}, report is ${rat.report}"/>
              
-        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" 
-            reportFile="${basedir}/rat.report">
+        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
             <fileset dir="${rat.dir}">
                 <!--          Start of binary files           -->
                 <!-- exclude Flash Professional file used for integration with Flash Professional -->
@@ -1634,15 +1630,22 @@
                 <exclude name="**/*.jpg"/>
                 <exclude name="**/*.mp3"/>
                 <exclude name="**/*.flv"/>
+                <!-- exclude batik icon -->
+                <exclude name="modules/thirdparty/batik/sources/*.icns"/>
                 <!--          End of binary files           -->
                 <!-- exclude batik manifests -->
                 <exclude name="modules/thirdparty/batik/sources/*.mf"/>
+                <!-- exclude text files -->
+                <exclude name="modules/thirdparty/batik/lib/**/LICENSE*.txt"/>
+                <exclude name="modules/thirdparty/batik/lib/**/README*.txt"/>
                 <!-- exclude w3c sources -->
                 <exclude name="modules/thirdparty/batik/resources/org/apache/flex/forks/batik/dom/svg/resources/*.mod"/>
                 <exclude name="modules/thirdparty/batik/resources/org/apache/flex/forks/batik/dom/svg/resources/*.dtd"/>
+                <exclude name="modules/thirdparty/batik/sources/org/w3c/css/sac/LexicalUnit.java"/>
                 <exclude name="modules/thirdparty/batik/sources/org/w3c/flex/forks/css/sac/*.java"/>
                 <exclude name="modules/thirdparty/batik/sources/org/w3c/flex/forks/css/sac/helpers/ParserFactory.java"/>
                 <!-- exclude config files -->
+                <exclude name="modules/thirdparty/batik/svn-revision"/>
                 <exclude name="modules/thirdparty/xerces-patch/src/java/META-INF/services/javax.xml.parsers.SAXParserFactory"/>
                 <exclude name="modules/thirdparty/xerces-patch/src/java/META-INF/services/org.apache.xerces.xni.parser.XMLParserConfiguration"/>
                 <exclude name="modules/thirdparty/xerces-patch/src/java/org/apache/xerces/jaxp/javax.xml.parsers.SAXParserFactory"/>
@@ -1650,6 +1653,11 @@
         </rat:report>
     </target>
 
+    <target name="rat-unzip" unless="no.zip">
+        <antcall target="clean-temp" />
+        <unzip src="${basedir}/out/${source.kit}.zip" dest="${rat.dir}"/>
+    </target>
+    
     <target name="rat-taskdef" description="Rat taskdef"> 
         <available property="have.rattasks" 
             resource="org/apache/rat/anttasks/antlib.xml" 
@@ -1669,5 +1677,32 @@
         <echo message="Rat report not generated."/>
         <echo message="rat jars (apache-rat-*.jar, apache-rat-tasks-*.jar)"/>
         <echo message="not found in anttask.classpath"/>
-    </target>   
+    </target>
+    
+    <target name="rat-check-mustella" depends="rat-taskdef" if="have.rattasks"
+        description="Report on licenses in mustella directory.">
+    
+        <ant dir="${basedir}/mustella" target="clean"/>
+        
+        <property name="rat.mustella.dir" value="${basedir}/mustella"/>
+        <property name="rat.mustella.report" value="rat.mustella.report"/>
+                
+        <echo message="Checking files at ${rat.mustella.dir}, report is ${basedir}/${rat.mustella.report}"/>
+             
+        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" 
+            reportFile="${basedir}/${rat.mustella.report}">
+            <fileset dir="${rat.mustella.dir}">
+                <!--          Start of binary files           -->
+                <!-- exclude media (png, gif, jpg, mp3, flv) -->
+                <exclude name="assets/**"/>
+                <exclude name="tests/**/*.png"/>
+                <exclude name="tests/**/*.gif"/>
+                <exclude name="tests/**/*.jpg"/>
+                <exclude name="tests/**/*.mp3"/>
+                <exclude name="tests/**/*.flv"/>
+                <!--          End of binary files           -->
+                <exclude name="tests/**/*.compile"/>
+            </fileset>
+        </rat:report>
+    </target>
 </project>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 516c1d3..81de5de 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -26,16 +26,19 @@
 <project name="frameworks" default="main" basedir=".">
 
     <property name="FLEX_HOME" location=".."/>
-    
-    <!-- Required for OSX 10.6 / Snow Leopard Performance -->
-    <condition property="local.d32" value="-d32" >
+
+    <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+    <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+    <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
+    <condition property="local.d32" value="-d32">
         <and>
+            <os family="mac"/>
+            <matches pattern="1.6.*" string="${java.version}"/>
             <equals arg1="${sun.arch.data.model}" arg2="64"/>
             <equals arg1="${os.arch}" arg2="x86_64"/>
-            <os family="mac"/>
         </and>
     </condition>
-    
+
     <!-- Property for the platform.  -->
     <condition property="isMac" value="true">
         <os family="mac"/>
@@ -85,6 +88,7 @@
     <target name="compile" description="Builds all SWCs but not their resource bundles" depends="flex-config">
         <antcall target="framework"/>
         <antcall target="mx"/>
+        <antcall target="textLayout"/>
         <antcall target="rpc"/>
         <antcall target="charts"/>
         <antcall target="advancedgrids"/>
@@ -139,6 +143,9 @@
 		<condition property="playerglobal.swfversion" value="17">
 			<equals arg1="${playerglobal.version}" arg2="11.4" />
 		</condition>
+		<condition property="playerglobal.swfversion" value="18">
+			<equals arg1="${playerglobal.version}" arg2="11.5" />
+		</condition>
 	</target>	
 
     <!--
@@ -159,6 +166,7 @@
     <target name="other.locales" description ="Builds resource SWCs for all locales">
         <ant dir="${basedir}/projects/framework" target="other.locales"/>
         <ant dir="${basedir}/projects/mx" target="other.locales"/>
+        <ant dir="${basedir}/projects/textLayout" target="other.locales"/>
         <ant dir="${basedir}/projects/airframework" target="other.locales"/>
         <ant dir="${basedir}/projects/airspark" target="other.locales"/>
         <ant dir="${basedir}/projects/rpc" target="other.locales"/>
@@ -166,7 +174,6 @@
         <ant dir="${basedir}/projects/advancedgrids" target="other.locales"/>
         <ant dir="${basedir}/projects/spark" target="other.locales"/>
         <ant dir="${basedir}/projects/mobilecomponents" target="other.locales" />
-        <!--ant dir="${basedir}/projects/textLayout" target="other.locales"/-->
         <ant dir="${basedir}/projects/playerglobal" target="other.locales" />
         <ant dir="${basedir}/projects/flash-integration" target="other.locales"/>
         <ant dir="${basedir}/projects/automation" target="other.locales"/>
@@ -180,6 +187,7 @@
     <target name="doc" >
         <ant dir="${basedir}/projects/framework" target="doc" />
         <ant dir="${basedir}/projects/mx" target="doc" />
+        <ant dir="${basedir}/projects/textLayout" target="doc" />
         <ant dir="${basedir}/projects/rpc" target="doc" />
         <ant dir="${basedir}/projects/charts" target="doc" />
         <ant dir="${basedir}/projects/advancedgrids" target="doc" />
@@ -198,7 +206,7 @@
         <!--
         <ant dir="${basedir}/projects/automation" target="doc" />
         -->
-    	<ant dir="${basedir}/projects/apache" target="doc" />
+        <ant dir="${basedir}/projects/apache" target="doc" />
     	<ant dir="${basedir}/projects/experimental" target="doc" />
     </target>
    
@@ -214,6 +222,7 @@
     
     <target name="clean" depends="automation-clean,airsdk-clean" description="Cleans all SWCs and their resource bundles">
         <!-- Delete output from SWC projects -->
+        <ant dir="${basedir}/projects/textLayout" target="clean"/>
         <ant dir="${basedir}/projects/framework" target="clean"/>
         <ant dir="${basedir}/projects/mx" target="clean"/>
         <ant dir="${basedir}/projects/airframework" target="clean"/>
@@ -235,6 +244,12 @@
         <ant dir="${basedir}/projects/experimental" target="clean"/>
         <ant dir="${basedir}/javascript" target="clean"/>
     	<ant dir="${basedir}/themes/AeonGraphical" target="clean"/>
+        <!-- delete the FlashBuilder executable directories -->
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${basedir}/projects">
+                <include name="*/bin/**"/>
+            </fileset>
+        </delete> 
         <!-- Delete empty folders -->
         <delete dir="${basedir}/locale">
             <exclude name="**/metadata.properties"/>
@@ -280,7 +295,7 @@
         <delete dir="${FLEX_HOME}/runtimes"/>
         <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${FLEX_HOME}/samples">
-                <include name="badges/**" />
+                <include name="badge/**" />
                 <include name="descriptor-sample.xml" />
                 <include name="icons/**" />
             </fileset>
@@ -365,8 +380,7 @@
         <ant dir="${basedir}/projects/rpc"/>
     </target>
 
-    <!-- For debugging only.  For release, we distribute the swc built by the TLF team. -->
-    <target name="tlf" description="Clean build of textLayout.swc">
+    <target name="textLayout" description="Clean build of textLayout.swc">
         <ant dir="${basedir}/projects/textLayout"/>
     </target>
     

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/build_framework.xml
----------------------------------------------------------------------
diff --git a/frameworks/build_framework.xml b/frameworks/build_framework.xml
index ad2495c..bb154cb 100644
--- a/frameworks/build_framework.xml
+++ b/frameworks/build_framework.xml
@@ -55,7 +55,11 @@
     <property name="rpc.dir" value="${projects.dir}/rpc"/>
     <property name="spark.dir" value="${projects.dir}/spark"/>
     <property name="sparkskin.dir" value="${projects.dir}/sparkskins"/>
-    <property name="spark_dmv.dir" value="${projects.dir}/spark_dmv"/>
+	<property name="spark_dmv.dir" value="${projects.dir}/spark_dmv"/>
+	<property name="apache.dir" value="${projects.dir}/apache"/>
+	<property name="experimental.dir" value="${projects.dir}/experimental"/>
+    <property name="textLayout.dir" value="${projects.dir}/textLayout"/>
+    <property name="textLayout.ver.dir" value="${textLayout.dir}/${tlf.version}"/>
 
     <!-- automation -->
     <property name="automation.dir" value="${projects.dir}/automation"/>
@@ -75,11 +79,11 @@
 
     <property name="compc.jvm.args" value="-Xmx384m" />
     
-    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar"/>
+    <taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar;${FLEX_HOME}/lib/flexTasks.jar"/>
 
-    <target name="main" depends="check-compile-env,clean,thirdparty-downloads,prepare,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,automation-swcs,bundles,themes,sparkskins,spark_dmv"/>
+    <target name="main" depends="check-compile-env,clean,thirdparty-downloads,prepare,textLayout,framework,mx,spark,airframework,airspark,mobilecomponents,rpc,charts,advancedgrids,core,flash-integration,automation-swcs,bundles,themes,sparkskins,spark_dmv,apache,experimental"/>
 
-    <target name="bundles" depends="framework_rb,mx_rb,spark_rb,airframework_rb,airspark_rb,mobilecomponents_rb,rpc_rb,charts_rb,advancedgrids_rb,automation-rbs"/>
+    <target name="bundles" depends="framework_rb,mx_rb,textLayout_rb,spark_rb,airframework_rb,airspark_rb,mobilecomponents_rb,rpc_rb,charts_rb,advancedgrids_rb,automation-rbs,apache_rb,experimental_rb"/>
     
     <target name="automation-swcs" 
         depends="automation_agent,automation_dmv,tool,tool_air,automation,automation_air,automation_spark,automation_flashflexkit,automation_air,automation_airspark"
@@ -805,7 +809,6 @@
             <include-resource-bundles bundle="components"/>
             <include-resource-bundles bundle="sparkEffects"/>
             <include-resource-bundles bundle="layout"/>
-            <include-resource-bundles bundle="textLayout"/>
             <include-resource-bundles bundle="osmf"/>
             <source-path path-element="${spark.dir}/bundles/${locale}"/>
             <source-path path-element="${spark.dir}/src"/>
@@ -858,7 +861,40 @@
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
+	
+	<target name="textLayout" description="Builds the textLayout.swc">
+		<compc fork="true"
+			   output="${basedir}/libs/textLayout.swc"
+			   show-actionscript-warnings="false"
+			   compute-digest="true"
+			   include-classes="flashx.textLayout.CoreClasses flashx.textLayout.EditClasses flashx.textLayout.ConversionClasses">
+			<jvmarg line="${compc.jvm.args}"/>
+			<keep-as3-metadata>IMXMLObject</keep-as3-metadata>
+			<include-namespaces uri="library://ns.adobe.com/flashx/textLayout"/>
+			<namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${textLayout.ver.dir}/manifest.xml"/>
+			<source-path path-element="${textLayout.ver.dir}/src"/>
+			<library-path/>
+			<include-file name="manifest.xml" path="${textLayout.ver.dir}/manifest.xml"/>
+			<static-link-runtime-shared-libraries/>
+			<define name="CONFIG::debug" value="false"/>
+			<define name="CONFIG::release" value="true"/>
+		</compc>
+     </target>
 
+    <target name="textLayout_rb" description="Builds default locale textLayout_rb.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}" 
+            output="${basedir}/locale/${locale}/mx_rb.swc">
+            <include-resource-bundles bundle="textLayout"/>
+            <source-path path-element="${textLayout.dir}/bundles/${locale}"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+                <include name="framework.swc"/>
+            </external-library-path>
+            <library-path/>
+            <jvmarg line="${compc.jvm.args}"/>
+        </compc>
+    </target>   
+    
     <target name="tool_air" description="Builds the tool_air.swc">
         <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}" accessible="true"
             include-classes="ToolAIRClasses" output="${basedir}/libs/automation/tool_air.swc"
@@ -961,6 +997,78 @@
             <jvmarg line="${compc.jvm.args}"/>
         </compc>
     </target>
+	
+    <target name="apache" description="Builds the apache.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}" accessible="true" 
+            include-classes="ApacheClasses" output="${basedir}/libs/apache.swc"
+            resource-bundle-list="${apache.dir}/bundles.properties">
+        	<namespace uri="http://flex.apache.org/ns" manifest="${apache.dir}/manifest.xml"/>
+            <source-path path-element="${apache.dir}/src"/>
+            <library-path />
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+            	<include name="mx.swc"/>
+            </external-library-path>
+            <include-file name="defaults.css" path="${mx.dir}/defaults.css"/>
+            <jvmarg line="${compc.jvm.args}"/>
+            <keep-as3-metadata name="Bindable"/>
+            <keep-as3-metadata name="Managed"/>
+            <keep-as3-metadata name="ChangeEvent"/>
+            <keep-as3-metadata name="NonCommittingChangeEvent"/>
+            <keep-as3-metadata name="Transient"/>
+        </compc>
+    </target>
+    
+    <target name="apache_rb" description="Builds default locale apache_rb.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}" 
+            output="${basedir}/locale/${locale}/apache_rb.swc">
+            <include-resource-bundles bundle="apache"/>
+            <source-path path-element="${apache.dir}/bundles/${locale}"/>
+            <source-path path-element="${apache.dir}/src"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+                <include name="framework.swc"/>
+            </external-library-path>
+            <library-path/>
+            <jvmarg line="${compc.jvm.args}"/>
+        </compc>
+    </target>   
+	
+    <target name="experimental" description="Builds the experimental.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}" accessible="true" 
+            include-classes="ExperimentalClasses" output="${basedir}/libs/experimental.swc"
+            resource-bundle-list="${experimental.dir}/bundles.properties">
+            <source-path path-element="${experimental.dir}/src"/>
+            <library-path />
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+            	<include name="mx.swc"/>
+            </external-library-path>
+            <include-file name="defaults.css" path="${mx.dir}/defaults.css"/>
+            <jvmarg line="${compc.jvm.args}"/>
+            <keep-as3-metadata name="Bindable"/>
+            <keep-as3-metadata name="Managed"/>
+            <keep-as3-metadata name="ChangeEvent"/>
+            <keep-as3-metadata name="NonCommittingChangeEvent"/>
+            <keep-as3-metadata name="Transient"/>
+        </compc>
+    </target>
+    
+    <target name="experimental_rb" description="Builds default locale experimental_rb.swc">
+        <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}" 
+            output="${basedir}/locale/${locale}/experimental_rb.swc">
+            <include-resource-bundles bundle="experimental"/>
+            <source-path path-element="${experimental.dir}/bundles/${locale}"/>
+            <source-path path-element="${experimental.dir}/src"/>
+            <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>
+            <external-library-path dir="${basedir}/libs">
+                <include name="framework.swc"/>
+            </external-library-path>
+            <library-path/>
+            <jvmarg line="${compc.jvm.args}"/>
+        </compc>
+    </target>
+
         
     <!-- Download thirdparty code -->
     
@@ -987,8 +1095,11 @@
                 <include name="rpc.swc"/>
                 <include name="sparkskins.swc"/>
                 <include name="spark.swc"/>
+                <include name="textLayout.swc"/>
                 <include name="authoringsupport.swc"/>
                 <include name="flash-integration.swc"/>
+            	<include name="apache.swc"/>
+            	<include name="experimental.swc"/>	
             </fileset>
             <fileset dir="${basedir}/libs/automation">
                 <include name="automation_agent.swc"/>
@@ -1021,7 +1132,10 @@
                 <include name="mx_rb.swc"/>
                 <include name="rpc_rb.swc"/>
                 <include name="spark_rb.swc"/>
-                <include name="tool_air_rb.swc"/>
+                <include name="textLayout_rb.swc"/>
+            	<include name="tool_air_rb.swc"/>
+            	<include name="apache_rb.swc"/>
+                <include name="experimental_rb.swc"/>
             </fileset>
         </delete>
         <delete dir="${basedir}/projects" includes="*/bundles.properties"/>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 48eec5f..76362fe 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -52,7 +52,7 @@
        clean does not remove these since they don't change often and the downloads take time.
     -->
     <target name="main" 
-        depends="swfobject-download,swfobject-fabridge-download,textLayout-download,osmf-download,optional-downloads" 
+        depends="swfobject-download,swfobject-fabridge-download,osmf-download,optional-downloads" 
         description="Copies third-party software into place for build">
         <echo message="Use thirdparty-clean or super-clean to remove these."/> 
     </target>
@@ -66,7 +66,6 @@
         <delete failonerror="false">
             <fileset dir="${basedir}/libs">
                 <include name="osmf.swc"/>
-                <include name="textLayout.swc"/>
             </fileset>
         </delete>
         <delete includeEmptyDirs="true" failonerror="false">
@@ -74,7 +73,6 @@
                 <include name="${adobe.flex.zip.file}"/>
                 <include name="OSMF*/**"/>
                 <include name="osmf*/**"/>
-                <include name="textLayout*/**"/>
                 <include name="swfobject*/**"/>
             </fileset>
         </delete>
@@ -193,41 +191,6 @@
             </fileset>
         </delete>
     </target>
-
-    <!-- textLayout.swc (Version 2.0.232) -->
-    <!-- Because this requires a network connection it downloads TLF only if it doesn't already exist. -->
-    <target name="textLayout-check" description="Checks if the Text Layout Framework has been downloaded.">
-        <available file="${basedir}/libs/textLayout.swc" property="textLayout.swc.present"/>
-    </target>
-
-    <!-- 
-        Notify before downloading file with MPL1.1 license.
-    -->
-    <target name="ask-tlf" unless="build.noprompt">
-        <echo message="The Adobe Text Layout Framework (TLF) used by the Spark text components"/>
-        <echo message="is licensed under the Mozilla Public License Version 1.1."/>
-        <antcall target="echo-mpl1.1-license"/>
-    </target>
-
-    <target name="textLayout-download" depends="textLayout-check" unless="textLayout.swc.present">
-        <antcall target="ask-tlf"/>
-        
-        <available file="${download.dir}/textLayout_build.zip" type="file" property="tlf.zip.exists"/>
-        <antcall target="download-tlf-zip" />
-        
-        <unzip src="${download.dir}/textLayout_build.zip" dest="${basedir}">
-            <patternset>
-                <include name="libs/textLayout.swc"/>
-            </patternset>
-        </unzip>
-    </target>
-
-    <target name="download-tlf-zip" unless="tlf.zip.exists">
-        <mkdir dir="${download.dir}"/>
-        <get src="http://sourceforge.net/projects/tlf.adobe/files/2.0/232/textLayout_build.zip/download" 
-            dest="${download.dir}/textLayout_build.zip" 
-            verbose="false"/>
-    </target>
     
 	<!--============================================================================= -->
 	<!--      Optional Jars.  Licenses are not compatible with Apache v2 license.     -->
@@ -235,6 +198,7 @@
 	
 	<!--
         flex-messaging-common.jar - BlazeDS interface for -service compiler option
+        This does not get installed if build.noprompt is set.
     -->
     
     <target name="blazeds-jar-check" unless="blazeds.donot.ask"
@@ -253,7 +217,7 @@
         description="Prompt the user before downloading BlaseDS">
 
         <property name="blazeds.prompt.text" 
-            value="Apache Flex can optionally integrate with Adobe BlazeDS..
+            value="Apache Flex can optionally integrate with Adobe BlazeDS.
             ${line.separator}This feature requires flex-messaging-common.jar from the Adobe Flex SDK.
             ${line.separator}The Adobe SDK license agreement for Adobe Flex 4.6 applies to this jar.
             ${line.separator}This license is not compatible with the Apache v2 license.
@@ -286,6 +250,7 @@
 
 	<!--
         Embedded Font Support
+        This does not get installed if build.noprompt is set.
     -->
     
     <target name="font-jars-check" unless="font.donot.ask"

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/frameworks/locale/de_CH/metadata.properties
----------------------------------------------------------------------
diff --git a/frameworks/locale/de_CH/metadata.properties b/frameworks/locale/de_CH/metadata.properties
new file mode 100644
index 0000000..c62d379
--- /dev/null
+++ b/frameworks/locale/de_CH/metadata.properties
@@ -0,0 +1,42 @@
+################################################################################
+##
+##  Licensed to the Apache Software Foundation (ASF) under one or more
+##  contributor license agreements.  See the NOTICE file distributed with
+##  this work for additional information regarding copyright ownership.
+##  The ASF licenses this file to You under the Apache License, Version 2.0
+##  (the "License"); you may not use this file except in compliance with
+##  the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##
+################################################################################
+accessibilityClass.help = Specifies a helper class that implements this component's accessibility behavior.
+alternative.help = Specifies a recommended replacement for this class.
+arrayElementType.help = Specifies the allowed data type for the elements of this Array.
+bindable.help = Indicates that this property or method, or all the properties of this class, are able to be used in databinding expressions.
+defaultProperty.help = Specifies which property of this class can be set in MXML without enclosing its value in a property tag.
+deprecated.help = Marks this property, method, or class as being obsolete and no longer recommended for use.
+embed.help = Embeds an asset file (such as JPEG, PNG, MP3, XML, etc.) into a SWF, and initializes this variable to the corresponding asset class.
+event.help = Declares an event that this class dispatches.
+exclude.help = Omits a specified property, method, style, or event of this class from Flash Builder's code hints and from ASDoc.
+excludeClass.help = Omits this class from Flash Builder's code hints and from ASDoc.
+hostComponent.help = Specifies the SkinnableComponent that will use this Spark skin.
+iconFile.help = Specifies an icon to represent this component in Flash Builder.
+inspectable.help = Specifies how this property appears in Flash Builder's property inspector. Also used to specify the allowed values in MXML for a property of type String.
+managed.help = Indicates that LCDS should monitor all modifications (create/update/delete) to instances of this class. Managed classes are automatically bindable.
+nonCommitingChangeEvent.help = Specifies the event that indicates fine-grained value changes to this property, such as modifications in a TextInput prior to confirmation.
+percentProxy.help = Specifies a percent-based property that corresponds to this property. For example, width="100%" in MXML sets percentWidth to 100 in ActionScript.
+remoteClass.help = Specifies the remote class corresponding to this class for AMF serialization.
+resourceBundle.help = Indicates that this class uses a particular resource bundle, so that the bundle gets compiled into the SWF.
+richTextContent.help = Indicates that all characters should be interpreted literally as text when this property is set using character data in MXML.
+skinPart.help = Indicates that the value of this property is a skin part in this component's skin.
+skinState.help = Declares a view state that this component's skin must support.
+style.help = Declares a CSS style that this component supports.
+swf.help = Specifies information for the SWF header of this ActionScript application.
+transient.help = Indicates that this property should not participate in AMF serialization.


Mime
View raw message