Merge remote-tracking branch 'origin/develop' into as3httpclient-work Conflicts: installer/src/InstallApacheFlex.mxml
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e15c4a84 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e15c4a84 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e15c4a84 Branch: refs/heads/develop Commit: e15c4a844e3c09474d9a2a65cc23fc0649364acf Parents: df3dcd6 fb70515 Author: quetwo <n...@theflexgroup.org> Authored: Sun May 31 18:15:55 2015 -0400 Committer: quetwo <n...@theflexgroup.org> Committed: Sun May 31 18:15:55 2015 -0400 ---------------------------------------------------------------------- .../AIRServer/CodeCoveragePreloadSWF.as | 81 + .../AIRServer/CodeCoverageServer-app.xml | 265 + CodeCoverage/AIRServer/CodeCoverageServer.mxml | 295 + CodeCoverage/CodeCoveragePreloadSWF.as | 81 - CodeCoverage/CodeCoverageServer-app.xml | 265 - CodeCoverage/CodeCoverageServer.mxml | 295 - CodeCoverage/JavaServer/README | 131 + CodeCoverage/JavaServer/build.xml | 39 + CodeCoverage/JavaServer/flex/build.xml | 68 + .../flex/src/CodeCoverageClientSocket.as | 145 + .../flex/src/CodeCoveragePreloadSWF.as | 190 + CodeCoverage/JavaServer/java/build.xml | 157 + .../JavaServer/java/ccserver.properties | 8 + .../reporter/CodeCoverageReporter.java | 549 + .../codecoverage/reporter/CoverageData.java | 113 + .../codecoverage/reporter/CoverageSummary.java | 423 + .../tools/codecoverage/reporter/LineInfo.java | 107 + .../reporter/PackageSummaryInfo.java | 77 + .../codecoverage/reporter/SummaryInfo.java | 187 + .../codecoverage/reporter/SummaryType.java | 29 + .../reporter/reports/IReportFactory.java | 37 + .../reporter/reports/IReportWriter.java | 40 + .../reporter/reports/ReportOptions.java | 204 + .../reporter/reports/XMLReportFactory.java | 36 + .../reporter/reports/XMLReportWriter.java | 371 + .../reporter/swf/DebugLineVisitor.java | 239 + .../reporter/swf/SWFLineReporter.java | 143 + .../codecoverage/server/CodeCoverageServer.java | 556 + .../codecoverage/server/DataSocketAccepter.java | 174 + .../codecoverage/server/DataSocketReader.java | 88 + .../codecoverage/server/PolicyFileServer.java | 167 + MD5Checker/build.xml | 4 +- .../spelling/framework/ResourceTable.as | 2 +- .../spelling/framework/ui/SparkHighlighter.as | 13 +- .../com/adobe/linguistics/spelling/SpellUI.as | 236 +- .../linguistics/spelling/FLEX_34717_Tests.as | 2 +- .../linguistics/spelling/FLEX_34756_Test.as | 160 + .../linguistics/spelling/SpellingConfig.xml | 7 + .../spelling/dictionaries/en_GB/en_GB.aff | 1150 + .../spelling/dictionaries/en_GB/en_GB.dic | 46281 +++++++++++++++++ ant_on_air/build.xml | 2 + ant_on_air/locale/en_AU/ant.properties | 33 +- ant_on_air/locale/en_GB/ant.properties | 33 +- ant_on_air/locale/en_US/ant.properties | 33 +- .../src/org/apache/flex/ant/tags/Replace.as | 27 +- .../org/apache/flex/ant/tags/ReplaceToken.as | 44 + .../org/apache/flex/ant/tags/ReplaceValue.as | 44 + .../src/org/apache/flex/ant/tags/TStamp.as | 11 +- ant_on_air/tests/test.xml | 23 +- installer/README | 53 +- installer/build.xml | 10 +- .../apache/flex/runtimelocale/ini/IniReader.as | 4 - .../maven/plugins/flex/compiler/Compiler.java | 6 - .../maven/plugins/flex/generator/Generator.java | 6 - .../maven/plugins/flex/optimizer/Optimizer.java | 6 - .../maven/plugins/flex/packager/Packager.java | 6 - .../flex/maven/plugins/flex/test/Test.java | 6 - .../flex/compiler/asdoc/AsdocCompilerImpl.java | 6 - .../flex/compiler/compc/CompcCompilerImpl.java | 6 - .../compiler/falcon/FalconCompilerImpl.java | 6 - .../flex/compiler/mxmlc/MxmlcCompilerImpl.java | 6 - .../examples/flexjs/flexjs-hello-world/pom.xml | 76 + .../src/main/flex/FlexJSTest_basic.mxml | 53 + .../src/main/flex/MyInitialView.mxml | 143 + .../src/main/flex/StockDataJSONItemConverter.as | 38 + .../src/main/flex/controllers/MyController.as | 92 + .../src/main/flex/models/MyModel.as | 59 + maven-flex-plugin/examples/flexjs/pom.xml | 40 + .../examples/i18n/compiled-locales/pom.xml | 40 + .../examples/i18n/compiled-locales/swf/pom.xml | 77 + .../swf/src/main/flex/Main.mxml | 49 + .../main/locales/de_DE/myresources.properties | 19 + .../main/locales/en_US/myresources.properties | 19 + .../examples/i18n/compiled-locales/war/pom.xml | 124 + .../war/src/main/webapp/WEB-INF/web.xml | 31 + .../examples/i18n/locale-chains/pom.xml | 40 + .../examples/i18n/locale-chains/swf/pom.xml | 79 + .../locale-chains/swf/src/main/flex/Main.mxml | 63 + .../main/locales/de_AT/myresources.properties | 19 + .../main/locales/de_DE/myresources.properties | 20 + .../main/locales/en_GB/myresources.properties | 19 + .../main/locales/en_US/myresources.properties | 21 + .../examples/i18n/locale-chains/war/pom.xml | 124 + .../war/src/main/webapp/WEB-INF/web.xml | 31 + maven-flex-plugin/examples/i18n/pom.xml | 42 + .../examples/i18n/runtime-locales/pom.xml | 40 + .../examples/i18n/runtime-locales/swf/pom.xml | 77 + .../runtime-locales/swf/src/main/flex/Main.mxml | 80 + .../main/locales/de_DE/myresources.properties | 19 + .../main/locales/en_US/myresources.properties | 19 + .../examples/i18n/runtime-locales/war/pom.xml | 124 + .../war/src/main/webapp/WEB-INF/web.xml | 31 + maven-flex-plugin/examples/mobile/pom.xml | 40 + .../examples/mobile/simple-air/pom.xml | 110 + .../mobile/simple-air/src/main/air/sign.p12 | Bin 0 -> 2482 bytes .../main/flex/SimpleAirMobileApplication.mxml | 27 + .../simple-air/src/main/flex/tabs/Tab1.mxml | 24 + .../simple-air/src/main/flex/tabs/Tab2.mxml | 24 + .../src/main/resources/descriptor.xml | 297 + maven-flex-plugin/examples/pom.xml | 120 + .../maven/plugins/flex/AbstractFlexMojo.java | 6 - .../plugins/flex/compiler/CompilerMojo.java | 6 - .../plugins/flex/generator/GeneratorMojo.java | 6 - .../plugins/flex/optimizer/OptimizerMojo.java | 6 - .../plugins/flex/packager/PackagerMojo.java | 6 - .../plugins/flex/test/TestCompilerMojo.java | 6 - .../plugins/flex/test/TestGeneratorMojo.java | 6 - .../maven/plugins/flex/test/TestRunnerMojo.java | 6 - .../maven/plugins/mavenizer/MavenizerMojo.java | 6 - mavenizer/LICENSE | 203 + mavenizer/NOTICE | 5 + mavenizer/README.txt | 310 +- mavenizer/RELEASE_NOTES | 19 + mavenizer/cli/pom.xml | 101 + .../converter/core/SdkConverterCLI.java | 394 + mavenizer/converters/air/pom.xml | 4 +- .../utilities/converter/air/AirConverter.java | 11 +- mavenizer/converters/base/pom.xml | 10 +- .../flex/utilities/converter/BaseConverter.java | 47 +- .../flex/utilities/converter/Converter.java | 2 - .../src/main/resources/templates/default.ftl | 41 + .../src/main/resources/templates/default.vm | 23 - .../base/src/main/resources/templates/pom.ftl | 55 + .../base/src/main/resources/templates/pom.vm | 37 - .../base/src/main/resources/velocity.properties | 10 - mavenizer/converters/flash/pom.xml | 4 +- .../converter/flash/FlashConverter.java | 20 +- mavenizer/converters/flex/pom.xml | 14 +- .../utilities/converter/flex/FlexConverter.java | 77 +- mavenizer/converters/fontkit/pom.xml | 41 + .../converter/fontkit/FontkitConverter.java | 74 + mavenizer/converters/pom.xml | 8 +- mavenizer/converters/wrapper/pom.xml | 41 + .../converter/wrapper/WrapperConverter.java | 93 + mavenizer/core/pom.xml | 82 - .../utilities/converter/core/AirDownloader.java | 55 - .../converter/core/BatchConverter.java | 87 - .../converter/core/FlashDownloader.java | 65 - .../utilities/converter/core/SdkConverter.java | 70 - mavenizer/deployers/aether/pom.xml | 4 +- .../deployer/aether/AetherDeployer.java | 22 +- mavenizer/deployers/maven/pom.xml | 4 +- .../converter/deployer/maven/MavenDeployer.java | 4 - mavenizer/deployers/pom.xml | 6 +- mavenizer/maven-extension/pom.xml | 118 + .../converter/mavenextension/FlexEventSpy.java | 241 + mavenizer/mavenizer/pom.xml | 120 - mavenizer/pom.xml | 28 +- mavenizer/retrievers/base/pom.xml | 30 +- .../retrievers/types/PlatformType.java | 23 +- .../converter/retrievers/types/SdkType.java | 4 +- .../converter/retrievers/utils/ProgressBar.java | 2 +- .../retrievers/types/PlatformTypeTest.java | 69 + mavenizer/retrievers/download/pom.xml | 15 +- .../retrievers/download/DownloadRetriever.java | 376 +- .../src/main/resources/message.properties | 1 + mavenizer/retrievers/pom.xml | 6 +- 157 files changed, 57405 insertions(+), 1861 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e15c4a84/installer/README ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e15c4a84/installer/build.xml ---------------------------------------------------------------------- diff --cc installer/build.xml index 49de697,24288dc..e052051 --- a/installer/build.xml +++ b/installer/build.xml @@@ -288,22 -293,10 +293,23 @@@ <isfalse value="${isMD5ok}"/> </condition> </fail> + --> </target> - <target name="compile" depends="get-as3commons.swc" + <target name="check-as3httpclient.swc"> + <available file="${LIBRARY_DIR}/as3httpclient.swc" property="as3httpclient.swc.present"/> + </target> + + <!-- This has a BSD license which is a reciprocal license with the Apache v2 license. --> + <target name="get-as3httpclient.swc" depends="check-as3commons.swc" unless="as3httpclient.swc.present" + description="Download as3httpclient.swc"> + <mkdir dir="${LIBRARY_DIR}"/> + <get src="https://github.com/quetwo/as3httpclient/releases/download/1.0/as3httpclient.swc" + dest="${LIBRARY_DIR}/as3httpclient.swc" + verbose="true"/> + </target> + + <target name="compile" depends="get-as3commons.swc, get-as3httpclient.swc" description="Compiles the AIR application to a SWF file and places SWF in a temp directory to be packaged."> <mxmlc file="${SOURCE_DIR}/${APP_NAME}.${APP_EXTENSION}" output="${BUILD_DIR}/${APP_NAME}.swf"