On 1/8/13 12 :36AM, "Alex Harui" <aha...@adobe.com> wrote:
>Carol, I believe the flex-config.xml change is not what you wanted. Can >you >verify and revert if I am correct? Bad merge. You're right. Sorry about that. Author: cframpton Date: Tue Jan 8 15:35:04 2013 New Revision: 1430322 URL: http://svn.apache.org/viewvc?rev=1430322&view=rev Log: Rollback bad merge of 1421347 but leave in Justin's updates to the metadata from 1429395. Modified: flex/sdk/branches/develop/frameworks/flex-config.xml Carol > >Thanks, >-Alex > >On 12/13/12 7:50 AM, "cframp...@apache.org" <cframp...@apache.org> wrote: > >> Author: cframpton >> Date: Thu Dec 13 15:50:45 2012 >> New Revision: 1421347 >> >> URL: http://svn.apache.org/viewvc?rev=1421347&view=rev >> Log: >> Merge all unmerged changes from release4.9 to develop. >> >> Modified: >> incubator/flex/sdk/branches/develop/ (props changed) >> incubator/flex/sdk/branches/develop/KEYS >> incubator/flex/sdk/branches/develop/NOTICE >> incubator/flex/sdk/branches/develop/RELEASE_NOTES >> incubator/flex/sdk/branches/develop/build.xml >> incubator/flex/sdk/branches/develop/frameworks/flex-config.xml >> incubator/flex/sdk/branches/develop/mustella/build.xml >> >> Propchange: incubator/flex/sdk/branches/develop/ >> >>------------------------------------------------------------------------- >>----- >> Merged >> >>/incubator/flex/sdk/branches/release4.9:r1417241-1418411,1418413-1418462, >>14184 >> 64-1421328 >> >> Modified: incubator/flex/sdk/branches/develop/KEYS >> URL: >> >>http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/KEYS?rev >>=1421 >> 347&r1=1421346&r2=1421347&view=diff >> >>========================================================================= >>===== >> --- incubator/flex/sdk/branches/develop/KEYS (original) >> +++ incubator/flex/sdk/branches/develop/KEYS Thu Dec 13 15:50:45 2012 >> @@ -262,3 +262,63 @@ j7fbBfvl1NNzxoXm+WgO2/W1DSJDxO00rZboj/wO >> EyHfcH1CYCaCMPEP2x5gPuQKWd2U >> =EadN >> -----END PGP PUBLIC KEY BLOCK----- >> + >> +pub 4096R/AEEAD151 2012-10-20 >> +uid Justin Mclean <jmcl...@apache.org> >> +sig 3 AEEAD151 2012-10-20 Justin Mclean <jmcl...@apache.org> >> +sub 4096R/A7926E70 2012-10-20 >> +sig AEEAD151 2012-10-20 Justin Mclean <jmcl...@apache.org> >> + >> + >> +-----BEGIN PGP PUBLIC KEY BLOCK----- >> +Version: GnuPG/MacGPG2 v2.0.18 (Darwin) >> +Comment: GPGTools - http://gpgtools.org >> + >> +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 >> +=Kaki >> +-----END PGP PUBLIC KEY BLOCK----- >> >> Modified: incubator/flex/sdk/branches/develop/NOTICE >> URL: >> >>http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/NOTICE?r >>ev=14 >> 21347&r1=1421346&r2=1421347&view=diff >> >>========================================================================= >>===== >> --- incubator/flex/sdk/branches/develop/NOTICE (original) >> +++ incubator/flex/sdk/branches/develop/NOTICE Thu Dec 13 15:50:45 2012 >> @@ -25,7 +25,3 @@ The Batik SVG toolkit source contains co >> 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%20 >>sourc >> >>e%2C%20ASDocs%2C%20PDF%20guides%2C%20and%20release%20notes%29/OSMF_1.0.zi >>p >> - >> -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 >> >> Modified: incubator/flex/sdk/branches/develop/RELEASE_NOTES >> URL: >> >>http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/RELEASE_ >>NOTES >> ?rev=1421347&r1=1421346&r2=1421347&view=diff >> >>========================================================================= >>===== >> --- incubator/flex/sdk/branches/develop/RELEASE_NOTES (original) >> +++ incubator/flex/sdk/branches/develop/RELEASE_NOTES Thu Dec 13 >>15:50:45 2012 >> @@ -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 c >> - 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). >> >> Modified: incubator/flex/sdk/branches/develop/build.xml >> URL: >> >>http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.xm >>l?rev >> =1421347&r1=1421346&r2=1421347&view=diff >> >>========================================================================= >>===== >> --- incubator/flex/sdk/branches/develop/build.xml (original) >> +++ incubator/flex/sdk/branches/develop/build.xml Thu Dec 13 15:50:45 >>2012 >> @@ -610,7 +610,6 @@ >> <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/**"/> >> >> Modified: incubator/flex/sdk/branches/develop/frameworks/flex-config.xml >> URL: >> >>http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/framewor >>ks/fl >> ex-config.xml?rev=1421347&r1=1421346&r2=1421347&view=diff >> >>========================================================================= >>===== >> --- incubator/flex/sdk/branches/develop/frameworks/flex-config.xml >>(original) >> +++ incubator/flex/sdk/branches/develop/frameworks/flex-config.xml Thu >>Dec 13 >> 15:50:45 2012 >> @@ -61,7 +61,7 @@ >> <!-- List of SWC files or directories to compile against but to >>omit >> from --> >> <!-- linking. >> --> >> <external-library-path> >> - >> >><path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayer >>Minor >> Version}/playerglobal.swc</path-element> >> + >> >><path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVe >>rsion >> }/playerglobal.swc</path-element> >> </external-library-path> >> >> <!-- Turn on writing of generated/*.as files to disk. These >>files are >> generated by --> >> @@ -81,7 +81,7 @@ >> <path-element>libs</path-element> >> <path-element>libs/mx</path-element> >> <path-element>locale/en_US</path-element> >> - >> >><path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayer >>Minor >> Version}</path-element> >> + >> >><path-element>libs/player/{targetPlayerMajorVersion}.{targetPlayerMinorVe >>rsion >> }</path-element> >> </library-path> >> >> <namespaces> >> @@ -357,7 +357,7 @@ >> <!-- Framework SWC --> >> <runtime-shared-library-path> >> <path-element>libs/framework.swc</path-element> >> - <rsl-url>framework_${build.number}.swf</rsl-url> >> + <rsl-url>framework_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- TextLayout SWC --> >> @@ -367,37 +367,37 @@ >> --> >> <runtime-shared-library-path> >> <path-element>libs/textLayout.swc</path-element> >> - <rsl-url>textLayout_${build.number}.swf</rsl-url> >> + <rsl-url>textLayout_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- Spark SWC--> >> <runtime-shared-library-path> >> <path-element>libs/spark.swc</path-element> >> - <rsl-url>spark_${build.number}.swf</rsl-url> >> + <rsl-url>spark_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- Sparkskins SWC--> >> <runtime-shared-library-path> >> <path-element>libs/sparkskins.swc</path-element> >> - <rsl-url>sparkskins_${build.number}.swf</rsl-url> >> + <rsl-url>sparkskins_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- RPC SWC --> >> <runtime-shared-library-path> >> <path-element>libs/rpc.swc</path-element> >> - <rsl-url>rpc_${build.number}.swf</rsl-url> >> + <rsl-url>rpc_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- Charts SWC --> >> <runtime-shared-library-path> >> <path-element>libs/charts.swc</path-element> >> - <rsl-url>charts_${build.number}.swf</rsl-url> >> + <rsl-url>charts_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- Spark_dmv SWC --> >> <runtime-shared-library-path> >> <path-element>libs/spark_dmv.swc</path-element> >> - <rsl-url>spark_dmv_${build.number}.swf</rsl-url> >> + <rsl-url>spark_dmv_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- OSMF SWC --> >> @@ -407,19 +407,19 @@ >> --> >> <runtime-shared-library-path> >> <path-element>libs/osmf.swc</path-element> >> - <rsl-url>osmf_${build.number}.swf</rsl-url> >> + <rsl-url>osmf_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- MX SWC --> >> <runtime-shared-library-path> >> <path-element>libs/mx/mx.swc</path-element> >> - <rsl-url>mx_${build.number}.swf</rsl-url> >> + <rsl-url>mx_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- Advancedgrids SWC --> >> <runtime-shared-library-path> >> <path-element>libs/advancedgrids.swc</path-element> >> - <rsl-url>advancedgrids_${build.number}.swf</rsl-url> >> + <rsl-url>advancedgrids_4.9.0.0.swf</rsl-url> >> </runtime-shared-library-path> >> >> <!-- static-link-runtime-shared-libraries: statically link the >> libraries specified by the -runtime-shared-libraries-path option.--> >> >> Modified: incubator/flex/sdk/branches/develop/mustella/build.xml >> URL: >> >>http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella >>/buil >> d.xml?rev=1421347&r1=1421346&r2=1421347&view=diff >> >>========================================================================= >>===== >> --- incubator/flex/sdk/branches/develop/mustella/build.xml (original) >> +++ incubator/flex/sdk/branches/develop/mustella/build.xml Thu Dec 13 >>15:50:45 >> 2012 >> @@ -63,6 +63,7 @@ >> <property name="previous.generated.testfiles" >> >>value="**/*.swf,**/*.output,**/SWFs/${apollo_transform_prefix}*.mxml,**/s >>wfs/$ >> >>{apollo_transform_prefix}*.mxml,**/SWFs/${apollo_transform_prefix2}*.mxml >>,**/s >> wfs/${apollo_transform_prefix2}*.mxml" /> >> >> <property name="sdk.mustella.dir" value="${mustella.dir}/tests" /> >> + <mkdir dir="${sdk.mustella.dir}" /> >> >> <property name="root.dir" value="${basedir}/.."/> >> <property name="sdk.dir" value="${basedir}/.." /> >> >> > >-- >Alex Harui >Flex SDK Team >Adobe Systems, Inc. >http://blogs.adobe.com/aharui >
