| Log Message: |
Transferred from the Adobe Open Source Subversion Repository
Revision: 13666
Author: jimurphy@adobe.com
Date: 2010-01-20T19:05:30.983340Z
Log Message:
-----------
Merge /branches/4.0.0 revs 13595,13601,13613,13614,13615,13616,13619,13638,13644,13646,13647,13652,13653,13654,13665 -> trunk
checkintests pass
4.0.0 changes:
------------------------------------------------------------------------
r13665 | jimurphy@adobe.com
remove the call to clean-temp before the package staging starts. Removing the temp directory before the copy was removing the config updates that happen before this target is called.
SDK-25160
------------------------------------------------------------------------
r13595 | jimurphy@adobe.com | 2010-01-18 18:24:33 -0500 (Mon, 18 Jan 2010) | 15 lines
split airframework from airspark docs
-delete airframework/bundles/[locale]/docs/spark xml's
-add airspark/bundles/[locale]/docs/spark xml's
-added airspark/bundles/en_US/ english properties
-modified airspark/build to:
-use en_US properties for each of the locales until localized
-use the localized spark doc files for each locale in the fat-swc target
SDK-25065
------------------------------------------------------------------------
------------------------------------------------------------------------
r13601 | preilly@adobe.com | 2010-01-18 19:54:16 -0500 (Mon, 18 Jan 2010) | 25 lines
* Fixed a regression caused by revision 13531.
SDK-25115 Code-level description of changes:
StyleDef.java
Modified extractImports() by adding a "null" value check for
ClassReferences.
Modified processReference() to use Reference's updated
constructor.
Reference.java
Modified constructor by adding a isClassReference parameter.
Removed setClassReference(), because it's no longer used.
------------------------------------------------------------------------
------------------------------------------------------------------------
r13613 | jimurphy@adobe.com | 2010-01-18 22:23:05 -0500 (Mon, 18 Jan 2010) | 14 lines
Integration:
from branch: releases/ct/yuki/sonoma/...
afe.jar: 62.418002
rideau.jar: 62.417355
https://bugs.adobe.com/jira/browse/SDK-25018
SDK-25018 https://bugs.adobe.com/jira/browse/SDK-25012
SDK-25012
------------------------------------------------------------------------
------------------------------------------------------------------------
r13614 | jimurphy@adobe.com | 2010-01-18 22:56:49 -0500 (Mon, 18 Jan 2010) | 9 lines
additional update for airspark, added packages.dita to svn and instead of unzipping properties from airspark_rb the locales will simply use the files from the en_US directory until the localized files are submitted.
SDK-25065
------------------------------------------------------------------------
------------------------------------------------------------------------
r13615 | jimurphy@adobe.com | 2010-01-18 23:59:14 -0500 (Mon, 18 Jan 2010) | 12 lines
fix airframework/build.xml so the en_US _rb does not become corrupt when the other.locales target is run.
-removed the redundant en_US call in the other.locales target
-added a clean for locales that will only remove the locale being built before rebuild - not all of the locales
-add updated dita that does not contain spark references
------------------------------------------------------------------------
------------------------------------------------------------------------
r13616 | rfrishbe@adobe.com | 2010-01-19 00:01:44 -0500 (Tue, 19 Jan 2010) | 10 lines
Fixing a VideoPlayer bug, SDK-25116 (When switching the video source while another video is loading, the switch doesn't always work). It's similar to SDK-24933. In the previous fix, we cleaned up the asynchronous load when we decided we wanted to just play the video. However, we should also clean up this asynchronous load when the source changes. This code could be refactored later, and I put a TODO in for that.
SDK-25116 SDK-24933
Also, I'm cleaning up some docs around some scenarios when the source is switched that explicitly won't work. At some point, we could make these work, but I don't think it's worth the extra effort/code given how likely these are that a developer or user would run in to them.
SDK-25116
------------------------------------------------------------------------
------------------------------------------------------------------------
r13619 | egeorgie@adobe.com | 2010-01-19 01:23:05 -0500 (Tue, 19 Jan 2010) | 11 lines
Fix bug: Scaling a DateChooser inside a Canvas causes RTE http://bugs.adobe.com/jira/browse/SDK-25087
SDK-25087
The offending code was in the PostScaleAdapter - missing check for zero when dividing by the scale.
SDK-25087
------------------------------------------------------------------------
------------------------------------------------------------------------
r13638 | jimurphy@adobe.com | 2010-01-19 17:51:32 -0500 (Tue, 19 Jan 2010) | 14 lines
update to ensure fat-swcs contain a proper packages.dita file.
-removed all packages.dita files from all langs where it was checked in
-at the end of asdoc task we now copy the packages.dita out to the en_US project dir being built. This is where the fat-swc task will pick up this file and place it in the docs directory of the _rb.swc
-had to change the order of the build process slightly - old order: ant clean main other.locales doc - new order: ant clean main doc other.locales
- I removed other.locales from main in the root/build.xml and made it it's own task and also removed the property locales. so to build other.locales, the doc target needs to run first (will add a depends at some point).
-in the internal build.xml I have changed to use the new order
------------------------------------------------------------------------
------------------------------------------------------------------------
r13644 | jimurphy@adobe.com | 2010-01-19 18:55:59 -0500 (Tue, 19 Jan 2010) | 11 lines
fix the build.
-make sure the bundles do not get deleted before they are about to be updated, this holds especially true for swcs we are checking in
-make sure we don't try and rebuild osmf.swc as it should not change b/c it is in src
------------------------------------------------------------------------
------------------------------------------------------------------------
r13646 | jimurphy@adobe.com | 2010-01-19 19:29:21 -0500 (Tue, 19 Jan 2010) | 8 lines
fix the build take 2 Don't call other.locales for osmf since there aren't any other locales to build - I am hoping this is why the osmf_rb is losing the catalog
------------------------------------------------------------------------
------------------------------------------------------------------------
r13647 | jimurphy@adobe.com | 2010-01-19 20:04:22 -0500 (Tue, 19 Jan 2010) | 8 lines
this should actually fix the build - call the modified main target to call the bundle task for osmf and actually make the call from frameworks/build.xml
------------------------------------------------------------------------
------------------------------------------------------------------------
r13652 | rfrishbe@adobe.com | 2010-01-19 21:31:18 -0500 (Tue, 19 Jan 2010) | 8 lines
Fixing an MX TextArea bug. It's caused by MX ScrollControlBase pushing the enabled property down in to the BorderSkin and also caused by some enabled/alpha issues in GroupBase. For now, we're fixing the ScrollControlBase issue and no longer pushing the enabled property down in to the skin.
SDK-25109
------------------------------------------------------------------------
------------------------------------------------------------------------
r13653 | jimurphy@adobe.com | 2010-01-19 22:12:19 -0500 (Tue, 19 Jan 2010) | 11 lines
fix airspark_rb so it is localized properly.
-point to framework/bundles/[locale] localized files instead of using the english files we had in arispark
-remove en_US property files from airspark
------------------------------------------------------------------------
------------------------------------------------------------------------
r13654 | aharui@adobe.com | 2010-01-19 23:44:34 -0500 (Tue, 19 Jan 2010) | 8 lines
Replace an IPE defense I took out in svn 10058
SDK-25081
------------------------------------------------------------------------
Modified Paths:
--------------
104 paths were modified
|
incubator/flex/trunk/frameworks/projects/playerglobal/build.xml