Build failed in Jenkins: flex-falcon #484
See http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/484/changes Changes: [mschmalle] Removed commented out methods from JSFlexJSEmitter.java and placed them in Notes text file [mschmalle] - Moved emitBindableVarDefineProperty() to Bindable emitter. [mschmalle] - Refactored as and is to emitter. -- [...truncated 1976 lines...] [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\mx\compile-config.xml [junit] [junit] 1273707 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\_mx810206787419126168.swc in 29.600 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\automation\compile-config.xml [junit] [junit] 222175 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\automation4039287062782038553.swc in 6.289 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\charts\compile-config.xml [junit] [junit] 785538 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\charts8172783310874990792.swc in 18.924 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\core\compile-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\framework\framework-config.xml [junit] [junit] 66837 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\core1315720429760996618.swc in 3.207 seconds [junit] Tests run: 29, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 272.321 sec [junit] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 jar.tests: [java] Apache Flex MXML and ActionScript Compiler (mxmlc) [java] Version 0.0.3 build 0 [java] [java] mxmlc [options] [defaultVar] [java] Use 'mxmlc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWC Component Compiler (compc) [java] Version 0.0.3 build 0 [java] [java] compc [options] [defaultVar] [java] Use 'compc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] ActionScript 3.0 Compiler for AVM+ [java] Version 0.0.3 build 0 [java] [java] usage: asc [-abcfuture] [-api version] [-AS3] [-avmtarget vm version [java]number] [-b] [-coach] [-config ns::name=value] [-d] [-doc] [java][-ES] [-ES4] [-exe avmplus path] [-f] [-h] [-i] [-import [java]filename] [-in filename] [-inline] [-l] [-language lang] [java][-le swc file] [-li swc file] [-log] [-m] [-md] [-merge] [java][-movieclip] [-o] [-o2 name=value] [-optimize] [-out [java]basename] [-outdir output directory name] [-p] [-parallel] [java][-removedeadcode] [-sanity] [-static] [-strict] [-swf [java]classname,width,height[,fps]] [-use namespace] [-warnings] [java]FILENAME... [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache ActionScript Compiler (optimizer) [java] Version 0.0.3 build 0 [java] [java] optimizer [options] [defaultVar] [java] Use 'optimizer -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWF Dump Utility [java] Version 0.0.3 build 0 [java] [java] Usage: swfdump [-abc] file1.swf [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 ant.tests: [mxmlc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [mxmlc] [mxmlc] 509 bytes written to C:\Jenkins\workspace\flex-falcon\compiler.tests\Hello.swf in 8.937 seconds [delete] Deleting: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.tests/Hello.swf [compc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [compc] [compc] 1627 bytes written to C:\Jenkins\workspace\flex-falcon\compiler.tests\Hello.swc in 6.853 seconds [delete] Deleting: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.tests/Hello.swc main: compiler.jx.tests: download: prepare: [mkdir] Created dir: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.jx.tests/lib junit-jar-check: junit-jar: [echo] Obtaining lib/junit-4.10.jar junit-jar-check: junit-download-jar: download-jar: [get] Getting:
Build failed in Jenkins: flex-falcon #486
See http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/486/changes Changes: [mschmalle] - Added formatQualifiedName() to IJSEmitter. -- [...truncated 1976 lines...] [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\mx\compile-config.xml [junit] [junit] 1273707 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\_mx4786136268377340860.swc in 30.218 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\automation\compile-config.xml [junit] [junit] 222175 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\automation4393941526206329065.swc in 6.245 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\charts\compile-config.xml [junit] [junit] 785539 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\charts4167611764390711905.swc in 15.534 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\core\compile-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\framework\framework-config.xml [junit] [junit] 66837 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\core2310941489524960028.swc in 4.766 seconds [junit] Tests run: 29, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 264.073 sec [junit] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 jar.tests: [java] Apache Flex MXML and ActionScript Compiler (mxmlc) [java] Version 0.0.3 build 0 [java] [java] mxmlc [options] [defaultVar] [java] Use 'mxmlc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWC Component Compiler (compc) [java] Version 0.0.3 build 0 [java] [java] compc [options] [defaultVar] [java] Use 'compc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] ActionScript 3.0 Compiler for AVM+ [java] Version 0.0.3 build 0 [java] [java] usage: asc [-abcfuture] [-api version] [-AS3] [-avmtarget vm version [java]number] [-b] [-coach] [-config ns::name=value] [-d] [-doc] [java][-ES] [-ES4] [-exe avmplus path] [-f] [-h] [-i] [-import [java]filename] [-in filename] [-inline] [-l] [-language lang] [java][-le swc file] [-li swc file] [-log] [-m] [-md] [-merge] [java][-movieclip] [-o] [-o2 name=value] [-optimize] [-out [java]basename] [-outdir output directory name] [-p] [-parallel] [java][-removedeadcode] [-sanity] [-static] [-strict] [-swf [java]classname,width,height[,fps]] [-use namespace] [-warnings] [java]FILENAME... [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache ActionScript Compiler (optimizer) [java] Version 0.0.3 build 0 [java] [java] optimizer [options] [defaultVar] [java] Use 'optimizer -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWF Dump Utility [java] Version 0.0.3 build 0 [java] [java] Usage: swfdump [-abc] file1.swf [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 ant.tests: [mxmlc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [mxmlc] [mxmlc] 509 bytes written to C:\Jenkins\workspace\flex-falcon\compiler.tests\Hello.swf in 8.485 seconds [delete] Deleting: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.tests/Hello.swf [compc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [compc] [compc] 1627 bytes written to C:\Jenkins\workspace\flex-falcon\compiler.tests\Hello.swc in 6.904 seconds [delete] Deleting: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.tests/Hello.swc main: compiler.jx.tests: download: prepare: [mkdir] Created dir: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.jx.tests/lib junit-jar-check: junit-jar: [echo] Obtaining lib/junit-4.10.jar junit-jar-check: junit-download-jar: download-jar: [get] Getting: http://search.maven.org/remotecontent?filepath=junit/junit/4.10/junit-4.10.jar [get] To:
[1/2] git commit: [flex-falcon] [refs/heads/develop] - Removed commented out methods from JSFlexJSEmitter.java and placed them in Notes text file (not sure if the might still be used).
Repository: flex-falcon Updated Branches: refs/heads/develop dbad22c99 - ec0a79236 Removed commented out methods from JSFlexJSEmitter.java and placed them in Notes text file (not sure if the might still be used). Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f51e2348 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f51e2348 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f51e2348 Branch: refs/heads/develop Commit: f51e23484ec78cca4935d0f5cab53ae309fa7abc Parents: dbad22c Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 11:39:50 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 11:39:50 2015 -0400 -- .../codegen/js/flexjs/JSFlexJSEmitter.java | 349 +- .../codegen/js/flexjs/Notes_JSFlexJSEmitter.txt | 367 +++ 2 files changed, 368 insertions(+), 348 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f51e2348/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index 7aa4e2a..5562e31 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -342,7 +342,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter @Override public void emitGetAccessor(IGetterNode node) { - classEmitter.getGetSetEmitter().emitGet(node); +classEmitter.getGetSetEmitter().emitGet(node); } @Override @@ -545,92 +545,6 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter } -/* -@Override -public void emitForEachLoop(IForLoopNode node) -{ -IContainerNode xnode = (IContainerNode) node.getChild(1); -IBinaryOperatorNode bnode = (IBinaryOperatorNode) node -.getConditionalsContainerNode().getChild(0); -IASNode childNode = bnode.getChild(0); - -write(ASEmitterTokens.TRY); -write(ASEmitterTokens.BLOCK_OPEN); -writeNewline(); - -write(JSGoogEmitterTokens.GOOG_ARRAY_FOREACH); -write(ASEmitterTokens.PAREN_OPEN); -getWalker().walk(bnode.getChild(1)); -writeToken(ASEmitterTokens.COMMA); -writeToken(ASEmitterTokens.FUNCTION); -write(ASEmitterTokens.PAREN_OPEN); -if (childNode instanceof IVariableExpressionNode) - write(((IVariableNode) childNode.getChild(0)).getName()); -else - write(((IIdentifierNode) childNode).getName()); -writeToken(ASEmitterTokens.PAREN_CLOSE); -if (isImplicit(xnode)) -write(ASEmitterTokens.BLOCK_OPEN); -getWalker().walk(node.getStatementContentsNode()); -if (isImplicit(xnode)) -{ -writeNewline(); -write(ASEmitterTokens.BLOCK_CLOSE); -} -write(ASEmitterTokens.PAREN_CLOSE); -writeNewline(); -write(ASEmitterTokens.BLOCK_CLOSE); -writeNewline(); -write(ASEmitterTokens.CATCH); -write(ASEmitterTokens.PAREN_OPEN); -write(foreachbreakerror); -write(ASEmitterTokens.PAREN_CLOSE); -write(ASEmitterTokens.SPACE); -write(ASEmitterTokens.BLOCK_OPEN); -write(ASEmitterTokens.BLOCK_CLOSE); -writeNewline(); - -} - -@Override -public void emitIterationFlow(IIterationFlowNode node) -{ - // look for break in foreach and throw error instead - if (node.getKind() == IIterationFlowNode.IterationFlowKind.BREAK) - { - IASNode pNode = node.getParent(); - while (pNode != null) - { - ASTNodeID id = pNode.getNodeID(); - if (id == ASTNodeID.ForEachLoopID) - { - write(ASEmitterTokens.THROW); - write(ASEmitterTokens.SPACE); - write(ASEmitterTokens.NEW); - write(ASEmitterTokens.SPACE); - write(JSGoogEmitterTokens.ERROR); - write(ASEmitterTokens.PAREN_OPEN); - write(ASEmitterTokens.PAREN_CLOSE); - write(ASEmitterTokens.SEMICOLON); - return; - } - else
git commit: [flex-falcon] [refs/heads/develop] - - Fixed a bug in JSGoogDocEmitter where the project was not resolved and thus the test was faulty not showing it's qualified name. * The bug was respon
Repository: flex-falcon Updated Branches: refs/heads/develop 0610fdb6a - e3548616e - Fixed a bug in JSGoogDocEmitter where the project was not resolved and thus the test was faulty not showing it's qualified name. * The bug was responsible for 2 tests failing, when there is no type the visitor test failt, just put an if() in to fix it. - Removed the project reference from JSFlexJSEmitter. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e3548616 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e3548616 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e3548616 Branch: refs/heads/develop Commit: e3548616ead7817ceda859f414524e21742fc2a8 Parents: 0610fdb Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 13:06:43 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 13:06:43 2015 -0400 -- .../flexjs/files/wildcard_import_result.js | 2 +- .../codegen/js/flexjs/JSFlexJSEmitter.java | 8 +--- .../codegen/js/goog/JSGoogDocEmitter.java | 39 +++- .../internal/codegen/js/goog/JSGoogEmitter.java | 3 +- 4 files changed, 26 insertions(+), 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e3548616/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js -- diff --git a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js index 72981e3..1ee8469 100644 --- a/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js +++ b/compiler.jx.tests/test-files/flexjs/files/wildcard_import_result.js @@ -61,7 +61,7 @@ wildcard_import.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'wildcard_import * @private */ wildcard_import.prototype.tmp = function() { - var /** @type {Button} */ myButton; + var /** @type {org_apache_flex_html_Button} */ myButton; myButton = new org_apache_flex_html_Button(); }; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e3548616/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index 2460d3f..ec1f3db 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -199,9 +199,6 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter public void emitIdentifier(IIdentifierNode node) { // TODO (mschmalle) remove when project field is removed -if (project == null) -project = getWalker().getProject(); - identifierEmitter.emit(node); } @@ -229,9 +226,6 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter public void emitMemberAccessExpression(IMemberAccessExpressionNode node) { // TODO (mschmalle) remove when project field is removed -if (project == null) -project = getWalker().getProject(); - memberAccessEmitter.emit(node); } @@ -280,7 +274,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter } if (isBindableSetter) { -getDoc().emitMethodDoc(fn, project); +getDoc().emitMethodDoc(fn, getWalker().getProject()); write(formatQualifiedName(type.getQualifiedName())); if (!node.hasModifier(ASModifier.STATIC)) { http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e3548616/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java index 0f8f960..e402ac9 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java @@ -74,7 +74,8 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter IDefinition dnode = inode.resolve(project); if (dnode != null) { -emitJSDocLine(ASEmitterTokens.EXTENDS, formatQualifiedName(dnode.getQualifiedName())); +
[4/5] git commit: [flex-falcon] [refs/heads/develop] - Bypass FlexJS' new underscored namespace convention
Bypass FlexJS' new underscored namespace convention Signed-off-by: Erik de Bruin e...@ixsoftware.nl Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a388b191 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a388b191 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a388b191 Branch: refs/heads/develop Commit: a388b191544e7fee7d999b0301d2e4a0b8f1f939 Parents: 33961df Author: Erik de Bruin e...@ixsoftware.nl Authored: Mon Feb 16 12:52:23 2015 +0100 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:40:30 2015 +0200 -- .../codegen/js/vf2js/JSVF2JSDocEmitter.java | 48 .../codegen/mxml/vf2js/MXMLVF2JSEmitter.java| 2 +- .../codegen/mxml/vf2js/MXMLVF2JSPublisher.java | 2 +- 3 files changed, 50 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a388b191/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java index c0a1241..f731c2b 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java @@ -40,6 +40,7 @@ import org.apache.flex.compiler.projects.ICompilerProject; import org.apache.flex.compiler.tree.as.IDefinitionNode; import org.apache.flex.compiler.tree.as.IExpressionNode; import org.apache.flex.compiler.tree.as.IFunctionNode; +import org.apache.flex.compiler.tree.as.IInterfaceNode; import org.apache.flex.compiler.tree.as.IParameterNode; import org.apache.flex.compiler.tree.as.IVariableNode; @@ -52,6 +53,41 @@ public class JSVF2JSDocEmitter extends JSGoogDocEmitter } @Override +public void emitInterfaceDoc(IInterfaceNode node, ICompilerProject project) +{ +begin(); + +emitJSDocLine(JSEmitterTokens.INTERFACE.getToken()); + +boolean hasQualifiedNames = true; +IExpressionNode[] inodes = node.getExtendedInterfaceNodes(); +for (IExpressionNode inode : inodes) +{ +IDefinition dnode = inode.resolve(project); +if (dnode != null) +{ +emitJSDocLine(ASEmitterTokens.EXTENDS, dnode.getQualifiedName()); +} +else +{ +hasQualifiedNames = false; +break; +} +} + +if (!hasQualifiedNames) +{ +String[] inames = node.getExtendedInterfaces(); +for (String iname : inames) +{ +emitJSDocLine(ASEmitterTokens.EXTENDS, iname); +} +} + +end(); +} + +@Override public void emitMethodDoc(IFunctionNode node, ICompilerProject project) { IClassDefinition classDefinition = resolveClassDefinition(node); @@ -268,4 +304,16 @@ public class JSVF2JSDocEmitter extends JSGoogDocEmitter emitPublic(node); } } + +@Override +public void emitExtends(IClassDefinition superDefinition, String packageName) +{ +emitJSDocLine(ASEmitterTokens.EXTENDS, superDefinition.getQualifiedName()); +} + +@Override +public void emitImplements(ITypeDefinition definition, String packageName) +{ +emitJSDocLine(ASEmitterTokens.IMPLEMENTS, definition.getQualifiedName()); +} } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a388b191/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java index 5c2aae0..d18f626 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java @@ -1492,7 +1492,7 @@ public class MXMLVF2JSEmitter extends MXMLEmitter implements if (project.mainCU != null cu.getName().equals(project.mainCU.getName())) { -emitHeaderLine(JSFlexJSEmitterTokens.LANGUAGE_QNAME.getToken()); +emitHeaderLine(org.apache.flex.utils.Language); } writeNewline();
[5/5] git commit: [flex-falcon] [refs/heads/develop] - Quick commit to keep get everything in the repo before Mike goes wild
Quick commit to keep get everything in the repo before Mike goes wild Signed-off-by: Erik de Bruin e...@ixsoftware.nl Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2b06e1e9 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2b06e1e9 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2b06e1e9 Branch: refs/heads/develop Commit: 2b06e1e9f743366aa8333e1b6ab10405b220b76f Parents: 9b95414 Author: Erik de Bruin e...@ixsoftware.nl Authored: Sun May 31 19:39:40 2015 +0200 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:40:31 2015 +0200 -- .../internal/codegen/js/vf2js/TestVF2JSStatements.java | 4 ++-- .../org/apache/flex/compiler/internal/test/TestBase.java| 2 +- .../projects/simpleMXML/src/SimpleMXML_Project_result.js| 2 +- compiler.jx.tests/test-files/vf2js/projects/super/Base.as | 2 ++ .../compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java | 9 - 5 files changed, 10 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2b06e1e9/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java -- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java index 3385b47..8327fcf 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java @@ -346,7 +346,7 @@ public class TestVF2JSStatements extends TestGoogStatements IIfNode node = (IIfNode) getNode( if (numChildren == 0) { if (!typeDescription.@dynamic) { trace(\warning: no describeType entry for '\ + childName + \' on non-dynamic type '\ + typeDescription.@name + \'\); } }, IIfNode.class); asBlockWalker.visitIf(node); -assertOut(if (numChildren == 0) {\n if (!this.typeDescription['E4XOperator']) {\n org_apache_flex_utils_Language.trace(\warning: no describeType entry for '\ + childName + \' on non-dynamic type '\ + this.typeDescription['E4XOperator'] + \'\);\n }\n}); +assertOut(if (numChildren == 0) {\n if (!typeDescription['E4XOperator']) {\n org_apache_flex_utils_Language.trace(\warning: no describeType entry for '\ + childName + \' on non-dynamic type '\ + typeDescription['E4XOperator'] + \'\);\n }\n}); } @Test @@ -355,7 +355,7 @@ public class TestVF2JSStatements extends TestGoogStatements IIfNode node = (IIfNode) getNode( if (options.includeReadOnly) { properties = classInfo..accessor.(@access != \writeonly\) + classInfo..variable; }, IIfNode.class); asBlockWalker.visitIf(node); - assertOut(if (options.includeReadOnly) {\n properties = 'E4XFilter' + this.classInfo['E4XSelector'];\n}); + assertOut(if (options.includeReadOnly) {\n properties = 'E4XFilter' + classInfo['E4XSelector'];\n}); } @Test http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2b06e1e9/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java -- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java index 2a2e90b..3b4f464 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java @@ -261,7 +261,7 @@ public class TestBase implements ITestBase walker.visitCompilationUnit(cu); -//System.out.println(writer.toString()); +System.out.println(writer.toString()); BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream(outputClassFile)); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2b06e1e9/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js -- diff --git a/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js b/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js index e34f12d..d493d28 100644 --- a/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js +++ b/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js @@
[3/5] git commit: [flex-falcon] [refs/heads/develop] - Raise visibility to allow sub class to call from @override method
Raise visibility to allow sub class to call from @override method Signed-off-by: Erik de Bruin e...@ixsoftware.nl Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/33961df1 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/33961df1 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/33961df1 Branch: refs/heads/develop Commit: 33961df15ff123b4af57883069b6124f3acbb02d Parents: e354861 Author: Erik de Bruin e...@ixsoftware.nl Authored: Mon Feb 16 12:51:12 2015 +0100 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:40:30 2015 +0200 -- .../flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/33961df1/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java index e402ac9..b8e513d 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java @@ -398,7 +398,7 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter emitJSDocLine(name.getToken(), ); } -private void emitJSDocLine(String name) +protected void emitJSDocLine(String name) { emitJSDocLine(name, ); }
[1/5] git commit: [flex-falcon] [refs/heads/develop] - Make comment more distinct
Repository: flex-falcon Updated Branches: refs/heads/develop e3548616e - 2b06e1e9f Make comment more distinct Signed-off-by: Erik de Bruin e...@ixsoftware.nl Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9b95414b Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9b95414b Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9b95414b Branch: refs/heads/develop Commit: 9b95414ba99eca4bb0401a906414635e240fc2aa Parents: 06cbaf4 Author: Erik de Bruin e...@ixsoftware.nl Authored: Mon Feb 16 12:53:00 2015 +0100 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:40:30 2015 +0200 -- .../org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9b95414b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java index 4d625d4..ade44c2 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java @@ -74,7 +74,7 @@ public class VF2JSDepsWriter { this.problems = problems; buildDB(); ArrayListGoogDep dps = sort(mainName); - String outString = // generated by FalconJS + \n; + String outString = // generated by FalconJX (VF2JS) + \n; int n = dps.size(); for (int i = n - 1; i = 0; i--) {
[2/5] git commit: [flex-falcon] [refs/heads/develop] - Add null check
Add null check Signed-off-by: Erik de Bruin e...@ixsoftware.nl Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/06cbaf4a Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/06cbaf4a Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/06cbaf4a Branch: refs/heads/develop Commit: 06cbaf4a4b6a953c34f253fedcb97f64fc7f23ee Parents: a388b19 Author: Erik de Bruin e...@ixsoftware.nl Authored: Mon Feb 16 12:52:44 2015 +0100 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:40:30 2015 +0200 -- .../internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/06cbaf4a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java index d18f626..209916a 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java @@ -1391,10 +1391,13 @@ public class MXMLVF2JSEmitter extends MXMLEmitter implements public void emitComponent(IMXMLComponentNode node) { MXMLVF2JSDescriptorSpecifier ps = getCurrentDescriptor(ps); -ps.value = new mx.core.ClassFactory(; +if (ps != null) +{ + ps.value = new mx.core.ClassFactory(; -ps.value += node.getName(); -ps.value += ); + ps.value += node.getName(); + ps.value += ); +} setBufferWrite(true); emitSubDocument(node);
Git Push Summary
Repository: flex-falcon Updated Branches: refs/heads/vf2js [created] 2b06e1e9f
git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Updated ApacheURLLoader component to properly announce events.
Repository: flex-utilities Updated Branches: refs/heads/as3httpclient-work 281223a9d - df3dcd66e Updated ApacheURLLoader component to properly announce events. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/df3dcd66 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/df3dcd66 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/df3dcd66 Branch: refs/heads/as3httpclient-work Commit: df3dcd66e076c62d710fd97e994c1f03d7ed398d Parents: 281223a Author: quetwo n...@theflexgroup.org Authored: Sun May 31 17:21:12 2015 -0400 Committer: quetwo n...@theflexgroup.org Committed: Sun May 31 17:21:12 2015 -0400 -- .../flex/packageflexsdk/util/ApacheURLLoader.as | 64 ++-- 1 file changed, 20 insertions(+), 44 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/df3dcd66/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as -- diff --git a/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as b/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as index 3893821..07a85c4 100644 --- a/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as +++ b/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as @@ -30,6 +30,7 @@ package org.apache.flex.packageflexsdk.util import flash.events.ErrorEvent; import flash.events.Event; +import flash.events.HTTPStatusEvent; import flash.events.IOErrorEvent; import flash.events.SecurityErrorEvent; import flash.net.URLLoader; @@ -37,9 +38,7 @@ package org.apache.flex.packageflexsdk.util import flash.utils.ByteArray; import org.httpclient.HttpClient; -import org.httpclient.events.HttpDataEvent; import org.httpclient.events.HttpDataListener; -import org.httpclient.events.HttpErrorEvent; import org.httpclient.events.HttpRequestEvent; import org.httpclient.events.HttpResponseEvent; import org.httpclient.events.HttpStatusEvent; @@ -62,48 +61,45 @@ package org.apache.flex.packageflexsdk.util } else { -trace(request.url); var httpsClient:HttpClient = new HttpClient(); var httpsClientListener:HttpDataListener = new HttpDataListener(); httpsClientListener.onConnect = function(event:HttpRequestEvent):void { -trace(connect); +var e:Event = new Event(Event.OPEN); +dispatchEvent(e); }; httpsClientListener.onComplete = function(event:HttpResponseEvent):void { -trace(complete.); +var e:HTTPStatusEvent = new HTTPStatusEvent(HTTPStatusEvent.HTTP_RESPONSE_STATUS); +// we are unable to emulate the full event since the built-in event handlers for status and +// many others are marked as private on the set functions. +dispatchEvent(e); }; -httpsClientListener.onClose = function(event:Event):void +httpsClientListener.onDataComplete = function(event:HttpResponseEvent, incomingData:ByteArray):void { -trace(close.); -}; - -httpsClientListener.onDataComplete = function(event:HttpResponseEvent, data:ByteArray):void -{ -trace(onDataComplete); +data = new ByteArray(); +data.writeBytes(incomingData); +data.position=0; +var e:Event = new Event(Event.COMPLETE); +dispatchEvent(e); }; httpsClientListener.onStatus = function(event:HttpStatusEvent):void { -trace(onStatus); +var e:HTTPStatusEvent = new HTTPStatusEvent(HTTPStatusEvent.HTTP_STATUS); +// we are unable to emulate the full event since the built-in event handlers for status and +// many others are marked as private on the set functions. +dispatchEvent(e); }; httpsClientListener.onError = function(event:ErrorEvent):void { -trace(http error); -}; - -httpsClientListener.onData = function(event:HttpDataEvent):void -{ -trace(data event.); -}; - -httpsClientListener.onRequest = function(event:HttpRequestEvent):void -{ -
git commit: [flex-falcon] [refs/heads/develop] - - Added formatQualifiedName() to IJSEmitter. - Removed all casts dealing with formatQualifiedName() addition.
Repository: flex-falcon Updated Branches: refs/heads/develop ac4c40d07 - b23da0525 - Added formatQualifiedName() to IJSEmitter. - Removed all casts dealing with formatQualifiedName() addition. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b23da052 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b23da052 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b23da052 Branch: refs/heads/develop Commit: b23da0525e805be61045e2c89f579a5119d8ae63 Parents: ac4c40d Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 14:13:03 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 14:13:03 2015 -0400 -- .../flex/compiler/codegen/js/IJSEmitter.java | 2 ++ .../compiler/internal/codegen/js/JSEmitter.java| 8 .../codegen/js/flexjs/JSFlexJSEmitter.java | 17 + .../internal/codegen/js/goog/JSGoogEmitter.java| 17 + .../internal/codegen/js/jx/AccessorEmitter.java| 13 +++-- .../internal/codegen/js/jx/AsIsEmitter.java| 6 +- .../codegen/js/jx/BinaryOperatorEmitter.java | 10 ++ .../internal/codegen/js/jx/BindableEmitter.java| 7 ++- .../internal/codegen/js/jx/ClassEmitter.java | 2 +- .../internal/codegen/js/jx/FieldEmitter.java | 14 +- .../codegen/js/jx/FunctionCallEmitter.java | 5 +++-- .../internal/codegen/js/jx/IdentifierEmitter.java | 8 ++-- .../codegen/js/jx/MemberAccessEmitter.java | 7 ++- .../codegen/js/jx/PackageFooterEmitter.java| 14 ++ .../codegen/js/jx/PackageHeaderEmitter.java| 5 + .../internal/codegen/js/jx/SuperCallEmitter.java | 10 -- 16 files changed, 68 insertions(+), 77 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b23da052/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSEmitter.java index 01444e7..5a83ec6 100644 --- a/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/codegen/js/IJSEmitter.java @@ -34,4 +34,6 @@ import org.apache.flex.compiler.visitor.IASNodeStrategy; public interface IJSEmitter extends IASEmitter { JSSessionModel getModel(); + +String formatQualifiedName(String name); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b23da052/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java index 4eb6ccb..1c55dcd 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java @@ -49,6 +49,12 @@ public class JSEmitter extends ASEmitter implements IJSEmitter } @Override +public String formatQualifiedName(String name) +{ +return name; +} + +@Override public void emitLocalNamedFunction(IFunctionNode node) { FunctionNode fnode = (FunctionNode)node; @@ -68,4 +74,6 @@ public class JSEmitter extends ASEmitter implements IJSEmitter emitFunctionScope(fnode.getScopedNode()); } + + } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b23da052/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index ec1f3db..5b8b1fe 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -161,6 +161,15 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter } @Override +public String formatQualifiedName(String name) +{ +if (name.contains(goog.) || name.startsWith(Vector.)) +return name; +name = name.replaceAll(\\., _); +return name; +} + +@Override public void emitClass(IClassNode node) { classEmitter.emit(node); @@ -447,12 +456,4 @@ public class JSFlexJSEmitter extends JSGoogEmitter
Build failed in Jenkins: flex-falcon #485
See http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/485/changes Changes: [mschmalle] - Fixed a bug in JSGoogDocEmitter where the project was not resolved [erik] Raise visibility to allow sub class to call from @override method [erik] Bypass FlexJS' new underscored namespace convention [erik] Add null check [erik] Make comment more distinct [erik] Quick commit to keep get everything in the repo before Mike goes wild [erik] Revert Raise visibility to allow sub class to call from @override method [erik] Revert Bypass FlexJS' new underscored namespace convention [erik] Revert Add null check [erik] Revert Make comment more distinct [erik] Revert Quick commit to keep get everything in the repo before Mike goes wild -- [...truncated 1976 lines...] [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\mx\compile-config.xml [junit] [junit] 1273707 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\_mx6448899500914162357.swc in 32.241 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\automation\compile-config.xml [junit] [junit] 222175 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\automation6907052308946945363.swc in 6.343 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\charts\compile-config.xml [junit] [junit] 785538 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\charts6575202140939354688.swc in 18.034 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\core\compile-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\framework\framework-config.xml [junit] [junit] 66837 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\core4607551551745326309.swc in 2.898 seconds [junit] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [junit] Tests run: 29, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 265.096 sec jar.tests: [java] Apache Flex MXML and ActionScript Compiler (mxmlc) [java] Version 0.0.3 build 0 [java] [java] mxmlc [options] [defaultVar] [java] Use 'mxmlc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWC Component Compiler (compc) [java] Version 0.0.3 build 0 [java] [java] compc [options] [defaultVar] [java] Use 'compc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] ActionScript 3.0 Compiler for AVM+ [java] Version 0.0.3 build 0 [java] [java] usage: asc [-abcfuture] [-api version] [-AS3] [-avmtarget vm version [java]number] [-b] [-coach] [-config ns::name=value] [-d] [-doc] [java][-ES] [-ES4] [-exe avmplus path] [-f] [-h] [-i] [-import [java]filename] [-in filename] [-inline] [-l] [-language lang] [java][-le swc file] [-li swc file] [-log] [-m] [-md] [-merge] [java][-movieclip] [-o] [-o2 name=value] [-optimize] [-out [java]basename] [-outdir output directory name] [-p] [-parallel] [java][-removedeadcode] [-sanity] [-static] [-strict] [-swf [java]classname,width,height[,fps]] [-use namespace] [-warnings] [java]FILENAME... [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache ActionScript Compiler (optimizer) [java] Version 0.0.3 build 0 [java] [java] optimizer [options] [defaultVar] [java] Use 'optimizer -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWF Dump Utility [java] Version 0.0.3 build 0 [java] [java] Usage: swfdump [-abc] file1.swf [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 ant.tests: [mxmlc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [mxmlc] [mxmlc] 509 bytes written to C:\Jenkins\workspace\flex-falcon\compiler.tests\Hello.swf in 8.640 seconds [delete] Deleting: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.tests/Hello.swf [compc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [compc] [compc] 1627 bytes written to
[1/2] git commit: [flex-falcon] [refs/heads/develop] - Cleanup organize.
Repository: flex-falcon Updated Branches: refs/heads/develop c9535aa13 - 3266a06d8 Cleanup organize. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ec5fa07e Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ec5fa07e Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ec5fa07e Branch: refs/heads/develop Commit: ec5fa07ed244af48eea9cbccde15d42ba78e9567 Parents: c9535aa Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 15:16:36 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 15:16:36 2015 -0400 -- .../codegen/js/flexjs/JSFlexJSEmitter.java | 161 ++- .../internal/codegen/js/goog/JSGoogEmitter.java | 4 + 2 files changed, 91 insertions(+), 74 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec5fa07e/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index 4463d0a..66a5731 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -258,35 +258,45 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter methodEmitter.emit(node); } + //-- +// Statements + //-- + @Override public void emitFunctionCall(IFunctionCallNode node) { functionCallEmitter.emit(node); } +@Override +public void emitForEachLoop(IForLoopNode node) +{ +forEachEmitter.emit(node); +} + + //-- +// Expressions //-- @Override -protected void emitSelfReference(IFunctionNode node) +public void emitSuperCall(IASNode node, String type) { -// we don't want 'var self = this;' in FlexJS -// unless there are anonymous functions -if (node.containsAnonymousFunctions()) -super.emitSelfReference(node); +superCallEmitter.emit(node, type); } @Override -public void emitIdentifier(IIdentifierNode node) +public void emitMemberAccessExpression(IMemberAccessExpressionNode node) { -identifierEmitter.emit(node); +memberAccessEmitter.emit(node); } - //-- - @Override -public void emitSuperCall(IASNode node, String type) +public void emitE4XFilter(IMemberAccessExpressionNode node) { -superCallEmitter.emit(node, type); +// ToDo (erikdebruin): implement E4X replacement !?! +write(ASEmitterTokens.SINGLE_QUOTE); +write(E4XFilter); +write(ASEmitterTokens.SINGLE_QUOTE); } @Override @@ -295,6 +305,61 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter binaryOperatorEmitter.emit(node); } +@Override +public void emitTypedExpression(ITypedExpressionNode node) +{ +write(JSGoogEmitterTokens.ARRAY); +} + +@Override +public void emitIdentifier(IIdentifierNode node) +{ +identifierEmitter.emit(node); +} + +@Override +public void emitLiteral(ILiteralNode node) +{ +boolean isWritten = false; + +String s = node.getValue(true); +if (!(node instanceof RegExpLiteralNode)) +{ +if (node.getLiteralType() == LiteralType.XML) +{ +// ToDo (erikdebruin): VF2JS - handle XML output properly... + +write(' + s + '); + +isWritten = true; +} +s = s.replaceAll(\n, __NEWLINE_PLACEHOLDER__); +s = s.replaceAll(\r, __CR_PLACEHOLDER__); +s = s.replaceAll(\t, __TAB_PLACEHOLDER__); +s = s.replaceAll(\f, __FORMFEED_PLACEHOLDER__); +s = s.replaceAll(\b, __BACKSPACE_PLACEHOLDER__); +s = s.replaceAll(\, __QUOTE_PLACEHOLDER__); +s = s.replaceAll(, __ESCAPE_PLACEHOLDER__); +//s = \' + s.replaceAll(\', \') + \'; +s = s.replaceAll(__ESCAPE_PLACEHOLDER__, ); +s = s.replaceAll(__QUOTE_PLACEHOLDER__, \); +s =
git commit: [flex-falcon] [refs/heads/develop] - - Refactored literal to emitter. - Refactored self ref to emitter.
Repository: flex-falcon Updated Branches: refs/heads/develop 3266a06d8 - 765254d74 - Refactored literal to emitter. - Refactored self ref to emitter. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/765254d7 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/765254d7 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/765254d7 Branch: refs/heads/develop Commit: 765254d74f163ede2c0d063e1a37f21761353754 Parents: 3266a06 Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 15:40:01 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 15:40:01 2015 -0400 -- .../codegen/js/flexjs/JSFlexJSEmitter.java | 56 +++ .../internal/codegen/js/jx/LiteralEmitter.java | 74 .../codegen/js/jx/SelfReferenceEmitter.java | 52 ++ 3 files changed, 135 insertions(+), 47 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/765254d7/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index 78f1f0b..e1df65a 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -38,14 +38,15 @@ import org.apache.flex.compiler.internal.codegen.js.jx.ForEachEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.FunctionCallEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.IdentifierEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.InterfaceEmitter; +import org.apache.flex.compiler.internal.codegen.js.jx.LiteralEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.MemberAccessEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.MethodEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.ObjectDefinePropertyEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.PackageFooterEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.PackageHeaderEmitter; +import org.apache.flex.compiler.internal.codegen.js.jx.SelfReferenceEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.SuperCallEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.VarDeclarationEmitter; -import org.apache.flex.compiler.internal.tree.as.RegExpLiteralNode; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.IAccessorNode; @@ -60,7 +61,6 @@ import org.apache.flex.compiler.tree.as.IGetterNode; import org.apache.flex.compiler.tree.as.IIdentifierNode; import org.apache.flex.compiler.tree.as.IInterfaceNode; import org.apache.flex.compiler.tree.as.ILiteralNode; -import org.apache.flex.compiler.tree.as.ILiteralNode.LiteralType; import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode; import org.apache.flex.compiler.tree.as.ISetterNode; import org.apache.flex.compiler.tree.as.ITypedExpressionNode; @@ -96,8 +96,10 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter private MemberAccessEmitter memberAccessEmitter; private BinaryOperatorEmitter binaryOperatorEmitter; private IdentifierEmitter identifierEmitter; +private LiteralEmitter literalEmitter; private AsIsEmitter asIsEmitter; +private SelfReferenceEmitter selfReferenceEmitter; private ObjectDefinePropertyEmitter objectDefinePropertyEmitter; private DefinePropertyFunctionEmitter definePropertyFunctionEmitter; @@ -146,10 +148,12 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter superCallEmitter = new SuperCallEmitter(this); forEachEmitter = new ForEachEmitter(this); memberAccessEmitter = new MemberAccessEmitter(this); -asIsEmitter = new AsIsEmitter(this); binaryOperatorEmitter = new BinaryOperatorEmitter(this); identifierEmitter = new IdentifierEmitter(this); +literalEmitter = new LiteralEmitter(this); +asIsEmitter = new AsIsEmitter(this); +selfReferenceEmitter = new SelfReferenceEmitter(this); objectDefinePropertyEmitter = new ObjectDefinePropertyEmitter(this); definePropertyFunctionEmitter = new DefinePropertyFunctionEmitter(this); } @@ -320,40 +324,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter @Override public void emitLiteral(ILiteralNode node) { -
[2/2] git commit: [flex-falcon] [refs/heads/develop] - - Refactored define property function into emitter. - Refactored object define property into emitter.
- Refactored define property function into emitter. - Refactored object define property into emitter. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3266a06d Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3266a06d Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3266a06d Branch: refs/heads/develop Commit: 3266a06d8d3a5426d1d67dc49ccc8540a8a63d49 Parents: ec5fa07 Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 15:29:52 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 15:29:52 2015 -0400 -- .../codegen/js/flexjs/JSFlexJSEmitter.java | 138 ++- .../internal/codegen/js/goog/JSGoogEmitter.java | 2 + .../js/jx/DefinePropertyFunctionEmitter.java| 120 ++ .../js/jx/ObjectDefinePropertyEmitter.java | 166 +++ 4 files changed, 299 insertions(+), 127 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3266a06d/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index 66a5731..78f1f0b 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -23,13 +23,8 @@ import java.io.FilterWriter; import org.apache.flex.compiler.codegen.js.flexjs.IJSFlexJSEmitter; import org.apache.flex.compiler.codegen.js.goog.IJSGoogDocEmitter; -import org.apache.flex.compiler.common.ASModifier; -import org.apache.flex.compiler.common.IMetaInfo; -import org.apache.flex.compiler.definitions.IFunctionDefinition; import org.apache.flex.compiler.definitions.IPackageDefinition; -import org.apache.flex.compiler.definitions.ITypeDefinition; import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; -import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitter; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.jx.AccessorEmitter; @@ -37,6 +32,7 @@ import org.apache.flex.compiler.internal.codegen.js.jx.AsIsEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.BinaryOperatorEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.BindableEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.ClassEmitter; +import org.apache.flex.compiler.internal.codegen.js.jx.DefinePropertyFunctionEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.FieldEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.ForEachEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.FunctionCallEmitter; @@ -44,13 +40,12 @@ import org.apache.flex.compiler.internal.codegen.js.jx.IdentifierEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.InterfaceEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.MemberAccessEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.MethodEmitter; +import org.apache.flex.compiler.internal.codegen.js.jx.ObjectDefinePropertyEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.PackageFooterEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.PackageHeaderEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.SuperCallEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.VarDeclarationEmitter; -import org.apache.flex.compiler.internal.tree.as.FunctionNode; import org.apache.flex.compiler.internal.tree.as.RegExpLiteralNode; -import org.apache.flex.compiler.internal.tree.as.SetterNode; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; import org.apache.flex.compiler.tree.as.IAccessorNode; @@ -67,7 +62,6 @@ import org.apache.flex.compiler.tree.as.IInterfaceNode; import org.apache.flex.compiler.tree.as.ILiteralNode; import org.apache.flex.compiler.tree.as.ILiteralNode.LiteralType; import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode; -import org.apache.flex.compiler.tree.as.IParameterNode; import org.apache.flex.compiler.tree.as.ISetterNode; import org.apache.flex.compiler.tree.as.ITypedExpressionNode; import org.apache.flex.compiler.tree.as.IVariableNode; @@ -100,10 +94,13 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter private SuperCallEmitter superCallEmitter; private ForEachEmitter forEachEmitter;
[2/5] git commit: [flex-falcon] [refs/heads/develop] - Revert Add null check
Revert Add null check This reverts commit 06cbaf4a4b6a953c34f253fedcb97f64fc7f23ee. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/27b6d989 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/27b6d989 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/27b6d989 Branch: refs/heads/develop Commit: 27b6d989607128c79dcdab04227a5f18d13e6f7a Parents: 2d0adbb Author: Erik de Bruin e...@ixsoftware.nl Authored: Sun May 31 19:47:38 2015 +0200 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:47:38 2015 +0200 -- .../internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/27b6d989/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java index e56a654..5c2aae0 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java @@ -1391,13 +1391,10 @@ public class MXMLVF2JSEmitter extends MXMLEmitter implements public void emitComponent(IMXMLComponentNode node) { MXMLVF2JSDescriptorSpecifier ps = getCurrentDescriptor(ps); -if (ps != null) -{ - ps.value = new mx.core.ClassFactory(; +ps.value = new mx.core.ClassFactory(; - ps.value += node.getName(); - ps.value += ); -} +ps.value += node.getName(); +ps.value += ); setBufferWrite(true); emitSubDocument(node);
[3/5] git commit: [flex-falcon] [refs/heads/develop] - Revert Raise visibility to allow sub class to call from @override method
Revert Raise visibility to allow sub class to call from @override method This reverts commit 33961df15ff123b4af57883069b6124f3acbb02d. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/08846bed Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/08846bed Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/08846bed Branch: refs/heads/develop Commit: 08846bed4a7f1fe62059194e4beb1bef8d7926d6 Parents: 2b06e1e Author: Erik de Bruin e...@ixsoftware.nl Authored: Sun May 31 19:47:38 2015 +0200 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:47:38 2015 +0200 -- .../flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/08846bed/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java index b8e513d..e402ac9 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogDocEmitter.java @@ -398,7 +398,7 @@ public class JSGoogDocEmitter extends JSDocEmitter implements IJSGoogDocEmitter emitJSDocLine(name.getToken(), ); } -protected void emitJSDocLine(String name) +private void emitJSDocLine(String name) { emitJSDocLine(name, ); }
[1/5] git commit: [flex-falcon] [refs/heads/develop] - Revert Quick commit to keep get everything in the repo before Mike goes wild
Repository: flex-falcon Updated Branches: refs/heads/develop 2b06e1e9f - ac4c40d07 Revert Quick commit to keep get everything in the repo before Mike goes wild This reverts commit 2b06e1e9f743366aa8333e1b6ab10405b220b76f. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ac4c40d0 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ac4c40d0 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ac4c40d0 Branch: refs/heads/develop Commit: ac4c40d07ca56e6941b6a90c3234920db873c919 Parents: 39b63cf Author: Erik de Bruin e...@ixsoftware.nl Authored: Sun May 31 19:47:38 2015 +0200 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:47:38 2015 +0200 -- .../internal/codegen/js/vf2js/TestVF2JSStatements.java | 4 ++-- .../org/apache/flex/compiler/internal/test/TestBase.java| 2 +- .../projects/simpleMXML/src/SimpleMXML_Project_result.js| 2 +- compiler.jx.tests/test-files/vf2js/projects/super/Base.as | 2 -- .../compiler/internal/codegen/js/vf2js/JSVF2JSEmitter.java | 9 + 5 files changed, 9 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ac4c40d0/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java -- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java index 8327fcf..3385b47 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/vf2js/TestVF2JSStatements.java @@ -346,7 +346,7 @@ public class TestVF2JSStatements extends TestGoogStatements IIfNode node = (IIfNode) getNode( if (numChildren == 0) { if (!typeDescription.@dynamic) { trace(\warning: no describeType entry for '\ + childName + \' on non-dynamic type '\ + typeDescription.@name + \'\); } }, IIfNode.class); asBlockWalker.visitIf(node); -assertOut(if (numChildren == 0) {\n if (!typeDescription['E4XOperator']) {\n org_apache_flex_utils_Language.trace(\warning: no describeType entry for '\ + childName + \' on non-dynamic type '\ + typeDescription['E4XOperator'] + \'\);\n }\n}); +assertOut(if (numChildren == 0) {\n if (!this.typeDescription['E4XOperator']) {\n org_apache_flex_utils_Language.trace(\warning: no describeType entry for '\ + childName + \' on non-dynamic type '\ + this.typeDescription['E4XOperator'] + \'\);\n }\n}); } @Test @@ -355,7 +355,7 @@ public class TestVF2JSStatements extends TestGoogStatements IIfNode node = (IIfNode) getNode( if (options.includeReadOnly) { properties = classInfo..accessor.(@access != \writeonly\) + classInfo..variable; }, IIfNode.class); asBlockWalker.visitIf(node); - assertOut(if (options.includeReadOnly) {\n properties = 'E4XFilter' + classInfo['E4XSelector'];\n}); + assertOut(if (options.includeReadOnly) {\n properties = 'E4XFilter' + this.classInfo['E4XSelector'];\n}); } @Test http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ac4c40d0/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java -- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java index 3b4f464..2a2e90b 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java @@ -261,7 +261,7 @@ public class TestBase implements ITestBase walker.visitCompilationUnit(cu); -System.out.println(writer.toString()); +//System.out.println(writer.toString()); BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream(outputClassFile)); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ac4c40d0/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js -- diff --git a/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js b/compiler.jx.tests/test-files/vf2js/projects/simpleMXML/src/SimpleMXML_Project_result.js index d493d28..e34f12d 100644 ---
[4/5] git commit: [flex-falcon] [refs/heads/develop] - Revert Make comment more distinct
Revert Make comment more distinct This reverts commit 9b95414ba99eca4bb0401a906414635e240fc2aa. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/39b63cf7 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/39b63cf7 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/39b63cf7 Branch: refs/heads/develop Commit: 39b63cf79c7eb651891d4bed74d043cb3711c5df Parents: 27b6d98 Author: Erik de Bruin e...@ixsoftware.nl Authored: Sun May 31 19:47:38 2015 +0200 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:47:38 2015 +0200 -- .../org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/39b63cf7/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java index ade44c2..4d625d4 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/graph/VF2JSDepsWriter.java @@ -74,7 +74,7 @@ public class VF2JSDepsWriter { this.problems = problems; buildDB(); ArrayListGoogDep dps = sort(mainName); - String outString = // generated by FalconJX (VF2JS) + \n; + String outString = // generated by FalconJS + \n; int n = dps.size(); for (int i = n - 1; i = 0; i--) {
[5/5] git commit: [flex-falcon] [refs/heads/develop] - Revert Bypass FlexJS' new underscored namespace convention
Revert Bypass FlexJS' new underscored namespace convention This reverts commit a388b191544e7fee7d999b0301d2e4a0b8f1f939. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2d0adbb1 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2d0adbb1 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2d0adbb1 Branch: refs/heads/develop Commit: 2d0adbb1ab0293d343b4ae077971171a8abee6eb Parents: 08846be Author: Erik de Bruin e...@ixsoftware.nl Authored: Sun May 31 19:47:38 2015 +0200 Committer: Erik de Bruin e...@ixsoftware.nl Committed: Sun May 31 19:47:38 2015 +0200 -- .../codegen/js/vf2js/JSVF2JSDocEmitter.java | 48 .../codegen/mxml/vf2js/MXMLVF2JSEmitter.java| 2 +- .../codegen/mxml/vf2js/MXMLVF2JSPublisher.java | 2 +- 3 files changed, 2 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2d0adbb1/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java index f731c2b..c0a1241 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java @@ -40,7 +40,6 @@ import org.apache.flex.compiler.projects.ICompilerProject; import org.apache.flex.compiler.tree.as.IDefinitionNode; import org.apache.flex.compiler.tree.as.IExpressionNode; import org.apache.flex.compiler.tree.as.IFunctionNode; -import org.apache.flex.compiler.tree.as.IInterfaceNode; import org.apache.flex.compiler.tree.as.IParameterNode; import org.apache.flex.compiler.tree.as.IVariableNode; @@ -53,41 +52,6 @@ public class JSVF2JSDocEmitter extends JSGoogDocEmitter } @Override -public void emitInterfaceDoc(IInterfaceNode node, ICompilerProject project) -{ -begin(); - -emitJSDocLine(JSEmitterTokens.INTERFACE.getToken()); - -boolean hasQualifiedNames = true; -IExpressionNode[] inodes = node.getExtendedInterfaceNodes(); -for (IExpressionNode inode : inodes) -{ -IDefinition dnode = inode.resolve(project); -if (dnode != null) -{ -emitJSDocLine(ASEmitterTokens.EXTENDS, dnode.getQualifiedName()); -} -else -{ -hasQualifiedNames = false; -break; -} -} - -if (!hasQualifiedNames) -{ -String[] inames = node.getExtendedInterfaces(); -for (String iname : inames) -{ -emitJSDocLine(ASEmitterTokens.EXTENDS, iname); -} -} - -end(); -} - -@Override public void emitMethodDoc(IFunctionNode node, ICompilerProject project) { IClassDefinition classDefinition = resolveClassDefinition(node); @@ -304,16 +268,4 @@ public class JSVF2JSDocEmitter extends JSGoogDocEmitter emitPublic(node); } } - -@Override -public void emitExtends(IClassDefinition superDefinition, String packageName) -{ -emitJSDocLine(ASEmitterTokens.EXTENDS, superDefinition.getQualifiedName()); -} - -@Override -public void emitImplements(ITypeDefinition definition, String packageName) -{ -emitJSDocLine(ASEmitterTokens.IMPLEMENTS, definition.getQualifiedName()); -} } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2d0adbb1/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java index 209916a..e56a654 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSEmitter.java @@ -1495,7 +1495,7 @@ public class MXMLVF2JSEmitter extends MXMLEmitter implements if (project.mainCU != null cu.getName().equals(project.mainCU.getName())) { -emitHeaderLine(org.apache.flex.utils.Language); +emitHeaderLine(JSFlexJSEmitterTokens.LANGUAGE_QNAME.getToken()); } writeNewline();
Jenkins build is back to stable : flex-flexunit #380
See http://apacheflexbuild.cloudapp.net:8080/job/flex-flexunit/380/
Build failed in Jenkins: flex-falcon #487
See http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/487/changes Changes: [mschmalle] Removed getDoc() with getDocEmitter(), override with interface. [mschmalle] - Refactored more shared utility methods. [mschmalle] - Refactored interface to emitter. [mschmalle] Cleanup organize. [mschmalle] - Refactored define property function into emitter. [mschmalle] - Refactored literal to emitter. -- [...truncated 1976 lines...] [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\mx\compile-config.xml [junit] [junit] 1273707 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\_mx4025015545850583751.swc in 31.225 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\automation\compile-config.xml [junit] [junit] 222175 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\automation6365882310594162194.swc in 6.521 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\charts\compile-config.xml [junit] [junit] 785538 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\charts3779968613984108319.swc in 16.369 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\core\compile-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\framework\framework-config.xml [junit] [junit] 66837 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\core1831715073316964134.swc in 5.037 seconds [junit] Tests run: 29, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 277.137 sec [junit] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 jar.tests: [java] Apache Flex MXML and ActionScript Compiler (mxmlc) [java] Version 0.0.3 build 0 [java] [java] mxmlc [options] [defaultVar] [java] Use 'mxmlc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWC Component Compiler (compc) [java] Version 0.0.3 build 0 [java] [java] compc [options] [defaultVar] [java] Use 'compc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] ActionScript 3.0 Compiler for AVM+ [java] Version 0.0.3 build 0 [java] [java] usage: asc [-abcfuture] [-api version] [-AS3] [-avmtarget vm version [java]number] [-b] [-coach] [-config ns::name=value] [-d] [-doc] [java][-ES] [-ES4] [-exe avmplus path] [-f] [-h] [-i] [-import [java]filename] [-in filename] [-inline] [-l] [-language lang] [java][-le swc file] [-li swc file] [-log] [-m] [-md] [-merge] [java][-movieclip] [-o] [-o2 name=value] [-optimize] [-out [java]basename] [-outdir output directory name] [-p] [-parallel] [java][-removedeadcode] [-sanity] [-static] [-strict] [-swf [java]classname,width,height[,fps]] [-use namespace] [-warnings] [java]FILENAME... [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache ActionScript Compiler (optimizer) [java] Version 0.0.3 build 0 [java] [java] optimizer [options] [defaultVar] [java] Use 'optimizer -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWF Dump Utility [java] Version 0.0.3 build 0 [java] [java] Usage: swfdump [-abc] file1.swf [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 ant.tests: [mxmlc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [mxmlc] [mxmlc] 509 bytes written to C:\Jenkins\workspace\flex-falcon\compiler.tests\Hello.swf in 8.910 seconds [delete] Deleting: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.tests/Hello.swf [compc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [compc] [compc] 1627 bytes written to C:\Jenkins\workspace\flex-falcon\compiler.tests\Hello.swc in 7.136 seconds [delete] Deleting: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.tests/Hello.swc main: compiler.jx.tests: download: prepare: [mkdir] Created dir: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.jx.tests/lib junit-jar-check: junit-jar: [echo] Obtaining
[2/2] git commit: [flex-falcon] [refs/heads/develop] - - Moved emitBindableVarDefineProperty() to Bindable emitter. - Refactored foreach into emitter.
- Moved emitBindableVarDefineProperty() to Bindable emitter. - Refactored foreach into emitter. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ec0a7923 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ec0a7923 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ec0a7923 Branch: refs/heads/develop Commit: ec0a792366d61ef6be6967745e96c13b662cd421 Parents: f51e234 Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 12:00:44 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 12:00:44 2015 -0400 -- .../internal/codegen/js/JSSessionModel.java | 12 +++ .../codegen/js/flexjs/JSFlexJSEmitter.java | 105 +-- .../internal/codegen/js/jx/BindableEmitter.java | 58 +- .../internal/codegen/js/jx/ForEachEmitter.java | 88 4 files changed, 162 insertions(+), 101 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec0a7923/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java index ba8df11..48079fa 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java @@ -50,6 +50,8 @@ public class JSSessionModel private ArrayListString bindableVars = new ArrayListString(); +private int foreachLoopCount = 0; + public IClassDefinition getCurrentClass() { return currentClass; @@ -80,4 +82,14 @@ public class JSSessionModel return bindableVars; } +public final void incForeachLoopCount() +{ +foreachLoopCount++; +} + +public String getCurrentForeachName() +{ +return foreachiter + Integer.toString(foreachLoopCount); +} + } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ec0a7923/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index 5562e31..f86ca5a 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -26,7 +26,6 @@ import org.apache.flex.compiler.codegen.IDocEmitter; import org.apache.flex.compiler.codegen.js.flexjs.IJSFlexJSEmitter; import org.apache.flex.compiler.common.ASModifier; import org.apache.flex.compiler.common.IMetaInfo; -import org.apache.flex.compiler.definitions.IClassDefinition; import org.apache.flex.compiler.definitions.IDefinition; import org.apache.flex.compiler.definitions.IFunctionDefinition; import org.apache.flex.compiler.definitions.IPackageDefinition; @@ -38,6 +37,7 @@ import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.jx.BinaryOperatorEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.ClassEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.FieldEmitter; +import org.apache.flex.compiler.internal.codegen.js.jx.ForEachEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.FunctionCallEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.IdentifierEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.MemberAccessEmitter; @@ -65,11 +65,10 @@ import org.apache.flex.compiler.tree.as.IMemberAccessExpressionNode; import org.apache.flex.compiler.tree.as.IParameterNode; import org.apache.flex.compiler.tree.as.ISetterNode; import org.apache.flex.compiler.tree.as.ITypedExpressionNode; -import org.apache.flex.compiler.tree.as.IVariableExpressionNode; import org.apache.flex.compiler.tree.as.IVariableNode; /** - * Concrete implementation of the 'goog' JavaScript production. + * Concrete implementation of the 'FlexJS' JavaScript production. * * @author Michael Schmalle * @author Erik de Bruin @@ -77,8 +76,6 @@ import org.apache.flex.compiler.tree.as.IVariableNode; public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter { -private int foreachLoopCounter = 0; - private JSFlexJSDocEmitter docEmitter = null; private PackageHeaderEmitter packageHeaderEmitter; @@ -88,6 +85,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter
git commit: [flex-falcon] [refs/heads/develop] - - Refactored as and is to emitter. - Fixed the call placements/name of the AccessorEmitter.
Repository: flex-falcon Updated Branches: refs/heads/develop ec0a79236 - 0610fdb6a - Refactored as and is to emitter. - Fixed the call placements/name of the AccessorEmitter. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0610fdb6 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0610fdb6 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0610fdb6 Branch: refs/heads/develop Commit: 0610fdb6ab24424b1b87c63f6031e7d49ecd73f3 Parents: ec0a792 Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 12:32:26 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 12:32:26 2015 -0400 -- .../codegen/js/flexjs/JSFlexJSEmitter.java | 101 ++- .../internal/codegen/js/jx/AccessorEmitter.java | 303 +++ .../internal/codegen/js/jx/AsIsEmitter.java | 118 .../internal/codegen/js/jx/ClassEmitter.java| 23 +- .../internal/codegen/js/jx/GetSetEmitter.java | 290 -- .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 12 +- 6 files changed, 456 insertions(+), 391 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0610fdb6/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index f86ca5a..2460d3f 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -21,12 +21,10 @@ package org.apache.flex.compiler.internal.codegen.js.flexjs; import java.io.FilterWriter; -import org.apache.flex.compiler.asdoc.flexjs.ASDocComment; import org.apache.flex.compiler.codegen.IDocEmitter; import org.apache.flex.compiler.codegen.js.flexjs.IJSFlexJSEmitter; import org.apache.flex.compiler.common.ASModifier; import org.apache.flex.compiler.common.IMetaInfo; -import org.apache.flex.compiler.definitions.IDefinition; import org.apache.flex.compiler.definitions.IFunctionDefinition; import org.apache.flex.compiler.definitions.IPackageDefinition; import org.apache.flex.compiler.definitions.ITypeDefinition; @@ -34,7 +32,10 @@ import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitter; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; +import org.apache.flex.compiler.internal.codegen.js.jx.AccessorEmitter; +import org.apache.flex.compiler.internal.codegen.js.jx.AsIsEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.BinaryOperatorEmitter; +import org.apache.flex.compiler.internal.codegen.js.jx.BindableEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.ClassEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.FieldEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.ForEachEmitter; @@ -81,20 +82,34 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter private PackageHeaderEmitter packageHeaderEmitter; private PackageFooterEmitter packageFooterEmitter; +private BindableEmitter bindableEmitter; + private ClassEmitter classEmitter; private FieldEmitter fieldEmitter; +private AccessorEmitter accessorEmitter; private FunctionCallEmitter functionCallEmitter; private SuperCallEmitter superCallEmitter; private ForEachEmitter forEachEmitter; private MemberAccessEmitter memberAccessEmitter; +private AsIsEmitter asIsEmitter; private BinaryOperatorEmitter binaryOperatorEmitter; private IdentifierEmitter identifierEmitter; +public BindableEmitter getBindableEmitter() +{ +return bindableEmitter; +} + public ClassEmitter getClassEmiter() { return classEmitter; } +public AccessorEmitter getAccessorEmitter() +{ +return accessorEmitter; +} + @Override public IDocEmitter getDocEmitter() { @@ -110,12 +125,16 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter packageHeaderEmitter = new PackageHeaderEmitter(this); packageFooterEmitter = new PackageFooterEmitter(this); +bindableEmitter = new BindableEmitter(this); + classEmitter = new ClassEmitter(this); fieldEmitter = new FieldEmitter(this); +accessorEmitter = new AccessorEmitter(this); functionCallEmitter = new
[3/3] git commit: [flex-falcon] [refs/heads/develop] - - Refactored interface to emitter. - Refactored var dec to emitter. - Refactored method to emitter.
- Refactored interface to emitter. - Refactored var dec to emitter. - Refactored method to emitter. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c9535aa1 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c9535aa1 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c9535aa1 Branch: refs/heads/develop Commit: c9535aa13ec6553340e8e315fda670761dd8bcbc Parents: f4404ce Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 15:08:04 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 15:08:04 2015 -0400 -- .../compiler/internal/codegen/as/ASEmitter.java | 4 +- .../internal/codegen/js/JSSessionModel.java | 7 ++ .../codegen/js/flexjs/JSFlexJSEmitter.java | 104 +++-- .../internal/codegen/js/goog/JSGoogEmitter.java | 71 ++-- .../codegen/js/jx/InterfaceEmitter.java | 112 ++ .../internal/codegen/js/jx/MethodEmitter.java | 114 +++ .../codegen/js/jx/VarDeclarationEmitter.java| 88 ++ .../internal/codegen/js/utils/EmitterUtils.java | 6 + .../codegen/js/vf2js/JSVF2JSEmitter.java| 4 +- 9 files changed, 437 insertions(+), 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9535aa1/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java index 7f5f46f..d16081d 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java @@ -699,7 +699,7 @@ public class ASEmitter implements IASEmitter, IEmitter } } -protected void emitMemberKeyword(IDefinitionNode node) +public void emitMemberKeyword(IDefinitionNode node) { if (node instanceof IFunctionNode) { @@ -717,7 +717,7 @@ public class ASEmitter implements IASEmitter, IEmitter getWalker().walk(node.getNameExpressionNode()); } -protected void emitDeclarationName(IDefinitionNode node) +public void emitDeclarationName(IDefinitionNode node) { getWalker().walk(node.getNameExpressionNode()); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9535aa1/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java index 48079fa..8bb30b4 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSSessionModel.java @@ -46,6 +46,8 @@ public class JSSessionModel private HashMapString, PropertyNodes propertyMap = new HashMapString, PropertyNodes(); +private ListString interfacePropertyMap = new ArrayListString(); + private HashMapString, PropertyNodes staticPropertyMap = new HashMapString, PropertyNodes(); private ArrayListString bindableVars = new ArrayListString(); @@ -67,6 +69,11 @@ public class JSSessionModel return propertyMap; } +public ListString getInterfacePropertyMap() +{ +return interfacePropertyMap; +} + public HashMapString, PropertyNodes getStaticPropertyMap() { return staticPropertyMap; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c9535aa1/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index d9b1c4e..4463d0a 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -41,10 +41,13 @@ import org.apache.flex.compiler.internal.codegen.js.jx.FieldEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.ForEachEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.FunctionCallEmitter; import org.apache.flex.compiler.internal.codegen.js.jx.IdentifierEmitter; +import org.apache.flex.compiler.internal.codegen.js.jx.InterfaceEmitter; import
[2/3] git commit: [flex-falcon] [refs/heads/develop] - - Refactored more shared utility methods. - Moved writeIndent() to ASEmitter.
- Refactored more shared utility methods. - Moved writeIndent() to ASEmitter. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f4404cef Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f4404cef Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f4404cef Branch: refs/heads/develop Commit: f4404cef5a2330f62f588b04b0f464eae5bccda4 Parents: a26406d Author: Michael Schmalle mschma...@apache.org Authored: Sun May 31 14:28:16 2015 -0400 Committer: Michael Schmalle mschma...@apache.org Committed: Sun May 31 14:28:16 2015 -0400 -- .../compiler/internal/codegen/as/ASEmitter.java | 26 ++-- .../internal/codegen/js/goog/JSGoogEmitter.java | 124 ++- .../internal/codegen/js/utils/EmitterUtils.java | 42 ++- .../codegen/js/vf2js/JSVF2JSEmitter.java| 12 +- 4 files changed, 78 insertions(+), 126 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f4404cef/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java index 26b1100..7f5f46f 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java @@ -147,12 +147,17 @@ public class ASEmitter implements IASEmitter, IEmitter return currentIndent; } +protected void writeIndent() +{ +write(ASEmitterTokens.INDENT); +} + private IASBlockWalker walker; @Override public IBlockWalker getWalker() { -return (IBlockWalker) walker; +return walker; } @Override @@ -1367,7 +1372,8 @@ public class ASEmitter implements IASEmitter, IEmitter } @Override -public void emitNamespaceAccessExpression(INamespaceAccessExpressionNode node) +public void emitNamespaceAccessExpression( +INamespaceAccessExpressionNode node) { getWalker().walk(node.getLeftOperandNode()); write(node.getOperator().getOperatorText()); @@ -1379,7 +1385,7 @@ public class ASEmitter implements IASEmitter, IEmitter { if (ASNodeUtils.hasParenOpen(node)) write(ASEmitterTokens.PAREN_OPEN); - + if (node.getNodeID() == ASTNodeID.Op_PreIncrID || node.getNodeID() == ASTNodeID.Op_PreDecrID || node.getNodeID() == ASTNodeID.Op_BitwiseNotID @@ -1397,7 +1403,7 @@ public class ASEmitter implements IASEmitter, IEmitter } else { -getWalker().walk(node.getOperandNode()); +getWalker().walk(node.getOperandNode()); } } @@ -1420,7 +1426,7 @@ public class ASEmitter implements IASEmitter, IEmitter getWalker().walk(node.getOperandNode()); write(ASEmitterTokens.PAREN_CLOSE); } - + if (ASNodeUtils.hasParenClose(node)) write(ASEmitterTokens.PAREN_CLOSE); } @@ -1455,23 +1461,27 @@ public class ASEmitter implements IASEmitter, IEmitter { } +@Override public void emitContainer(IContainerNode node) { } +@Override public void emitE4XFilter(IMemberAccessExpressionNode node) { - // ToDo (erikdebruin) +// ToDo (erikdebruin) } +@Override public void emitUseNamespace(IUseNamespaceNode node) { - // ToDo (erikdebruin) +// ToDo (erikdebruin) } +@Override public String stringifyNode(IASNode node) { - boolean oldBufferWrite = isBufferWrite(); +boolean oldBufferWrite = isBufferWrite(); StringBuilder oldBuilder = this.builder; this.builder = new StringBuilder(); setBufferWrite(true); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f4404cef/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java index c431553..7dd7cdb 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java @@ -21,7 +21,6 @@ package org.apache.flex.compiler.internal.codegen.js.goog; import java.io.FilterWriter; import java.util.ArrayList; -import java.util.HashMap; import
[32/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Fine tuned the wrapper generation
- Fine tuned the wrapper generation Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/dd6d4194 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/dd6d4194 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/dd6d4194 Branch: refs/heads/as3httpclient-work Commit: dd6d4194f4c1b21fed64612785338a6716fa2125 Parents: 1a46b11 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 25 12:07:47 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 25 12:07:47 2015 +0200 -- .../converter/wrapper/WrapperConverter.java | 16 +++- .../converter/mavenextension/FlexEventSpy.java | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dd6d4194/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java -- diff --git a/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java b/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java index 6a2b691..7e4af4c 100644 --- a/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java +++ b/mavenizer/converters/wrapper/src/main/java/org/apache/flex/utilities/converter/wrapper/WrapperConverter.java @@ -32,19 +32,25 @@ public class WrapperConverter extends BaseConverter implements Converter { } try { -final File wrapperJar = File.createTempFile(SWFObjectWrapper-2.2, .jar); -generateZip(wrapperRootDir.listFiles(), wrapperJar); +// Rename the index.template.html to index.html +File indexHtml = new File(wrapperRootDir, index.template.html); +if(!indexHtml.renameTo(new File(wrapperRootDir, index.html))) { +System.out.println(Could not rename index.template.html to index.html.); +} + +final File wrapperWar = File.createTempFile(SWFObjectWrapper-2.2, .war); +generateZip(wrapperRootDir.listFiles(), wrapperWar); final MavenArtifact swfobjectWrapper = new MavenArtifact(); swfobjectWrapper.setGroupId(org.apache.flex.wrapper); swfobjectWrapper.setArtifactId(swfobject); swfobjectWrapper.setVersion(getFlexVersion(rootSourceDirectory)); -swfobjectWrapper.setPackaging(jar); -swfobjectWrapper.addDefaultBinaryArtifact(wrapperJar); +swfobjectWrapper.setPackaging(war); +swfobjectWrapper.addDefaultBinaryArtifact(wrapperWar); writeArtifact(swfobjectWrapper); } catch (IOException e) { -throw new ConverterException(Error creating wrapper jar., e); +throw new ConverterException(Error creating wrapper war., e); } } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dd6d4194/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java -- diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java index e946db0..9adf892 100644 --- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java +++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java @@ -131,7 +131,8 @@ public class FlexEventSpy extends AbstractEventSpy { // In order to compile some of the themes, we need to download a // playerglobal version. -logger.info(In order to convert the Apache Flex SDK, a Flash SDK has to be downloaded.); +logger.info(In order to convert some of the skins in the Apache Flex SDK, + +a Flash SDK has to be downloaded.); File flashSdkRoot = downloadRetriever.retrieve(SdkType.FLASH, 10.2); FileUtils.copyDirectory(flashSdkRoot, sdkRoot);
[22/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Minor updates making the plugin run in the lib/ext directory of a Maven 3.3.1 installation.
- Minor updates making the plugin run in the lib/ext directory of a Maven 3.3.1 installation. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/cfcd4650 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/cfcd4650 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/cfcd4650 Branch: refs/heads/as3httpclient-work Commit: cfcd4650661b6f0cb293d7af0bc2cb29efcdfdab Parents: 2b96232 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 18 21:46:55 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 18 21:46:55 2015 +0200 -- mavenizer/maven-extension/pom.xml | 8 ++- .../converter/mavenextension/FlexEventSpy.java | 61 +++- mavenizer/pom.xml | 2 +- 3 files changed, 40 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cfcd4650/mavenizer/maven-extension/pom.xml -- diff --git a/mavenizer/maven-extension/pom.xml b/mavenizer/maven-extension/pom.xml index 9b4a8e1..210a4e4 100644 --- a/mavenizer/maven-extension/pom.xml +++ b/mavenizer/maven-extension/pom.xml @@ -36,7 +36,7 @@ plugin groupIdorg.sonatype.plugins/groupId artifactIdsisu-maven-plugin/artifactId -version1.1/version +version1.4/version executions execution idgenerate-index/id @@ -46,6 +46,7 @@ /execution /executions /plugin + plugin artifactIdmaven-assembly-plugin/artifactId version2.4/version @@ -55,7 +56,6 @@ /descriptorRefs finalNameflex-maven-extension-${project.version}/finalName appendAssemblyIdfalse/appendAssemblyId - /configuration executions execution @@ -100,11 +100,13 @@ groupIdjavax.inject/groupId artifactIdjavax.inject/artifactId version1/version +scopeprovided/scope /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-core/artifactId -version3.1.1/version +version3.3.1/version +scopeprovided/scope /dependency /dependencies http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/cfcd4650/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java -- diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java index b817beb..8c62236 100644 --- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java +++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java @@ -18,6 +18,7 @@ import org.codehaus.plexus.logging.Logger; import org.eclipse.aether.RepositoryEvent; import org.eclipse.aether.artifact.Artifact; +import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; import java.io.File; @@ -29,20 +30,23 @@ import java.io.File; @Singleton public class FlexEventSpy extends AbstractEventSpy { -protected Context context; -protected PlexusContainer plexusContainer; +@Inject protected RepositorySystem repositorySystem; + +@Inject protected Logger logger; +@Inject +protected PlexusContainer plexusContainer; + protected boolean internalLookup = false; protected boolean flexSplashScreenShown = false; +public FlexEventSpy() { +} + @Override public void init(Context context) throws Exception { -this.context = context; -plexusContainer = (PlexusContainer) context.getData().get(plexus); -repositorySystem = plexusContainer.lookup(RepositorySystem.class); -logger = plexusContainer.lookup(Logger.class); } @Override @@ -54,28 +58,27 @@ public class FlexEventSpy extends AbstractEventSpy { try { internalLookup = true; Artifact artifact = repositoryEvent.getArtifact(); -MavenSession session = plexusContainer.lookup(MavenSession.class); if (artifact.getGroupId().startsWith(org.apache.flex)) {
[08/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - FLEX-34756 Adding a unit test that reproduces the bug, and its supporting files.
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/daf48a05/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.dic -- diff --git a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.dic b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.dic new file mode 100644 index 000..d002789 --- /dev/null +++ b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/dictionaries/en_GB/en_GB.dic @@ -0,0 +1,46281 @@ +46280 +abaft +abbreviation/M +abdicate/DNGSn +Abelard/M +abider/M +Abidjan +ablaze +abloom +aboveground +abrader/M +Abram/M +abreaction/MS +abrogator/MS +abscond/DRSG +absinthe/MS +absoluteness/S +absorbency/SM +abstract/ShTVDPiGY +absurdness/S +Abuja/M +Abyssinia/M +Acadia +accede/SDG +accept/BDSRVGkhl +acceptable/P +accepted/U +accommodate/DGnkSNVu +accommodating/U +accompanier/M +accomplish/RLSGD +accordion/MS3 +accost/DSG +accountant/SM +accrual/MS +accurately/I +accusal/M +achene/SM +achievable/U +achieves/c +acidification/M +acidulous +acoustical +acquaintance/SM +acquisition/MA +acridity/SM +acrobatics/M +actinic +actinide/MS +actively/IA +activity/SMI +Acton/M +actual/q8YSQ- +adagio/S +adaptation/M +add/RDGS7 +additivity +Adele/M +adhere/DGRS +adherence/MS +adjudicator/MS +adjunct/SYMV +adjuration/M +adjust/RLDlGS7V +Adler/M +administratrix/M +admiralty/SM +admiration/M +adobe/NvVSMX +adopted/AU +adoption/M +adorned/U +adrenal/Y +adrift +adumbrate/VSGnvDN +Adventist's +adverse/yTDYGP +advertise/LJ +adze/DMSG +Aegean/M +Aeneas +aerialist +aerodrome/SM +aerodynamic/SY +aero-engine/MS +affectedly/U +affective/M +affinity/MS +affirmed/A +affix/DSG +affray/MSDG +affricative/M +aforesaid +after/S +age's/e +agility/MS +agitator/MS +agnostic/MS +agnosticism/SM +agreeableness/ES +agriculturalist +Agrippa/M +AI +Aiken/M +ain't +airflow/MS +airsick/P +airtime +airway/MS +ajar +alabaster/SM +Alamo/S +alanine/M +Alaric/M +alarm/3DGkS +albacore/SM +albedo/M +albeit +album/MS +Aldridge/M +alewife/M +Alexia/M +Alexis +Alfonso/M +Alger/M +Algiers +alienation/M +alinement's +alkyd/S +Allah/M +all-day +allegation/M +allergen/MSW +alleyway/MS +allies/M +allocator/KSC +allots/A +allowable/P +all-star +Allstate +alms/m +alnico +aloft +along +alpine/S +al-Qa'ida/M +Alsace/M +alternation/M +Alton/M +alumni +alundum +alveolus/M +AMA +amanuenses +Amazonian +ambergris/MS +Amdahl/M +Amherst/M +amide/MS +amir's +Amish/M +amoral +amorphous/PY +amortise/nSGD +amortize/nNSGD +amour/MS +amphibian/MS +amphibology/M +ample/PT +amplification/M +anarchy/3Ww1SM +anastigmatic +Andaman/M +aneroid +Anglican/MS +Anglicanism/M +Anglicise/nSGD +Anglicize/nNSGD +Anglophobia/M +angularity/MS +anhydrous/Y +animate/DnASNG +animated/Y +anisette/SM +annalen +annihilator/SM +anorak/SM +anorexia/MS +antediluvian/S +anthem/MdS +anthropometric/S +anthropometry/WM +antibody/MS +anticompetitive +antidemocratic +antiformant +antigenicity/SM +Antigua/M +Antioch/M +antipasti +antipodal/S +antiquarian/MS +antiquarianism/MS +antisepses +antisocial/Y +antitrust/M +antral +anyway +apace +aphasic/S +aphid/MS +apiece +apocrypha/oM +apogee/SM +Apollo/M +apology/SQ8s9M3 +apostle/MS +apotheoses +Appian +appliqu�d +apply/vnNRGDSV +appraisal/AMS +appraise/AGSD +appreciate/vyGVDNnuS +apprehended/a +approbation/MES +Apr +apsis/M +aptness/IS +aquaria +aquiculture's +aquiline +Arabia/M +Arafat/M +arbutus/MS +arcane/Y +arcaneness +arch/yTDRYSPGM +archaist/MS +archery/M +Archimedes +Argentine/SM +argon/M +arguable/YIU +argumentativeness/S +ark/MS +armour-plate/D +armpit/MS +Arne/M +around +array/EGMSD +arrhythmia/SM +arrowhead/SM +arsenate/M +arsine/MS +arsonist +art/6MjZ32pS +arteriolar +artesian +Artie/M +artifice/oMRS +artillery/3mSM +artist/W1y +asbestos/SM +ascertain/L7SDG +ASCII +ascription/M +Asiatic/MS +asp/MWS +aspect/MS +asphyxiate/SDG +asplenium +assail/7DSG +assassination/M +assembles/A +assembling/A +assignee/MS +assignor/SM +associate/EDSGnN +associativity/S +assurance/SAM +Assyria/M +Assyriology +Astana/M +asterisk/SDGM +astigmatism/MS +astride +astrophysicist/SM +at/F +atelier/SM +Atlanta/MW +Atman/M +atoll/MS +atomic/Y +atonal +atonality/SM +atrial +attaches/A +attend/SRGD +attendance/MS +attentional/Y +attentive/PIY +attenuate/GnSDN +attic/MS +attorney/MS +attractive/UY +attractiveness/SM +attribute/xGVvDS +attrition/SM +aubergine/MS +Auckland/M +audaciousness/S +audibly/I +audio/M +audiometry/M +audited/U +auditorium/SM +Aug +augment/NnDRGS +augmentation/M +augury/SM +Augusta/M +Augusts +Australasia/M +Australia/M +authorised/AU +authoritative/YP +autocrat/MWS1 +autodialler +automata +automotive +autoregressive +avalanche/GSMD +avaunt/S +avitaminoses +aweigh +awes/c +awfulness/S +axe/DmMGS +axial/FY +Ayr/M +babble/RGDS +babysit/RSG +bacchanal/SM +Bacchanalian/S +backfield/MS +backfill/SGD +backlasher +backscatter/dMS +backslapper/SM +backstop/MSGD
[41/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Added an initial working example using flexjs
- Added an initial working example using flexjs Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b145b025 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b145b025 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b145b025 Branch: refs/heads/as3httpclient-work Commit: b145b025ca4f9421bdc62e3f79550f70d8aa9c2d Parents: cb3fbd2 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Fri May 8 16:41:34 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Fri May 8 16:41:34 2015 +0200 -- .../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 ++ maven-flex-plugin/examples/pom.xml | 1 + 8 files changed, 502 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/flexjs/flexjs-hello-world/pom.xml -- diff --git a/maven-flex-plugin/examples/flexjs/flexjs-hello-world/pom.xml b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/pom.xml new file mode 100644 index 000..3ad9c85 --- /dev/null +++ b/maven-flex-plugin/examples/flexjs/flexjs-hello-world/pom.xml @@ -0,0 +1,76 @@ +?xml version=1.0 encoding=UTF-8? +!-- + + 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. + +-- +project xmlns=http://maven.apache.org/POM/4.0.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.flex.examples.flexjs/groupId +artifactIdflexjs/artifactId +version1.0.0-SNAPSHOT/version +/parent + +artifactIdflexjs-hello-world/artifactId +version1.0.0-SNAPSHOT/version +packagingswf/packaging + +build +sourceDirectorysrc/main/flex/sourceDirectory +plugins +plugin +groupIdnet.flexmojos.oss/groupId +artifactIdflexmojos-maven-plugin/artifactId +version7.1.0-SNAPSHOT/version +extensionstrue/extensions +configuration +sourceFileFlexJSTest_basic.mxml/sourceFile +!--compilerNameFalcon/compilerName-- +compilerNameFlexJS/compilerName +debugtrue/debug +/configuration +dependencies +dependency +groupIdorg.apache.flex.compiler/groupId +artifactIdfalcon-jx-compiler/artifactId +version0.0.3-SNAPSHOT/version +/dependency +/dependencies +/plugin +/plugins +/build + +dependencies +dependency +groupIdorg.apache.flex.flexjs/groupId +artifactIdframework/artifactId +version0.0.3-SNAPSHOT/version +typepom/type +/dependency +!-- This is still only needed to satisfy check in Flexmojos -- +dependency +groupIdcom.adobe.flash.framework/groupId +artifactIdplayerglobal/artifactId +version14.0/version +typeswc/type +/dependency +/dependencies + +/project http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b145b025/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/FlexJSTest_basic.mxml -- diff --git a/maven-flex-plugin/examples/flexjs/flexjs-hello-world/src/main/flex/FlexJSTest_basic.mxml
[07/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - FLEX-34756 -Renamed some variables for clarity -Separated the creation of the highlighters and SpellingService in new fun
FLEX-34756 -Renamed some variables for clarity -Separated the creation of the highlighters and SpellingService in new functions, so that they can be mocked for unit testing. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/718d5a36 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/718d5a36 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/718d5a36 Branch: refs/heads/as3httpclient-work Commit: 718d5a368822e5fccee734faa1bdd9a96ed0d895 Parents: 07c77ee Author: Mihai Chira mih...@apache.org Authored: Fri Apr 10 14:21:38 2015 +0200 Committer: Mihai Chira mih...@apache.org Committed: Fri Apr 10 14:21:38 2015 +0200 -- .../com/adobe/linguistics/spelling/SpellUI.as | 141 +-- 1 file changed, 70 insertions(+), 71 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/718d5a36/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as -- diff --git a/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as b/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as index 308a703..9b55ff6 100644 --- a/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as +++ b/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as @@ -88,15 +88,12 @@ package com.adobe.linguistics.spelling //private var mTextField:RichEditableText; - private var _dictname:String = new String(); - private var _hundict:HunspellDictionary = new HunspellDictionary(); - private var _userdict:UserDictionary = null; - private var _sharedobj:SharedObject = null; - private var scm:SpellingContextMenu; - - private var _newchecker:SpellChecker = null; + private var _dictionaryName:String = ; + private var _userDictionary:UserDictionary = null; + private var _sharedObject:SharedObject = null; + private var _scm:SpellingContextMenu; private var _resource_locale:Object = null; - private var _spellingservice:SpellingService = null; + private var _spellingService:SpellingService = null; private static var _contextMenuEntries:Object = {enable:Enable Spelling, disable:Disable Spelling, add:Add to dictionary}; private static var _spellingConfigUrl:String = SpellingConfig.xml; @@ -130,16 +127,11 @@ package com.adobe.linguistics.spelling if ( lang == null ) return; // TODO: Change dict parameter type to a SpellCheck class or a URL string. var txt:* = getComponentTextModel(comp); - /*var comp1:UIComponent = txt.parent; - var comp2:UIComponent = txt.owner; - var comp3:UIComponent = txt.parentApplication; - var comp4:UIComponent = txt.parentDocument; - var comp5:UIComponent = txt.parentDocument.hostComponent; --spark parent UICOmponent*/ if ( txt==null || _UITable[comp]!=undefined ) return; // TODO: dangerous, is garbage collection going to clear this? - _UITable[comp]=new SpellUI(txt, lang); + _UITable[comp] = new SpellUI(txt, lang); _parentTable[txt] = comp; _cacheDictTable[comp]=lang; } @@ -307,16 +299,15 @@ package com.adobe.linguistics.spelling return; } _actualParent = textModel; - mTextField = textModel ; + mTextField = textModel; mTextField.addEventListener(FocusEvent.FOCUS_OUT, handleFocusOut); mTextField.addEventListener(FocusEvent.FOCUS_IN, handleFocusIn); mTextField.addEventListener(ScrollEvent.SCROLL, spellCheckScreen); mTextField.parent.addEventListener(Event.RENDER, spellCheckScreen); mTextField.parent.addEventListener(Event.CHANGE, handleChangeEvent); - _dictname = lang; + _dictionaryName = lang; loadConfig(); - } private function
[29/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - AntOnAIR: specifies swf-version 23 when building SWC and test SWF to match the 4.0 AIR descriptor in the tests. When usin
AntOnAIR: specifies swf-version 23 when building SWC and test SWF to match the 4.0 AIR descriptor in the tests. When using an SDK newer than 4.0, AIR would quit with 'error while loading initial content' when running the tests because the newer SDK would build with a higher swf-version than 23 by default, so it wouldn't be compatible with the 4.0 AIR descriptor. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1e870fd6 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1e870fd6 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1e870fd6 Branch: refs/heads/as3httpclient-work Commit: 1e870fd61ad5015782798f30fc72f264a72e2845 Parents: 1a46b11 Author: Josh Tynjala joshtynj...@gmail.com Authored: Fri Apr 24 11:59:57 2015 -0700 Committer: Josh Tynjala joshtynj...@gmail.com Committed: Fri Apr 24 11:59:57 2015 -0700 -- ant_on_air/build.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1e870fd6/ant_on_air/build.xml -- diff --git a/ant_on_air/build.xml b/ant_on_air/build.xml index f83fbba..2048eff 100644 --- a/ant_on_air/build.xml +++ b/ant_on_air/build.xml @@ -128,6 +128,7 @@ description=Compiles the SWC. compc output=${LIBRARY_DIR}/${LIBRARY_NAME}.swc + swf-version=23 debug=${DEBUG_FLAG} failonerror=true fork=true @@ -158,6 +159,7 @@ mxmlc file=${basedir}/tests/AntOnAir.mxml output=${basedir}/tests/AntOnAir.swf debug=${DEBUG_FLAG} + swf-version=23 failonerror=true fork=true maxmemory=512m
[48/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - AntOnAIR: fixed issue in Replace task where if the token was replaced with a value that contained the token, the task cou
AntOnAIR: fixed issue in Replace task where if the token was replaced with a value that contained the token, the task could get stuck in an infinite loop Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/6961f8a2 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/6961f8a2 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/6961f8a2 Branch: refs/heads/as3httpclient-work Commit: 6961f8a209ff1903fc87eb98163ced965356a05c Parents: 2badd74 Author: Josh Tynjala joshtynj...@apache.org Authored: Fri May 15 16:06:31 2015 -0700 Committer: Josh Tynjala joshtynj...@apache.org Committed: Fri May 15 16:06:31 2015 -0700 -- ant_on_air/src/org/apache/flex/ant/tags/Replace.as | 2 +- ant_on_air/tests/test.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6961f8a2/ant_on_air/src/org/apache/flex/ant/tags/Replace.as -- diff --git a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as index 0b7ff69..2873ee1 100644 --- a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as +++ b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as @@ -129,7 +129,7 @@ package org.apache.flex.ant.tags var firstHalf:String = s.substr(0, c); var secondHalf:String = s.substr(c); s = firstHalf + secondHalf.replace(tokens[i], reps[i]); -cur = c + 1; +cur = c + reps[i].length; } } while (c != -1) } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6961f8a2/ant_on_air/tests/test.xml -- diff --git a/ant_on_air/tests/test.xml b/ant_on_air/tests/test.xml index 9b6cd8f..e218795 100644 --- a/ant_on_air/tests/test.xml +++ b/ant_on_air/tests/test.xml @@ -206,7 +206,7 @@ /replace replace file=${basedir}/temp/custom.properties replacetoken![CDATA[test/]]/replacetoken -replacevalue![CDATA[cdata/]]/replacevalue +replacevalue![CDATA[replaced/test/]]/replacevalue /replace loadproperties srcFile=${basedir}/temp/custom.properties / fail message=replace did not work: found somekey @@ -240,10 +240,10 @@ /not /condition /fail -fail message=replace did not work: did not find lt;cdata/gt; +fail message=replace did not work: did not find lt;replaced/gt;lt;test/gt; condition not -equals arg1=${xml} arg2=lt;cdata/gt; / +equals arg1=${xml} arg2=lt;replaced/gt;lt;test/gt; / /not /condition /fail
[36/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Added a locale chain example
- Added a locale chain example Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f8945125 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f8945125 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f8945125 Branch: refs/heads/as3httpclient-work Commit: f894512567f719a3bfb259deb181bb8eaff4bd85 Parents: b43e167 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 25 16:05:46 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 25 16:05:46 2015 +0200 -- .../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 | 1 + 10 files changed, 417 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/pom.xml -- diff --git a/maven-flex-plugin/examples/i18n/locale-chains/pom.xml b/maven-flex-plugin/examples/i18n/locale-chains/pom.xml new file mode 100644 index 000..bff39bc --- /dev/null +++ b/maven-flex-plugin/examples/i18n/locale-chains/pom.xml @@ -0,0 +1,40 @@ +?xml version=1.0? +!-- + + 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. + +-- +project xmlns=http://maven.apache.org/POM/4.0.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.flex.examples.i18n/groupId +artifactIdi18n/artifactId +version1.0.0-SNAPSHOT/version +/parent + +artifactIdlocale-chains/artifactId +version1.0.0-SNAPSHOT/version +packagingpom/packaging + +modules +moduleswf/module +modulewar/module +/modules + +/project \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f8945125/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml -- diff --git a/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml b/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml new file mode 100644 index 000..e8630d6 --- /dev/null +++ b/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml @@ -0,0 +1,79 @@ +?xml version=1.0 encoding=UTF-8? +!-- + + 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. + +-- +project xmlns=http://maven.apache.org/POM/4.0.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.flex.examples.i18n/groupId +
[42/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - FLEX-34823: Improve error handling for bad data lines.
FLEX-34823: Improve error handling for bad data lines. Report the file and line number if a line in the data file is malformed. This can happen when the server is not shut down and therefore does not flush its data to disk. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/681f0273 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/681f0273 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/681f0273 Branch: refs/heads/as3httpclient-work Commit: 681f027363be1a2002149135569f4dc5a02da178 Parents: b145b02 Author: dloverin darrell.love...@gmail.com Authored: Sun Apr 26 18:29:56 2015 -0400 Committer: dloverin darrell.love...@gmail.com Committed: Sat May 9 11:03:16 2015 -0400 -- .../flex/tools/codecoverage/reporter/CodeCoverageReporter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/681f0273/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java -- diff --git a/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java b/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java index 9a4bb0e..7c0d868 100755 --- a/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java +++ b/CodeCoverage/JavaServer/java/src/org/apache/flex/tools/codecoverage/reporter/CodeCoverageReporter.java @@ -454,9 +454,9 @@ public class CodeCoverageReporter { // id,linenum // Split line and record linenum as a hit. -if (firstChar = '0' firstChar = '9') +String[] results = inLine.split(,); +if (results.length == 2 firstChar = '0' firstChar = '9') { -String[] results = inLine.split(,); String file = stringPool.get(Integer.valueOf(results[0])); int hitLineNumber = Integer.valueOf(results[1]); coverageData.setLineExecuted(file, hitLineNumber); @@ -464,7 +464,7 @@ public class CodeCoverageReporter } else { -System.err.println(Warning: line + inLineNumber + : unrecognized data, + inLine); +System.err.println(Warning: file + inFile.getAbsolutePath() + , line + inLineNumber + : unrecognized data, + inLine); } } }
[15/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/fe3b8b26 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/fe3b8b26 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/fe3b8b26 Branch: refs/heads/as3httpclient-work Commit: fe3b8b26073b6a0c155c81fda26ce9586a526244 Parents: a7e2630 618ae2c Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 11 09:49:37 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 11 09:49:37 2015 +0200 -- .../spelling/framework/ResourceTable.as | 2 +- .../com/adobe/linguistics/spelling/SpellUI.as | 143 +- .../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 + mavenizer/README.txt| 6 +- 8 files changed, 47674 insertions(+), 77 deletions(-) --
[34/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Add language selectors to the i18n examples - Fixed some problems with the runtime loaded locales
- Add language selectors to the i18n examples - Fixed some problems with the runtime loaded locales Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/957c1e19 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/957c1e19 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/957c1e19 Branch: refs/heads/as3httpclient-work Commit: 957c1e1977d70fbddff450cf50b1107290f558ce Parents: 2b7f3e9 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 25 14:36:07 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 25 14:36:07 2015 +0200 -- .../examples/i18n/compiled-locales/pom.xml | 2 +- .../examples/i18n/compiled-locales/swf/pom.xml | 5 +- .../swf/src/main/flex/Main.mxml | 25 +++-- .../examples/i18n/compiled-locales/war/pom.xml | 8 +-- .../examples/i18n/runtime-locales/pom.xml | 2 +- .../examples/i18n/runtime-locales/swf/pom.xml | 5 +- .../runtime-locales/swf/src/main/flex/Main.mxml | 54 +++- .../examples/i18n/runtime-locales/war/pom.xml | 8 +-- 8 files changed, 90 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml -- diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml index 83d1e60..be807ff 100644 --- a/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml +++ b/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml @@ -28,7 +28,7 @@ version1.0.0-SNAPSHOT/version /parent -artifactIdcompiled-locals/artifactId +artifactIdcompiled-locales/artifactId version1.0.0-SNAPSHOT/version packagingpom/packaging http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml -- diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml index a15264c..4c23e35 100644 --- a/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml +++ b/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml @@ -24,11 +24,11 @@ parent groupIdorg.apache.flex.examples.i18n/groupId -artifactIdcompiled-locals/artifactId +artifactIdcompiled-locales/artifactId version1.0.0-SNAPSHOT/version /parent -artifactIdcompiled-locals-swf/artifactId +artifactIdcompiled-locales-swf/artifactId version1.0.0-SNAPSHOT/version packagingswf/packaging @@ -41,6 +41,7 @@ version7.1.0-SNAPSHOT/version extensionstrue/extensions configuration +debugtrue/debug localesCompiled localeen_US/locale localede_DE/locale http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/957c1e19/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml -- diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml index ea188bc..a449ab7 100644 --- a/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml +++ b/maven-flex-plugin/examples/i18n/compiled-locales/swf/src/main/flex/Main.mxml @@ -18,13 +18,32 @@ -- s:Application xmlns:fx=http://ns.adobe.com/mxml/2009; - xmlns:s=library://ns.adobe.com/flex/spark - xmlns:mx=library://ns.adobe.com/flex/mx + xmlns:s=library://ns.adobe.com/flex/spark fx:Metadata [ResourceBundle(myresources)] /fx:Metadata -s:Label text={resourceManager.getString('myresources','greeting')}/ +fx:Script + ![CDATA[ +import mx.collections.ArrayCollection; + +import spark.events.IndexChangeEvent; + +[Bindable] +private var locales:ArrayCollection = new ArrayCollection([{label:English, locale:en_US}, +{label:German, locale:de_DE}]); + +private function onLanguageChange(event:IndexChangeEvent):void { +resourceManager.localeChain = [localeSelector.selectedItem.locale]; +} + +]] + /fx:Script + +s:VGroup +s:ComboBox id=localeSelector dataProvider={locales} change=onLanguageChange(event)/ +s:Label text={resourceManager.getString('myresources','greeting')}/ +/s:VGroup /s:Application
[06/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Added some more validation code - Hardened the converters not to cause fatal exceptions if optional FDK parts are missi
- Added some more validation code - Hardened the converters not to cause fatal exceptions if optional FDK parts are missing. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/55f0ba19 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/55f0ba19 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/55f0ba19 Branch: refs/heads/as3httpclient-work Commit: 55f0ba191144b2d31f4c1a7a20dfefb2fcb46bec Parents: 07c77ee Author: Christofer Dutz christofer.d...@codecentric.de Authored: Fri Apr 10 12:08:07 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Fri Apr 10 12:08:07 2015 +0200 -- .../converter/core/SdkConverterCLI.java | 152 +-- .../utilities/converter/air/AirConverter.java | 11 +- .../converter/flash/FlashConverter.java | 9 +- .../utilities/converter/flex/FlexConverter.java | 11 +- .../retrievers/download/DownloadRetriever.java | 1 - 5 files changed, 130 insertions(+), 54 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/55f0ba19/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java -- diff --git a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java index 32cb60d..0f088e6 100644 --- a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java +++ b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java @@ -22,31 +22,51 @@ import java.util.*; */ public class SdkConverterCLI { +public static final String COMMAND_LIST = list; +public static final String COMMAND_DOWNLOAD = download; +public static final String COMMAND_CONVERT = convert; +public static final String COMMAND_DEPLOY = deploy; + +public static final String OPTION_FLEX_VERSION = flexVersion; +public static final String OPTION_FLASH_VERSIONS = flashVersions; +public static final String OPTION_AIT_VERSION = airVersion; +public static final String OPTION_FONTKIT = fontkit; +public static final String OPTION_PLATFORMS = platforms; + +public static final String OPTION_FDK_DIR = fdkDir; +public static final String OPTION_MAVEN_DIR = mavenDir; + +public static final String OPTION_REPO_URL = repoUrl; +public static final String OPTION_REPO_USERNAME = repoUsername; +public static final String OPTION_REPO_PASSWORD = repoPassword; + + +@SuppressWarnings(unchecked) public static void main(String[] args) throws Exception { Options options = new Options(); options.addOption(OptionBuilder.withArgName(version).hasArg(). withDescription((Optional and Only valid for download) Version of the + FDK which should be downloaded.). isRequired(false). -create(flexVersion)); +create(OPTION_FLEX_VERSION)); options.addOption(OptionBuilder.withArgName(version(s)).hasArg(). withValueSeparator(','). withDescription((Optional and Only valid for download) Version(s) of the + Adobe Flash SDK which should be downloaded. Multiple versions can + be separated by \,\.). isRequired(false). -create(flashVersion)); +create(OPTION_FLASH_VERSIONS)); options.addOption(OptionBuilder.withArgName(version).hasArg(). withDescription((Optional and Only valid for download) Version of the + Adobe Air SDK which should be downloaded.). isRequired(false). -create(airVersion)); +create(OPTION_AIT_VERSION)); options.addOption(OptionBuilder. withDescription((Optional and Only valid for download) If provided, the + Converter will also download the Fontkit libraries needed for font + encoding.). isRequired(false). -create(fontkit)); +create(OPTION_FONTKIT)); options.addOption(OptionBuilder.withArgName(platform(s)).hasArg(). withValueSeparator(','). withDescription((Optional and Only valid for download) Platform the artifacts + @@ -54,34 +74,34 @@ public class SdkConverterCLI { on will be used. Valid options are: \WINDOWS\, \MAC\ and \LNX\. + Multiple versions can be separated by \,\.). isRequired(false). -
[49/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Added a air mobile example project.
- Added a air mobile example project. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/fb705158 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/fb705158 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/fb705158 Branch: refs/heads/as3httpclient-work Commit: fb7051589c6c4b5d358712f5522c00c0f63f5d38 Parents: 6961f8a Author: Christofer Dutz christofer.d...@codecentric.de Authored: Wed May 20 10:15:56 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Wed May 20 10:15:56 2015 +0200 -- 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 | 1 + 8 files changed, 523 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/mobile/pom.xml -- diff --git a/maven-flex-plugin/examples/mobile/pom.xml b/maven-flex-plugin/examples/mobile/pom.xml new file mode 100644 index 000..44b1683 --- /dev/null +++ b/maven-flex-plugin/examples/mobile/pom.xml @@ -0,0 +1,40 @@ +?xml version=1.0? +!-- + + 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. + +-- +project xmlns=http://maven.apache.org/POM/4.0.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.flex.examples/groupId +artifactIdparent/artifactId +version1.0.0-SNAPSHOT/version +/parent + +groupIdorg.apache.flex.examples.mobile/groupId +artifactIdmobile/artifactId +version1.0.0-SNAPSHOT/version +packagingpom/packaging + +modules +modulesimple-air/module +/modules + +/project \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fb705158/maven-flex-plugin/examples/mobile/simple-air/pom.xml -- diff --git a/maven-flex-plugin/examples/mobile/simple-air/pom.xml b/maven-flex-plugin/examples/mobile/simple-air/pom.xml new file mode 100644 index 000..c49e789 --- /dev/null +++ b/maven-flex-plugin/examples/mobile/simple-air/pom.xml @@ -0,0 +1,110 @@ +!-- + + 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. + +-- +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; + +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.flex.examples.mobile/groupId +artifactIdmobile/artifactId +version1.0.0-SNAPSHOT/version +/parent + +artifactIdsimple-air/artifactId +version1.0.0-SNAPSHOT/version +packagingair/packaging + +build +
[46/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Fix: https://issues.apache.org/jira/browse/FLEX-34839
Fix: https://issues.apache.org/jira/browse/FLEX-34839 - Make use of Apache Commons Lang3.SystemUtils for OS detection. - Make SdkConverterCLI to use the detection. - Removed the PowerMock lib, couldn't mock static final field, I remove dynamically the final modifier instead. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/6496873b Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/6496873b Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/6496873b Branch: refs/heads/as3httpclient-work Commit: 6496873b53142ab7476f5e3afa4ce1b49f1bf668 Parents: 002b4de Author: Frédéric THOMAS webdoubl...@gmail.com Authored: Thu May 14 13:04:43 2015 +0100 Committer: Frédéric THOMAS webdoubl...@gmail.com Committed: Thu May 14 13:04:43 2015 +0100 -- .../converter/core/SdkConverterCLI.java | 12 +-- mavenizer/retrievers/base/pom.xml | 32 ++-- .../retrievers/types/PlatformType.java | 84 ++-- .../converter/retrievers/utils/ProgressBar.java | 2 +- .../retrievers/types/PlatformTypeTest.java | 72 + 5 files changed, 59 insertions(+), 143 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6496873b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java -- diff --git a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java index 9f3d160..918dd70 100644 --- a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java +++ b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java @@ -2,7 +2,6 @@ package org.apache.flex.utilities.converter.core; import org.apache.commons.cli.*; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.SystemUtils; import org.apache.flex.utilities.converter.air.AirConverter; import org.apache.flex.utilities.converter.deployer.aether.AetherDeployer; import org.apache.flex.utilities.converter.flash.FlashConverter; @@ -122,14 +121,11 @@ public class SdkConverterCLI { platforms.add(PlatformType.valueOf(platformName)); } } + if(platforms.isEmpty()) { -if(SystemUtils.IS_OS_WINDOWS) { -platforms.add(PlatformType.WINDOWS); -} else if(SystemUtils.IS_OS_MAC) { -platforms.add(PlatformType.MAC); -} else if(SystemUtils.IS_OS_LINUX) { -platforms.add(PlatformType.LINUX); -} else { +try { +platforms.add(PlatformType.getCurrent()); +} catch (Exception e) { System.err.println(Unsupported OS type. Provide manually using 'platform' parameter.); System.exit(1); } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6496873b/mavenizer/retrievers/base/pom.xml -- diff --git a/mavenizer/retrievers/base/pom.xml b/mavenizer/retrievers/base/pom.xml index d13b4cb..ace86c6 100644 --- a/mavenizer/retrievers/base/pom.xml +++ b/mavenizer/retrievers/base/pom.xml @@ -32,7 +32,7 @@ properties powermock.version1.6.2/powermock.version -junit.version4.8.2/junit.version +junit.version4.11/junit.version /properties dependencies @@ -47,9 +47,9 @@ version1.8.1/version /dependency dependency -groupIdcommons-lang/groupId -artifactIdcommons-lang/artifactId -version2.6/version +groupIdorg.apache.commons/groupId +artifactIdcommons-lang3/artifactId +version3.3.2/version /dependency !--TEST-- @@ -60,27 +60,9 @@ scopetest/scope /dependency dependency -groupIdorg.powermock/groupId -artifactIdpowermock-module-junit4-rule-agent/artifactId -version${powermock.version}/version -scopetest/scope -/dependency -dependency -groupIdorg.powermock/groupId -artifactIdpowermock-module-junit4/artifactId -version${powermock.version}/version -scopetest/scope -/dependency -dependency -groupIdorg.powermock/groupId -artifactIdpowermock-api-easymock/artifactId -version${powermock.version}/version -scopetest/scope -/dependency -dependency -
[45/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Fix: https://issues.apache.org/jira/browse/FLEX-34839
Fix: https://issues.apache.org/jira/browse/FLEX-34839 Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/002b4def Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/002b4def Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/002b4def Branch: refs/heads/as3httpclient-work Commit: 002b4defbbe9b2bc08b1c391b09d8346b758f73b Parents: 3be7ca7 Author: Frédéric THOMAS webdoubl...@gmail.com Authored: Wed May 13 15:55:22 2015 +0100 Committer: Frédéric THOMAS webdoubl...@gmail.com Committed: Wed May 13 15:55:22 2015 +0100 -- .../converter/mavenextension/FlexEventSpy.java | 3 +- mavenizer/retrievers/base/pom.xml | 38 +++- .../retrievers/types/PlatformType.java | 93 +++- .../retrievers/types/PlatformTypeTest.java | 61 + 4 files changed, 192 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/002b4def/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java -- diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java index 27b0ae7..034636d 100644 --- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java +++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java @@ -6,6 +6,7 @@ import org.apache.flex.utilities.converter.flash.FlashConverter; import org.apache.flex.utilities.converter.flex.FlexConverter; import org.apache.flex.utilities.converter.fontkit.FontkitConverter; import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever; +import org.apache.flex.utilities.converter.retrievers.types.PlatformType; import org.apache.flex.utilities.converter.retrievers.types.SdkType; import org.apache.flex.utilities.converter.wrapper.WrapperConverter; import org.apache.maven.MavenExecutionException; @@ -175,7 +176,7 @@ public class FlexEventSpy extends AbstractEventSpy { try { File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir()); DownloadRetriever downloadRetriever = new DownloadRetriever(); -File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version); +File sdkRoot = downloadRetriever.retrieve(SdkType.AIR, version, PlatformType.getCurrent()); AirConverter converter = new AirConverter(sdkRoot, localRepoBaseDir); converter.convert(); } catch (Throwable ce) { http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/002b4def/mavenizer/retrievers/base/pom.xml -- diff --git a/mavenizer/retrievers/base/pom.xml b/mavenizer/retrievers/base/pom.xml index 507ee13..d13b4cb 100644 --- a/mavenizer/retrievers/base/pom.xml +++ b/mavenizer/retrievers/base/pom.xml @@ -30,6 +30,11 @@ version1.0.0-SNAPSHOT/version packagingjar/packaging +properties +powermock.version1.6.2/powermock.version +junit.version4.8.2/junit.version +/properties + dependencies dependency groupIdcommons-io/groupId @@ -46,6 +51,37 @@ artifactIdcommons-lang/artifactId version2.6/version /dependency -/dependencies +!--TEST-- +dependency +groupIdjunit/groupId +artifactIdjunit/artifactId +version${junit.version}/version +scopetest/scope +/dependency +dependency +groupIdorg.powermock/groupId +artifactIdpowermock-module-junit4-rule-agent/artifactId +version${powermock.version}/version +scopetest/scope +/dependency +dependency +groupIdorg.powermock/groupId +artifactIdpowermock-module-junit4/artifactId +version${powermock.version}/version +scopetest/scope +/dependency +dependency +groupIdorg.powermock/groupId +artifactIdpowermock-api-easymock/artifactId +version${powermock.version}/version +scopetest/scope +/dependency +dependency +groupIdorg.easymock/groupId +artifactIdeasymock/artifactId +version3.3.1/version +scopetest/scope +/dependency +/dependencies /project
[43/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Added the Apache Snapshot Repo to the pluginRepositories
- Added the Apache Snapshot Repo to the pluginRepositories Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b0fa8e30 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b0fa8e30 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b0fa8e30 Branch: refs/heads/as3httpclient-work Commit: b0fa8e3020ed446d81039390c99e3e402fbcf0c1 Parents: b145b02 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat May 9 21:32:30 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat May 9 21:32:30 2015 +0200 -- maven-flex-plugin/examples/pom.xml | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b0fa8e30/maven-flex-plugin/examples/pom.xml -- diff --git a/maven-flex-plugin/examples/pom.xml b/maven-flex-plugin/examples/pom.xml index b83d09e..88af0ce 100644 --- a/maven-flex-plugin/examples/pom.xml +++ b/maven-flex-plugin/examples/pom.xml @@ -89,8 +89,21 @@ /snapshots /pluginRepository !-- -This is where we get unreleased Flexmojos stuff from. --- + This is where we get unreleased Apache stuff from + -- +pluginRepository +idapache-snapshots/id +urlhttp://repository.apache.org/snapshots//url +releases +enabledfalse/enabled +/releases +snapshots +enabledtrue/enabled +/snapshots +/pluginRepository +!-- + This is where we get unreleased Flexmojos stuff from. + -- pluginRepository idsonatype-snapshots/id urlhttps://oss.sonatype.org/content/repositories/snapshots//url
[3/6] git commit: [flex-utilities] [refs/heads/develop] - Added ApacheURLLoader component that extends URLLoader. This new component is only different from URLLoader in that it looks for https connect
Added ApacheURLLoader component that extends URLLoader. This new component is only different from URLLoader in that it looks for https connections and uses as3httpclient for these connections to bypass internal OS proxy and TLS/SSL settings that may break URL fetches in certain cases. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/bd083afa Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/bd083afa Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/bd083afa Branch: refs/heads/develop Commit: bd083afae57f549ae8d3d936ceb65842630d65a0 Parents: f3cff5a Author: quetwo n...@theflexgroup.org Authored: Tue May 26 00:29:15 2015 -0400 Committer: quetwo n...@theflexgroup.org Committed: Tue May 26 00:29:15 2015 -0400 -- installer/README|4 +- installer/build.xml | 15 +- installer/src/InstallApacheFlex.mxml| 1815 +++--- .../flex/packageflexsdk/util/ApacheURLLoader.as | 108 ++ 4 files changed, 1232 insertions(+), 710 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/bd083afa/installer/README -- diff --git a/installer/README b/installer/README index a7d7e1e..8fef8e7 100644 --- a/installer/README +++ b/installer/README @@ -135,8 +135,8 @@ How to set up the project for working with Adobe Flash Builder (or any other IDE 2. In the installer directory run: ant get-as3commons.swc -This step downloads the required as3commons library and saves it in the libs -directory. +ant get-as3httpdclient.swc +These step downloads the required libraries and saves it in the libs directory. 3. If using Adobe Flash Builder, add a linked resource called: APACHE_FLEX_UTILITIES_ROOT http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/bd083afa/installer/build.xml -- diff --git a/installer/build.xml b/installer/build.xml index 6d76076..49de697 100644 --- a/installer/build.xml +++ b/installer/build.xml @@ -290,7 +290,20 @@ /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
[31/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - AntOnAIR: added support for replacetoken and replacevalue tags that may be added as childre of the replace tag, sim
AntOnAIR: added support for replacetoken and replacevalue tags that may be added as childre of the replace tag, similar to replacefilter. These tags make it possible to use CDATA and new lines in tokens and values. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/c45b0786 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/c45b0786 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/c45b0786 Branch: refs/heads/as3httpclient-work Commit: c45b078688dfcdc3c468af4c56983805987b24f6 Parents: 1a46b11 Author: Josh Tynjala joshtynj...@gmail.com Authored: Fri Apr 24 15:15:22 2015 -0700 Committer: Josh Tynjala joshtynj...@gmail.com Committed: Fri Apr 24 15:15:22 2015 -0700 -- .../src/org/apache/flex/ant/tags/Replace.as | 25 +-- .../org/apache/flex/ant/tags/ReplaceToken.as| 44 .../org/apache/flex/ant/tags/ReplaceValue.as| 44 ant_on_air/tests/test.xml | 23 +- 4 files changed, 131 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c45b0786/ant_on_air/src/org/apache/flex/ant/tags/Replace.as -- diff --git a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as index 6a3cac1..0b7ff69 100644 --- a/ant_on_air/src/org/apache/flex/ant/tags/Replace.as +++ b/ant_on_air/src/org/apache/flex/ant/tags/Replace.as @@ -26,6 +26,7 @@ package org.apache.flex.ant.tags import org.apache.flex.ant.Ant; import org.apache.flex.ant.tags.supportClasses.TaskHandler; +import org.apache.flex.xml.ITagHandler; [Mixin] public class Replace extends TaskHandler @@ -89,10 +90,26 @@ package org.apache.flex.ant.tags { for (var i:int = 0; i numChildren; i++) { -var rf:ReplaceFilter = getChildAt(i) as ReplaceFilter; -rf.setContext(context); -tokens.push(rf.token); -reps.push(rf.value); +var child:ITagHandler = getChildAt(i); +if(child is ReplaceFilter) +{ +var rf:ReplaceFilter = child as ReplaceFilter; +rf.setContext(context); +tokens.push(rf.token); +reps.push(rf.value); +} +else if(child is ReplaceToken) +{ +var rt:ReplaceToken = child as ReplaceToken; +rt.setContext(context); +tokens.push(rt.text); +} +else if(child is ReplaceValue) +{ +var rv:ReplaceValue = child as ReplaceValue; +rv.setContext(context); +reps.push(rv.text); +} } } var n:int = tokens.length; http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/c45b0786/ant_on_air/src/org/apache/flex/ant/tags/ReplaceToken.as -- diff --git a/ant_on_air/src/org/apache/flex/ant/tags/ReplaceToken.as b/ant_on_air/src/org/apache/flex/ant/tags/ReplaceToken.as new file mode 100644 index 000..8bb811d --- /dev/null +++ b/ant_on_air/src/org/apache/flex/ant/tags/ReplaceToken.as @@ -0,0 +1,44 @@ + +// +// 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. +// + +package org.apache.flex.ant.tags +{ + import mx.core.IFlexModuleFactory; + + import org.apache.flex.ant.Ant; + import org.apache.flex.ant.tags.supportClasses.TagHandler; + + [Mixin] + public
[13/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - minor fixup
minor fixup Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/618ae2c7 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/618ae2c7 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/618ae2c7 Branch: refs/heads/as3httpclient-work Commit: 618ae2c7c1a5ddb742d160ad80dbfe3eb3fb6b81 Parents: 1c9c95d Author: Alex Harui aha...@apache.org Authored: Fri Apr 10 10:07:07 2015 -0700 Committer: Alex Harui aha...@apache.org Committed: Fri Apr 10 10:07:07 2015 -0700 -- mavenizer/README.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/618ae2c7/mavenizer/README.txt -- diff --git a/mavenizer/README.txt b/mavenizer/README.txt index d76b980..9707141 100644 --- a/mavenizer/README.txt +++ b/mavenizer/README.txt @@ -152,12 +152,12 @@ Some typical usage scenarios - Download and create an FDK (Flex 4.14.1 with playerglobal 17.0 and 16.0 AIR SDK 17.0 for Windows and Mac and the fontkit libs): - ... -fdkDir FDK target dir -flexVersion 4.14.1 -flashVersion 17.0,16.0 \ + ... -fdkDir FDK target dir -flexVersion 4.14.1 -flashVersions 17.0,16.0 \ -airVersion 17.0 -platform WINDOWS,MAC -fontkit download - Download and convert an FDK (FDK assembled in temp directory using Air for current systems platform only): - ... -flexVersion 4.14.1 -flashVersion 17.0 -airVersion 17.0 -fontkit \ + ... -flexVersion 4.14.1 -flashVersions 17.0 -airVersion 17.0 -fontkit \ -mavenDir maven local repo download convert - Deploy a bunch of maven artifacts to a remote maven repository: @@ -165,7 +165,7 @@ Some typical usage scenarios -repoUsername username -repoPassword pasword deploy - The works (TM): Download, Convert and Deploy using only temp directories: - ... -flexVersion 4.14.1 -flashVersion 17.0 -airVersion 17.0 -fontkit \ + ... -flexVersion 4.14.1 -flashVersions 17.0 -airVersion 17.0 -fontkit \ -repoUrl url -repoUsername username -repoPassword pasword \ download convert deploy
[09/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - FLEX-34756 Adding a unit test that reproduces the bug, and its supporting files.
FLEX-34756 Adding a unit test that reproduces the bug, and its supporting files. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/daf48a05 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/daf48a05 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/daf48a05 Branch: refs/heads/as3httpclient-work Commit: daf48a05bc064dd7e3cb60a3dfe303e0d50dbe9f Parents: 718d5a3 Author: Mihai Chira mih...@apache.org Authored: Fri Apr 10 14:23:39 2015 +0200 Committer: Mihai Chira mih...@apache.org Committed: Fri Apr 10 14:23:39 2015 +0200 -- .../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 + 4 files changed, 47598 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/daf48a05/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34756_Test.as -- diff --git a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34756_Test.as b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34756_Test.as new file mode 100644 index 000..dcb074f --- /dev/null +++ b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34756_Test.as @@ -0,0 +1,160 @@ + +// +// 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. +// + + +package com.adobe.linguistics.spelling { +import com.adobe.linguistics.spelling.SpellUI; +import com.adobe.linguistics.spelling.framework.SpellingService; +import com.adobe.linguistics.spelling.framework.ui.IHighlighter; + +import flash.events.Event; +import flash.events.IEventDispatcher; + +import flashx.textLayout.edit.EditManager; +import flashx.textLayout.elements.FlowElement; +import flashx.textLayout.elements.ParagraphElement; +import flashx.textLayout.elements.SpanElement; + +import mockolate.nice; +import mockolate.prepare; +import mockolate.received; +import mockolate.stub; + +import org.flexunit.assertThat; +import org.flexunit.asserts.assertTrue; +import org.flexunit.async.Async; +import org.fluint.uiImpersonation.UIImpersonator; + +import spark.components.RichEditableText; + +public class FLEX_34756_Test { +private static var _textField:RichEditableText; +private static var _sut:SpellUI; +private static const TEXT_WITH_SPELLING_ERROR:String = helloo; +private static const DICT:String = en_GB; + +[Before(async, timeout=5000)] +public function setUp():void +{ +_textField = new RichEditableText(); +UIImpersonator.addChild(_textField); +_textField.text = TEXT_WITH_SPELLING_ERROR; + +var mockolateDispatcher:IEventDispatcher = prepare(IHighlighter, SpellingService); +mockolateDispatcher.addEventListener(Event.COMPLETE, Async.asyncHandler(this, onSetUpComplete, 5000, null, null)); +} + +private static function onSetUpComplete(event:Event, passThroughData:Object):void +{ +SpellUIForTest.sparkHighlighter = nice(IHighlighter); +SpellUIForTest.spellingService = nice(SpellingService, spellingService, [DICT]); + +_sut = new SpellUIForTest(_textField, DICT); +} + +[After] +public function tearDown():void +{ +UIImpersonator.removeAllChildren(); +_textField = null; +_sut = null; +} + +[Test(async, timeout=2500)] +public function make_sure_it_doesnt_run_a_spelling_job_on_damaged_text_flow():void +{ +//when +
[05/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Added a loop to the accept license part that loops as long as an unreadable answer (not yes/y or no/n) is entered and o
- Added a loop to the accept license part that loops as long as an unreadable answer (not yes/y or no/n) is entered and only aborts if the user selects no. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/07c77ee3 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/07c77ee3 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/07c77ee3 Branch: refs/heads/as3httpclient-work Commit: 07c77ee31304498a89ec170af214d09e22acc55f Parents: f21e528 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Fri Apr 10 09:14:50 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Fri Apr 10 09:14:50 2015 +0200 -- .../retrievers/download/DownloadRetriever.java | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/07c77ee3/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java -- diff --git a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java index 115898d..96e95ff 100644 --- a/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java +++ b/mavenizer/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java @@ -342,14 +342,19 @@ public class DownloadRetriever extends BaseRetriever { } else { throw new RetrieverException(Unknown SdkType); } -System.out.println(question); -System.out.print(questionProps.getProperty(DO_YOU_ACCEPT_QUESTION) + ); final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); try { -final String answer = reader.readLine(); -if (!YES.equalsIgnoreCase(answer)) { -System.out.println(You have to accept the license agreement in order to proceed.); -throw new RetrieverException(You have to accept the license agreement in order to proceed.); +while (true) { +System.out.println(question); + System.out.print(questionProps.getProperty(DO_YOU_ACCEPT_QUESTION) + ); +final String answer = reader.readLine(); +if (YES.equalsIgnoreCase(answer) || Y.equalsIgnoreCase(answer)) { +return; +} +if (NO.equalsIgnoreCase(answer) || N.equalsIgnoreCase(answer)) { +System.out.println(You have to accept the license agreement in order to proceed.); +throw new RetrieverException(You have to accept the license agreement in order to proceed.); +} } } catch(IOException e) { throw new RetrieverException(Couldn't read from Stdin.);
[44/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/3be7ca73 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/3be7ca73 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/3be7ca73 Branch: refs/heads/as3httpclient-work Commit: 3be7ca7355a8cab48434d30e4466861476d630fe Parents: b0fa8e3 681f027 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat May 9 21:32:51 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat May 9 21:32:51 2015 +0200 -- .../flex/tools/codecoverage/reporter/CodeCoverageReporter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[18/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Added slf4j-simple dependency to get rid of slf4j warnings.
- Added slf4j-simple dependency to get rid of slf4j warnings. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/6f2441dc Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/6f2441dc Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/6f2441dc Branch: refs/heads/as3httpclient-work Commit: 6f2441dc12766bbd42b3f30bce25a90b816aca7d Parents: 1697626 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 11 12:49:33 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 11 12:49:33 2015 +0200 -- mavenizer/cli/pom.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6f2441dc/mavenizer/cli/pom.xml -- diff --git a/mavenizer/cli/pom.xml b/mavenizer/cli/pom.xml index 839838e..5a7449a 100644 --- a/mavenizer/cli/pom.xml +++ b/mavenizer/cli/pom.xml @@ -91,6 +91,11 @@ artifactIdcommons-lang3/artifactId version3.3.2/version /dependency +dependency +groupIdorg.slf4j/groupId +artifactIdslf4j-simple/artifactId +version1.7.7/version +/dependency /dependencies /project
[12/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1c9c95de Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1c9c95de Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1c9c95de Branch: refs/heads/as3httpclient-work Commit: 1c9c95def2ea83f971a0cf01d24c6318292ad2ce Parents: 69d09d7 55f0ba1 Author: Mihai Chira mih...@apache.org Authored: Fri Apr 10 14:28:46 2015 +0200 Committer: Mihai Chira mih...@apache.org Committed: Fri Apr 10 14:28:46 2015 +0200 -- .../converter/core/SdkConverterCLI.java | 152 +-- .../utilities/converter/air/AirConverter.java | 11 +- .../converter/flash/FlashConverter.java | 9 +- .../utilities/converter/flex/FlexConverter.java | 11 +- .../retrievers/download/DownloadRetriever.java | 1 - 5 files changed, 130 insertions(+), 54 deletions(-) --
[40/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Merge branch 'ant-replacetoken-replacevalue' of https://github.com/joshtynjala/flex-utilities into develop. This closes #
Merge branch 'ant-replacetoken-replacevalue' of https://github.com/joshtynjala/flex-utilities into develop. This closes #6 Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/cb3fbd25 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/cb3fbd25 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/cb3fbd25 Branch: refs/heads/as3httpclient-work Commit: cb3fbd25cd424ac5dced936476a26cb62d7ffe9e Parents: 3388508 c45b078 Author: Alex Harui aha...@apache.org Authored: Tue Apr 28 09:10:48 2015 -0700 Committer: Alex Harui aha...@apache.org Committed: Tue Apr 28 09:16:32 2015 -0700 -- .../src/org/apache/flex/ant/tags/Replace.as | 25 +-- .../org/apache/flex/ant/tags/ReplaceToken.as| 44 .../org/apache/flex/ant/tags/ReplaceValue.as| 44 ant_on_air/tests/test.xml | 23 +- 4 files changed, 131 insertions(+), 5 deletions(-) --
[17/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Made the fontkit converter not to throw an exception if the 'optional' directory doesn't exist
- Made the fontkit converter not to throw an exception if the 'optional' directory doesn't exist Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/16976268 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/16976268 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/16976268 Branch: refs/heads/as3httpclient-work Commit: 16976268d19ee4250ade795cdc75459ea6604f0e Parents: 9804635 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 11 12:26:34 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 11 12:26:34 2015 +0200 -- .../apache/flex/utilities/converter/fontkit/FontkitConverter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/16976268/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java -- diff --git a/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java b/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java index e222db5..81fbe09 100644 --- a/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java +++ b/mavenizer/converters/fontkit/src/main/java/org/apache/flex/utilities/converter/fontkit/FontkitConverter.java @@ -20,7 +20,8 @@ public class FontkitConverter extends BaseConverter implements Converter { protected void processDirectory() throws ConverterException { File fontkitRootDir = new File(rootSourceDirectory, lib/external/optional); if(!fontkitRootDir.exists() || !fontkitRootDir.isDirectory()) { -throw new ConverterException(Fontkit directory ' + fontkitRootDir.getPath() + ' is invalid.); +System.out.println(Skipping Fontkit generation.); +return; } File afeJar = new File(fontkitRootDir, afe.jar);
[33/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Started setting up an example project consisting of multiple projects that all demonstrate the stuff described in the F
- Started setting up an example project consisting of multiple projects that all demonstrate the stuff described in the Flex Wiki Tutorials Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/2b7f3e95 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/2b7f3e95 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/2b7f3e95 Branch: refs/heads/as3httpclient-work Commit: 2b7f3e956ef47d2febb097087117cf091f152886 Parents: dd6d419 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 25 12:09:08 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 25 12:09:08 2015 +0200 -- .../examples/i18n/compiled-locales/pom.xml | 40 ++ .../examples/i18n/compiled-locales/swf/pom.xml | 76 .../swf/src/main/flex/Main.mxml | 30 + .../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 + maven-flex-plugin/examples/i18n/pom.xml | 41 ++ .../examples/i18n/runtime-locales/pom.xml | 40 ++ .../examples/i18n/runtime-locales/swf/pom.xml | 76 .../runtime-locales/swf/src/main/flex/Main.mxml | 30 + .../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/pom.xml | 105 16 files changed, 824 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml -- diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml new file mode 100644 index 000..83d1e60 --- /dev/null +++ b/maven-flex-plugin/examples/i18n/compiled-locales/pom.xml @@ -0,0 +1,40 @@ +?xml version=1.0? +!-- + + 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. + +-- +project xmlns=http://maven.apache.org/POM/4.0.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.flex.examples.i18n/groupId +artifactIdi18n/artifactId +version1.0.0-SNAPSHOT/version +/parent + +artifactIdcompiled-locals/artifactId +version1.0.0-SNAPSHOT/version +packagingpom/packaging + +modules +moduleswf/module +modulewar/module +/modules + +/project \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b7f3e95/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml -- diff --git a/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml b/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml new file mode 100644 index 000..a15264c --- /dev/null +++ b/maven-flex-plugin/examples/i18n/compiled-locales/swf/pom.xml @@ -0,0 +1,76 @@ +?xml version=1.0 encoding=UTF-8? +!-- + + 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, +
[28/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Implemented a wrapper converter that creates wrapper artifacts used as templates for web-projects.
- Implemented a wrapper converter that creates wrapper artifacts used as templates for web-projects. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1a46b112 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1a46b112 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1a46b112 Branch: refs/heads/as3httpclient-work Commit: 1a46b11276f24b2a13464461887bf63b4735006e Parents: 05922ef Author: Christofer Dutz christofer.d...@codecentric.de Authored: Thu Apr 23 17:15:44 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Thu Apr 23 17:15:44 2015 +0200 -- .../converter/core/SdkConverterCLI.java | 10 +++ mavenizer/converters/flex/pom.xml | 5 ++ mavenizer/converters/pom.xml| 1 + mavenizer/converters/wrapper/pom.xml| 41 + .../converter/wrapper/WrapperConverter.java | 87 mavenizer/maven-extension/pom.xml | 5 ++ .../converter/mavenextension/FlexEventSpy.java | 23 -- .../converter/retrievers/types/SdkType.java | 3 +- .../retrievers/download/DownloadRetriever.java | 41 ++--- 9 files changed, 195 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java -- diff --git a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java index 56d5f1f..9f3d160 100644 --- a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java +++ b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java @@ -11,6 +11,7 @@ import org.apache.flex.utilities.converter.fontkit.FontkitConverter; import org.apache.flex.utilities.converter.retrievers.download.DownloadRetriever; import org.apache.flex.utilities.converter.retrievers.types.PlatformType; import org.apache.flex.utilities.converter.retrievers.types.SdkType; +import org.apache.flex.utilities.converter.wrapper.WrapperConverter; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import java.io.File; @@ -253,6 +254,10 @@ public class SdkConverterCLI { File fdkDownloadDirectory = retriever.retrieve(SdkType.FLEX, flexVersion); // Unpack the archive to the FDK directory. mergeDirectories(fdkDownloadDirectory, fdkDir); + +// Add the swfobject files. +File swfObjectDirectory = retriever.retrieve(SdkType.SWFOBJECT); +mergeDirectories(swfObjectDirectory, fdkDir); } String flashVersions = cmd.getOptionValue(OPTION_FLASH_VERSIONS, ); @@ -315,6 +320,11 @@ public class SdkConverterCLI { FontkitConverter fontkitConverter = new FontkitConverter(fdkDir, mavenDir); fontkitConverter.convert(); +System.out.println(- Converting Wrappers from + fdkDir.getAbsolutePath() + + to + mavenDir.getAbsolutePath()); +WrapperConverter wrapperConverter = new WrapperConverter(fdkDir, mavenDir); +wrapperConverter.convert(); + System.out.println(Finished conversion.); } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/converters/flex/pom.xml -- diff --git a/mavenizer/converters/flex/pom.xml b/mavenizer/converters/flex/pom.xml index 6df279f..480bc83 100644 --- a/mavenizer/converters/flex/pom.xml +++ b/mavenizer/converters/flex/pom.xml @@ -54,6 +54,11 @@ artifactIdfontkit-converter/artifactId version1.0.0-SNAPSHOT/version /dependency +dependency +groupIdorg.apache.flex.utilities.converter/groupId +artifactIdwrapper-converter/artifactId +version1.0.0-SNAPSHOT/version +/dependency /dependencies /project http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1a46b112/mavenizer/converters/pom.xml -- diff --git a/mavenizer/converters/pom.xml b/mavenizer/converters/pom.xml index d2dbad4..69a859b 100644 --- a/mavenizer/converters/pom.xml +++ b/mavenizer/converters/pom.xml @@ -39,6 +39,7 @@ moduleflash/module moduleflex/module modulefontkit/module +modulewrapper/module /modules /project
[39/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Merge branch 'ant-tstamp-native' of https://github.com/joshtynjala/flex-utilities into develop. This closes #5
Merge branch 'ant-tstamp-native' of https://github.com/joshtynjala/flex-utilities into develop. This closes #5 Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/33885087 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/33885087 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/33885087 Branch: refs/heads/as3httpclient-work Commit: 338850873a2c3e1510bc97a501b2bc7fac65b36f Parents: 624f41c 6018638 Author: Alex Harui aha...@apache.org Authored: Tue Apr 28 09:02:19 2015 -0700 Committer: Alex Harui aha...@apache.org Committed: Tue Apr 28 09:04:00 2015 -0700 -- ant_on_air/src/org/apache/flex/ant/tags/TStamp.as | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) --
[35/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Prevent the extension from doing anything on missing resource bundles.
- Prevent the extension from doing anything on missing resource bundles. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/b43e1677 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/b43e1677 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/b43e1677 Branch: refs/heads/as3httpclient-work Commit: b43e1677560cb8df42bce5a3626714aa143a59ad Parents: 957c1e1 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 25 15:39:08 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 25 15:39:08 2015 +0200 -- .../flex/utilities/converter/mavenextension/FlexEventSpy.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/b43e1677/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java -- diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java index 9adf892..27b0ae7 100644 --- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java +++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java @@ -65,11 +65,14 @@ public class FlexEventSpy extends AbstractEventSpy { try { internalLookup = true; Artifact artifact = repositoryEvent.getArtifact(); -if (artifact.getGroupId().startsWith(org.apache.flex)) { + +if (artifact.getGroupId().startsWith(org.apache.flex) +!rb.swc.equals(artifact.getExtension())) { // Output a cool spash-screen ... sorry for that ... couldn't resist :-) if(!flexSplashScreenShown) { showFlexSplashScreen(); } + if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getExtension(), artifact.getClassifier())) { initFlex(artifact.getVersion());
[01/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - add comment so folks don't remove force-linking trick
Repository: flex-utilities Updated Branches: refs/heads/as3httpclient-work df3dcd66e - e15c4a844 add comment so folks don't remove force-linking trick Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/66e127eb Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/66e127eb Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/66e127eb Branch: refs/heads/as3httpclient-work Commit: 66e127ebf41988782ccc570ec4be7a54063d2dba Parents: 29e04b0 Author: Alex Harui aha...@apache.org Authored: Thu Apr 9 16:24:00 2015 -0700 Committer: Alex Harui aha...@apache.org Committed: Thu Apr 9 16:24:00 2015 -0700 -- installer/src/InstallApacheFlex.mxml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/66e127eb/installer/src/InstallApacheFlex.mxml -- diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml index 341f060..0fd98ac 100644 --- a/installer/src/InstallApacheFlex.mxml +++ b/installer/src/InstallApacheFlex.mxml @@ -114,6 +114,10 @@ variables are not required because the locations of these pieces are known. import mx.rpc.http.HTTPService; import mx.utils.StringUtil; + // This force-links all of the ant task handlers into the Installer. + // The Installer doesn't use most of them directly but some script + // it runs might. + import AntClasses; AntClasses; import org.apache.flex.ant.Ant; import org.apache.flex.packageflexsdk.model.InstallerComponentVO; import org.apache.flex.packageflexsdk.model.OS;
[02/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - use a different url for the zip swc until we find a better url
use a different url for the zip swc until we find a better url Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d1de19d7 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d1de19d7 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d1de19d7 Branch: refs/heads/as3httpclient-work Commit: d1de19d7e91991889968f49a00035529c37f1fdd Parents: 66e127e Author: Alex Harui aha...@apache.org Authored: Thu Apr 9 17:03:25 2015 -0700 Committer: Alex Harui aha...@apache.org Committed: Thu Apr 9 17:03:25 2015 -0700 -- installer/build.xml | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d1de19d7/installer/build.xml -- diff --git a/installer/build.xml b/installer/build.xml index 6d76076..24288dc 100644 --- a/installer/build.xml +++ b/installer/build.xml @@ -68,6 +68,10 @@ property name=binary.kit value=${kit.prefix}-bin/ property name=LOCAL_CONFIG_FILE value=${basedir}/src/installer/sdk-installer-config-4.0.xml / +!--property name=commons.zip value=http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc; /-- +!-- use this one for now until we find a better source -- +property name=commons.zip value=https://github.com/bigosmallm/MakeApacheFlexForFlashBuilder/blob/master/libs/as3commons-zip-1.0.0-alpha.1.swc?raw=true; / + !-- Properties are immutable so value frozen first time property is set. If FLEX_HOME is not set with -DFLEX_HOME=/path/to/flex/sdk on the ant command line @@ -275,10 +279,11 @@ target name=get-as3commons.swc depends=check-as3commons.swc unless=as3commons.swc.present description=Download as3commons.swc and fail if checksum mismatch. mkdir dir=${LIBRARY_DIR}/ -get src=http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc; +get src=${commons.zip} dest=${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc verbose=true/ -get src=http://projects.yoolab.org/maven/content/repositories/releases/org/as3commons/as3commons-zip/1.0.0-alpha.1/as3commons-zip-1.0.0-alpha.1.swc.md5; +!-- skip checksum until we find a valid file +get src=${commons.zip}.md5 dest=${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc.md5 verbose=true/ checksum file=${LIBRARY_DIR}/as3commons-zip-1.0.0-alpha.1.swc algorithm=md5 verifyProperty=isMD5ok/ @@ -288,6 +293,7 @@ isfalse value=${isMD5ok}/ /condition /fail + -- /target target name=compile depends=get-as3commons.swc
[21/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Added the missing pom.xml (Was excluded again)
- Added the missing pom.xml (Was excluded again) Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/2b962323 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/2b962323 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/2b962323 Branch: refs/heads/as3httpclient-work Commit: 2b962323b9dc337e9b112f532c37f70d9850b552 Parents: a1ac19f Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 18 19:54:07 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 18 19:54:07 2015 +0200 -- mavenizer/maven-extension/pom.xml | 111 + 1 file changed, 111 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/2b962323/mavenizer/maven-extension/pom.xml -- diff --git a/mavenizer/maven-extension/pom.xml b/mavenizer/maven-extension/pom.xml new file mode 100644 index 000..9b4a8e1 --- /dev/null +++ b/mavenizer/maven-extension/pom.xml @@ -0,0 +1,111 @@ +?xml version=1.0 encoding=UTF-8? +!-- + + 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. + +-- +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.flex.utilities.converter/groupId +artifactIdapache-flex-sdk-converter/artifactId +version1.0.0-SNAPSHOT/version +/parent + +artifactIdmaven-extension/artifactId +version1.0.0-SNAPSHOT/version +packagingjar/packaging + +build +plugins +plugin +groupIdorg.sonatype.plugins/groupId +artifactIdsisu-maven-plugin/artifactId +version1.1/version +executions +execution +idgenerate-index/id +goals +goalmain-index/goal +/goals +/execution +/executions +/plugin +plugin +artifactIdmaven-assembly-plugin/artifactId +version2.4/version +configuration +descriptorRefs +descriptorRefjar-with-dependencies/descriptorRef +/descriptorRefs + finalNameflex-maven-extension-${project.version}/finalName +appendAssemblyIdfalse/appendAssemblyId + +/configuration +executions +execution +phasepackage/phase +goals +goalsingle/goal +/goals +/execution +/executions +/plugin +/plugins +/build + +dependencies +dependency +groupIdorg.apache.flex.utilities.converter/groupId +artifactIddownload-retriever/artifactId +version1.0.0-SNAPSHOT/version +/dependency +dependency +groupIdorg.apache.flex.utilities.converter/groupId +artifactIdflex-converter/artifactId +version1.0.0-SNAPSHOT/version +/dependency +dependency +groupIdorg.apache.flex.utilities.converter/groupId +artifactIdflash-converter/artifactId +version1.0.0-SNAPSHOT/version +/dependency +dependency +groupIdorg.apache.flex.utilities.converter/groupId +artifactIdair-converter/artifactId +version1.0.0-SNAPSHOT/version +/dependency +dependency +groupIdorg.apache.flex.utilities.converter/groupId +artifactIdfontkit-converter/artifactId +version1.0.0-SNAPSHOT/version +/dependency + +dependency +
[11/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - FLEX-34756 Minor improvements.
FLEX-34756 Minor improvements. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/69d09d75 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/69d09d75 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/69d09d75 Branch: refs/heads/as3httpclient-work Commit: 69d09d75f451c1491432da1de39fe80e0d6e6087 Parents: 8363ebf Author: Mihai Chira mih...@apache.org Authored: Fri Apr 10 14:26:40 2015 +0200 Committer: Mihai Chira mih...@apache.org Committed: Fri Apr 10 14:26:40 2015 +0200 -- .../src/com/adobe/linguistics/spelling/framework/ResourceTable.as | 2 +- .../tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/69d09d75/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as -- diff --git a/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as b/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as index 80debc7..b16542a 100644 --- a/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as +++ b/Squiggly/main/SpellingFramework/src/com/adobe/linguistics/spelling/framework/ResourceTable.as @@ -41,7 +41,7 @@ package com.adobe.linguistics.spelling.framework */ public function ResourceTable() { - _resources = new Object(); + _resources = {}; } /** http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/69d09d75/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as -- diff --git a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as index 624acae..9ce89df 100644 --- a/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as +++ b/Squiggly/main/SpellingUIEx/tests/com/adobe/linguistics/spelling/FLEX_34717_Tests.as @@ -44,7 +44,7 @@ package com.adobe.linguistics.spelling { public function test_immediate_disable_after_enable():void { //given -UIImpersonator.addChild(_input); +UIImpersonator.addElement(_input); //when SpellUI.enableSpelling(_input, en_US);
[14/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Fixed the handling of the help command.
- Fixed the handling of the help command. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/a7e26306 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/a7e26306 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/a7e26306 Branch: refs/heads/as3httpclient-work Commit: a7e263066851a812e2c2cb705592ac5483faff57 Parents: 55f0ba1 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 11 09:43:39 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 11 09:43:39 2015 +0200 -- .../flex/utilities/converter/core/SdkConverterCLI.java | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a7e26306/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java -- diff --git a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java index 0f088e6..56d5f1f 100644 --- a/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java +++ b/mavenizer/cli/src/main/java/org/apache/flex/utilities/converter/core/SdkConverterCLI.java @@ -22,6 +22,7 @@ import java.util.*; */ public class SdkConverterCLI { +public static final String COMMAND_HELP = help; public static final String COMMAND_LIST = list; public static final String COMMAND_DOWNLOAD = download; public static final String COMMAND_CONVERT = convert; @@ -106,8 +107,9 @@ public class SdkConverterCLI { CommandLineParser parser = new BasicParser(); try { CommandLine cmd = parser.parse(options, args); -if(cmd.getArgList().isEmpty() || cmd.getArgList().contains(help)) { +if(cmd.getArgList().isEmpty() || cmd.getArgList().contains(COMMAND_HELP)) { printHelp(options); +System.exit(0); } // Find out the desired platform(s). @@ -190,11 +192,6 @@ public class SdkConverterCLI { // Exectute operations -// Print the help screen. -if(cmd.getArgList().contains(help)) { -printHelp(options); -} - // Output a list of all available downloads. if(cmd.getArgList().contains(COMMAND_LIST)) { System.out.println(---);
[1/6] git commit: [flex-utilities] [refs/heads/develop] - Added ApacheURLLoader component that extends URLLoader. This new component is only different from URLLoader in that it looks for https connect
Repository: flex-utilities Updated Branches: refs/heads/develop fb7051589 - e15c4a844 http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/bd083afa/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as -- diff --git a/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as b/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as new file mode 100644 index 000..ea3559d --- /dev/null +++ b/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as @@ -0,0 +1,108 @@ +/** + 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. + + */ + +/** + * + * This is a really hackey way to intercept all the HTTPS calls and send them via + * as3httpdclient instead of the browser-captured URLLoader. Don't follow this + * example -- refactor your application to avoid having to do this. + * + */ +package org.apache.flex.packageflexsdk.util +{ +import com.adobe.net.URI; + +import flash.events.Event; +import flash.events.IOErrorEvent; +import flash.events.SecurityErrorEvent; +import flash.net.URLLoader; +import flash.net.URLRequest; +import flash.utils.ByteArray; + +import org.httpclient.HttpClient; +import org.httpclient.events.HttpDataEvent; +import org.httpclient.events.HttpErrorEvent; +import org.httpclient.events.HttpResponseEvent; + +public class ApacheURLLoader extends URLLoader +{ + +private var httpsData:ByteArray = new ByteArray(); + +public function ApacheURLLoader(request:URLRequest = null) +{ +super(request); +} + +override public function load(request:URLRequest):void +{ +if (request.url.indexOf(https://;) != 0) +{ +super.load(request); +} +else +{ +var httpsClient:HttpClient = new HttpClient(); +httpsClient.addEventListener(HttpErrorEvent.ERROR, httpsErrorEvent); +httpsClient.addEventListener(HttpDataEvent.DATA, httpsDataArrived); +httpsClient.addEventListener(HttpResponseEvent.COMPLETE, httpsCompleteEvent); +httpsClient.addEventListener(IOErrorEvent.IO_ERROR, httpsIOError); + httpsClient.addEventListener(SecurityErrorEvent.SECURITY_ERROR, httpsSecurityError); +// ProgressEvent is not available in this manner. +// We can't emulate the HTTP Status Event. It is internal to the Flash Player and won't +//let us override the status item. + +this.httpsData = new ByteArray(); +httpsClient.get(new URI(request.url)); +} + +} + +private function httpsDataArrived(event:HttpDataEvent):void +{ +this.httpsData.writeBytes(event.bytes); +} + +private function httpsSecurityError(event:SecurityErrorEvent):void +{ +dispatchEvent(event.clone()); +} + +private function httpsIOError(event:IOErrorEvent):void +{ +dispatchEvent(event.clone()); +} + +private function httpsCompleteEvent(event:HttpResponseEvent):void +{ +this.data = new ByteArray(); +this.data.writeBytes(this.httpsData); +this.data.position=0; +var e:Event = new Event(Event.COMPLETE); +dispatchEvent(e); +} + +private function httpsErrorEvent(event:HttpErrorEvent):void +{ +var e:IOErrorEvent = new IOErrorEvent(IOErrorEvent.NETWORK_ERROR); +e.text = event.text; +dispatchEvent(e); +} +} + +}
[4/6] git commit: [flex-utilities] [refs/heads/develop] - Testing on as3httpclient failure methods.
Testing on as3httpclient failure methods. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/281223a9 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/281223a9 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/281223a9 Branch: refs/heads/develop Commit: 281223a9dc20a2d9f4ef26d41027a68bc03f6c29 Parents: bd083af Author: quetwo n...@theflexgroup.org Authored: Tue May 26 23:57:54 2015 -0400 Committer: quetwo n...@theflexgroup.org Committed: Tue May 26 23:57:54 2015 -0400 -- .../flex/packageflexsdk/util/ApacheURLLoader.as | 55 +--- 1 file changed, 49 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/281223a9/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as -- diff --git a/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as b/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as index ea3559d..3893821 100644 --- a/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as +++ b/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as @@ -27,6 +27,8 @@ package org.apache.flex.packageflexsdk.util { import com.adobe.net.URI; +import flash.events.ErrorEvent; + import flash.events.Event; import flash.events.IOErrorEvent; import flash.events.SecurityErrorEvent; @@ -36,8 +38,11 @@ package org.apache.flex.packageflexsdk.util import org.httpclient.HttpClient; import org.httpclient.events.HttpDataEvent; +import org.httpclient.events.HttpDataListener; import org.httpclient.events.HttpErrorEvent; +import org.httpclient.events.HttpRequestEvent; import org.httpclient.events.HttpResponseEvent; +import org.httpclient.events.HttpStatusEvent; public class ApacheURLLoader extends URLLoader { @@ -57,18 +62,56 @@ package org.apache.flex.packageflexsdk.util } else { +trace(request.url); var httpsClient:HttpClient = new HttpClient(); -httpsClient.addEventListener(HttpErrorEvent.ERROR, httpsErrorEvent); -httpsClient.addEventListener(HttpDataEvent.DATA, httpsDataArrived); -httpsClient.addEventListener(HttpResponseEvent.COMPLETE, httpsCompleteEvent); -httpsClient.addEventListener(IOErrorEvent.IO_ERROR, httpsIOError); - httpsClient.addEventListener(SecurityErrorEvent.SECURITY_ERROR, httpsSecurityError); +var httpsClientListener:HttpDataListener = new HttpDataListener(); + +httpsClientListener.onConnect = function(event:HttpRequestEvent):void +{ +trace(connect); +}; + +httpsClientListener.onComplete = function(event:HttpResponseEvent):void +{ +trace(complete.); +}; + +httpsClientListener.onClose = function(event:Event):void +{ +trace(close.); +}; + +httpsClientListener.onDataComplete = function(event:HttpResponseEvent, data:ByteArray):void +{ +trace(onDataComplete); +}; + +httpsClientListener.onStatus = function(event:HttpStatusEvent):void +{ +trace(onStatus); +}; + +httpsClientListener.onError = function(event:ErrorEvent):void +{ +trace(http error); +}; + +httpsClientListener.onData = function(event:HttpDataEvent):void +{ +trace(data event.); +}; + +httpsClientListener.onRequest = function(event:HttpRequestEvent):void +{ +trace(request event); +}; + // ProgressEvent is not available in this manner. // We can't emulate the HTTP Status Event. It is internal to the Flash Player and won't //let us override the status item. this.httpsData = new ByteArray(); -httpsClient.get(new URI(request.url)); +httpsClient.get(new URI(request.url), httpsClientListener); } }
[5/6] git commit: [flex-utilities] [refs/heads/develop] - Updated ApacheURLLoader component to properly announce events.
Updated ApacheURLLoader component to properly announce events. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/df3dcd66 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/df3dcd66 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/df3dcd66 Branch: refs/heads/develop Commit: df3dcd66e076c62d710fd97e994c1f03d7ed398d Parents: 281223a Author: quetwo n...@theflexgroup.org Authored: Sun May 31 17:21:12 2015 -0400 Committer: quetwo n...@theflexgroup.org Committed: Sun May 31 17:21:12 2015 -0400 -- .../flex/packageflexsdk/util/ApacheURLLoader.as | 64 ++-- 1 file changed, 20 insertions(+), 44 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/df3dcd66/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as -- diff --git a/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as b/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as index 3893821..07a85c4 100644 --- a/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as +++ b/installer/src/org/apache/flex/packageflexsdk/util/ApacheURLLoader.as @@ -30,6 +30,7 @@ package org.apache.flex.packageflexsdk.util import flash.events.ErrorEvent; import flash.events.Event; +import flash.events.HTTPStatusEvent; import flash.events.IOErrorEvent; import flash.events.SecurityErrorEvent; import flash.net.URLLoader; @@ -37,9 +38,7 @@ package org.apache.flex.packageflexsdk.util import flash.utils.ByteArray; import org.httpclient.HttpClient; -import org.httpclient.events.HttpDataEvent; import org.httpclient.events.HttpDataListener; -import org.httpclient.events.HttpErrorEvent; import org.httpclient.events.HttpRequestEvent; import org.httpclient.events.HttpResponseEvent; import org.httpclient.events.HttpStatusEvent; @@ -62,48 +61,45 @@ package org.apache.flex.packageflexsdk.util } else { -trace(request.url); var httpsClient:HttpClient = new HttpClient(); var httpsClientListener:HttpDataListener = new HttpDataListener(); httpsClientListener.onConnect = function(event:HttpRequestEvent):void { -trace(connect); +var e:Event = new Event(Event.OPEN); +dispatchEvent(e); }; httpsClientListener.onComplete = function(event:HttpResponseEvent):void { -trace(complete.); +var e:HTTPStatusEvent = new HTTPStatusEvent(HTTPStatusEvent.HTTP_RESPONSE_STATUS); +// we are unable to emulate the full event since the built-in event handlers for status and +// many others are marked as private on the set functions. +dispatchEvent(e); }; -httpsClientListener.onClose = function(event:Event):void +httpsClientListener.onDataComplete = function(event:HttpResponseEvent, incomingData:ByteArray):void { -trace(close.); -}; - -httpsClientListener.onDataComplete = function(event:HttpResponseEvent, data:ByteArray):void -{ -trace(onDataComplete); +data = new ByteArray(); +data.writeBytes(incomingData); +data.position=0; +var e:Event = new Event(Event.COMPLETE); +dispatchEvent(e); }; httpsClientListener.onStatus = function(event:HttpStatusEvent):void { -trace(onStatus); +var e:HTTPStatusEvent = new HTTPStatusEvent(HTTPStatusEvent.HTTP_STATUS); +// we are unable to emulate the full event since the built-in event handlers for status and +// many others are marked as private on the set functions. +dispatchEvent(e); }; httpsClientListener.onError = function(event:ErrorEvent):void { -trace(http error); -}; - -httpsClientListener.onData = function(event:HttpDataEvent):void -{ -trace(data event.); -}; - -httpsClientListener.onRequest = function(event:HttpRequestEvent):void -{ -trace(request event); +var e:IOErrorEvent = new IOErrorEvent(IOErrorEvent.NETWORK_ERROR); +
[2/6] git commit: [flex-utilities] [refs/heads/develop] - Added ApacheURLLoader component that extends URLLoader. This new component is only different from URLLoader in that it looks for https connect
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/bd083afa/installer/src/InstallApacheFlex.mxml -- diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml index 830a223..6c91555 100644 --- a/installer/src/InstallApacheFlex.mxml +++ b/installer/src/InstallApacheFlex.mxml @@ -101,7 +101,7 @@ variables are not required because the locations of these pieces are known. fx:Script![CDATA[ import flash.globalization.LocaleID; import flash.globalization.StringTools; - + import mx.collections.ArrayCollection; import mx.core.IFlexDisplayObject; import mx.events.FlexEvent; @@ -113,15 +113,19 @@ variables are not required because the locations of these pieces are known. import mx.rpc.events.ResultEvent; import mx.rpc.http.HTTPService; import mx.utils.StringUtil; - + +import org.apache.flex.packageflexsdk.util.ApacheURLLoader; + import spark.events.IndexChangeEvent; import spark.events.TextOperationEvent; - + // This force-links all of the ant task handlers into the Installer. // The Installer doesn't use most of them directly but some script // it runs might. -import AntClasses; AntClasses; - +import AntClasses; + +AntClasses; + import org.apache.flex.ant.Ant; import org.apache.flex.ant.tags.Checksum; import org.apache.flex.ant.tags.Copy; @@ -144,16 +148,16 @@ variables are not required because the locations of these pieces are known. import org.as3commons.zip.ZipEvent; import org.as3commons.zip.ZipFile; import org.osmf.utils.OSMFStrings; - + import ws.tink.spark.controls.StepItem; import ws.tink.spark.skins.controls.InstallApacheFlexSkin; - + // embed us strings so we can always have them if we can't get to the locale files [Embed(source=properties/en_US.properties, mimeType=application/octet-stream)] private var en_US_Properties:Class; - + private var cleanedUp:Boolean; - + private var _mirrorURLCGI:String; private var _useMirror:Boolean = true; private var _latestVersion:String; @@ -170,21 +174,21 @@ variables are not required because the locations of these pieces are known. private var nocache:Boolean = true; private var wasAborted:Boolean; private var newSDKSelected:Boolean = true; - + public var installerAppPath:String; public var installerAppFileName:String; - + // loader needs to be in instance var otherwise it can get GC'd. // We only load one thing at a time, so we can all share this // var -private var loader:URLLoader; - +private var loader:ApacheURLLoader; + /** * Utility Singleton Instances */ private var _md5CompareUtil:MD5CompareUtil = MD5CompareUtil.instance; private var _mirrorURLUtil:MirrorURLUtil = MirrorURLUtil.instance; - + /** * Apache Flex binary distribution * @@ -197,16 +201,19 @@ variables are not required because the locations of these pieces are known. private var APACHE_FLEX_BIN_DISTRO_FILE_SHORT:String; private var APACHE_FLEX_BIN_DISTRO_URL:String; private var APACHE_FLEX_BIN_INSTALLER_URL:String; -[Bindable] private var APACHE_FLEX_BIN_DISTRO_VERSION:String = ; -[Bindable] private var APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY:String = ; - +[Bindable] +private var APACHE_FLEX_BIN_DISTRO_VERSION:String = ; +[Bindable] +private var APACHE_FLEX_BIN_DISTRO_VERSION_DISPLAY:String = ; + /** * Adobe AIR SDK * * Values stored in sdk-installer-config.xml edit file to change * */ -[Bindable] private var AIR_VERSIONS:ArrayCollection = new ArrayCollection(); +[Bindable] +private var AIR_VERSIONS:ArrayCollection = new ArrayCollection(); private var AIR_VERSION:String = 14.0; private var ADOBE_AIR_SDK_WIN_FILE:String; private var ADOBE_AIR_SDK_WIN_URL:String; @@ -214,27 +221,29 @@ variables are not required because the locations of these pieces are known. private var ADOBE_AIR_SDK_MAC_URL:String; private var ADOBE_AIR_SDK_LINUX_FILE:String; private var ADOBE_AIR_SDK_LINUX_URL:String; - + /** * Adobe Flash Player * * Values stored in sdk-installer-config.xml edit file to change * */ -[Bindable] private var FLASH_PLAYER_VERSIONS:ArrayCollection = new ArrayCollection(); +[Bindable] +private var FLASH_PLAYER_VERSIONS:ArrayCollection = new
[6/6] git commit: [flex-utilities] [refs/heads/develop] - Merge remote-tracking branch 'origin/develop' into as3httpclient-work
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 +
[26/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Got rid of some Class-Loading issues when using the EventSpy from within .mvn/extensions.xml
- Got rid of some Class-Loading issues when using the EventSpy from within .mvn/extensions.xml Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/29eeb02e Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/29eeb02e Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/29eeb02e Branch: refs/heads/as3httpclient-work Commit: 29eeb02e3a491d7be4999482074d415b18b860cd Parents: bfe6ba9 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sun Apr 19 13:03:33 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sun Apr 19 13:03:33 2015 +0200 -- .../converter/mavenextension/FlexEventSpy.java | 31 mavenizer/retrievers/base/pom.xml | 6 ++-- .../converter/retrievers/utils/ProgressBar.java | 2 +- 3 files changed, 16 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/29eeb02e/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java -- diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java index f275677..f6d5c4f 100644 --- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java +++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java @@ -99,27 +99,20 @@ public class FlexEventSpy extends AbstractEventSpy { protected boolean canResolve(String groupId, String artifactId, String version, String type, String classifier) { -org.apache.maven.artifact.Artifact artifact; -if((classifier == null) || (classifier.length() == 0)) { -artifact = repositorySystem.createArtifact(groupId, artifactId, version, type); -} else { -artifact = repositorySystem.createArtifactWithClassifier(groupId, artifactId, version, type, classifier); -} -if (!artifact.isResolved()) { -try { -ArtifactResolutionRequest req = new ArtifactResolutionRequest(); -req.setArtifact(artifact); -req.setLocalRepository(mavenSession.getLocalRepository()); - req.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories()); -ArtifactResolutionResult res = repositorySystem.resolve(req); -if (!res.isSuccess()) { -return false; -} -} catch (Exception e) { -return false; +try { +ArtifactResolutionRequest req = new ArtifactResolutionRequest(); +req.setLocalRepository(mavenSession.getLocalRepository()); + req.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories()); +if((classifier == null) || (classifier.length() == 0)) { +req.setArtifact(repositorySystem.createArtifact(groupId, artifactId, version, type)); +} else { + req.setArtifact(repositorySystem.createArtifactWithClassifier(groupId, artifactId, version, type, classifier)); } +ArtifactResolutionResult res = repositorySystem.resolve(req); +return res.isSuccess(); +} catch (Exception e) { +return false; } -return true; } protected void initFlex(String version) throws MavenExecutionException { http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/29eeb02e/mavenizer/retrievers/base/pom.xml -- diff --git a/mavenizer/retrievers/base/pom.xml b/mavenizer/retrievers/base/pom.xml index f311a65..507ee13 100644 --- a/mavenizer/retrievers/base/pom.xml +++ b/mavenizer/retrievers/base/pom.xml @@ -42,9 +42,9 @@ version1.8.1/version /dependency dependency -groupIdorg.codehaus.plexus/groupId -artifactIdplexus-utils/artifactId -version3.0.15/version +groupIdcommons-lang/groupId +artifactIdcommons-lang/artifactId +version2.6/version /dependency /dependencies http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/29eeb02e/mavenizer/retrievers/base/src/main/java/org/apache/flex/utilities/converter/retrievers/utils/ProgressBar.java -- diff --git
[19/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Added a framework artifact to the flash converter - Made the Flex converter generate 3-digit versions - Added a mave
- Added a framework artifact to the flash converter - Made the Flex converter generate 3-digit versions - Added a maven-extension module that buids a maven extension that handles mavenization before maven starts to build. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1edd30bd Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1edd30bd Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1edd30bd Branch: refs/heads/as3httpclient-work Commit: 1edd30bd04f1d693b9f5a9d0d8ce255fd57495e8 Parents: 6f2441d Author: Christofer Dutz christofer.d...@codecentric.de Authored: Fri Apr 17 11:32:00 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Fri Apr 17 11:32:00 2015 +0200 -- .../converter/flash/FlashConverter.java | 11 + .../utilities/converter/flex/FlexConverter.java | 2 +- .../mavenextension/FlexSdkInitializer.java | 231 +++ mavenizer/pom.xml | 1 + .../converter/retrievers/types/SdkType.java | 2 +- 5 files changed, 245 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1edd30bd/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java -- diff --git a/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java b/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java index a2c1831..776e0c6 100644 --- a/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java +++ b/mavenizer/converters/flash/src/main/java/org/apache/flex/utilities/converter/flash/FlashConverter.java @@ -244,6 +244,17 @@ public class FlashConverter extends BaseConverter implements Converter { playerglobal.setPackaging(swc); playerglobal.addDefaultBinaryArtifact(playerglobalSwc); writeArtifact(playerglobal); + +// Create a dummy pom artifact that references the playerglobal +// in order to consequently have a framework artifact for every +// part of flex. +final MavenArtifact framework = new MavenArtifact(); +framework.setGroupId(com.adobe.flash); +framework.setArtifactId(framework); +framework.setVersion(version); +framework.setPackaging(pom); +framework.addDependency(playerglobal); +writePomArtifact(framework); } } } http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1edd30bd/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java -- diff --git a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java index be8c000..4600b76 100644 --- a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java +++ b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java @@ -582,7 +582,7 @@ public class FlexConverter extends BaseConverter implements Converter { final String build = root.getElementsByTagName(build).item(0).getTextContent(); // In general the version consists of the content of the version element with an appended build-number. -return (build.equals(0)) ? version + -SNAPSHOT : version + . + build; +return (build.equals(0)) ? version + -SNAPSHOT : version; } catch (ParserConfigurationException pce) { throw new RuntimeException(pce); } catch (SAXException se) { http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1edd30bd/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java -- diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java new file mode 100644 index 000..fecac35 --- /dev/null +++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexSdkInitializer.java @@ -0,0 +1,231 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + *
[50/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Merge remote-tracking branch 'origin/develop' into as3httpclient-work
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/as3httpclient-work 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 +
[20/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Switched from VelocityTemplates to Freemarker to avoid some anoying classloader problems in combination with Maven. - C
- Switched from VelocityTemplates to Freemarker to avoid some anoying classloader problems in combination with Maven. - Created a FlexEventSpy Maven core extension which listens for resolution requests for Flex related resources and which kicks the converter in for missing parts. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/a1ac19f3 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/a1ac19f3 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/a1ac19f3 Branch: refs/heads/as3httpclient-work Commit: a1ac19f3dda255e781f7c07b0da785a90dcc2a62 Parents: 1edd30b Author: Christofer Dutz christofer.d...@codecentric.de Authored: Fri Apr 17 20:24:16 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Fri Apr 17 20:24:16 2015 +0200 -- mavenizer/converters/base/pom.xml | 6 +- .../flex/utilities/converter/BaseConverter.java | 46 ++-- .../src/main/resources/templates/default.ftl| 41 .../src/main/resources/templates/default.vm | 41 .../base/src/main/resources/templates/pom.ftl | 55 + .../base/src/main/resources/templates/pom.vm| 55 - .../base/src/main/resources/velocity.properties | 29 --- .../converter/mavenextension/FlexEventSpy.java | 225 ++ .../mavenextension/FlexSdkInitializer.java | 231 --- 9 files changed, 342 insertions(+), 387 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/converters/base/pom.xml -- diff --git a/mavenizer/converters/base/pom.xml b/mavenizer/converters/base/pom.xml index e43226e..5a1b89c 100644 --- a/mavenizer/converters/base/pom.xml +++ b/mavenizer/converters/base/pom.xml @@ -42,9 +42,9 @@ version1.3.1/version /dependency dependency -groupIdorg.apache.velocity/groupId -artifactIdvelocity/artifactId -version1.7/version +groupIdorg.freemarker/groupId +artifactIdfreemarker/artifactId +version2.3.22/version /dependency /dependencies http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a1ac19f3/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java -- diff --git a/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java b/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java index 3e1dbf7..5d904dd 100644 --- a/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java +++ b/mavenizer/converters/base/src/main/java/org/apache/flex/utilities/converter/BaseConverter.java @@ -19,10 +19,11 @@ package org.apache.flex.utilities.converter; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; +import freemarker.template.Configuration; +import freemarker.template.Template; +import freemarker.template.TemplateExceptionHandler; import org.apache.flex.utilities.converter.exceptions.ConverterException; import org.apache.flex.utilities.converter.model.MavenArtifact; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; @@ -30,12 +31,12 @@ import org.codehaus.jettison.json.JSONTokener; import java.io.*; import java.math.BigInteger; +import java.net.URL; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -53,7 +54,7 @@ public abstract class BaseConverter { protected File rootSourceDirectory; protected File rootTargetDirectory; -private VelocityEngine velocityEngine; +protected Configuration freemarkerConfig; protected BaseConverter(File rootSourceDirectory, File rootTargetDirectory) throws ConverterException { if(rootSourceDirectory == null) { @@ -66,20 +67,10 @@ public abstract class BaseConverter { this.rootSourceDirectory = rootSourceDirectory; this.rootTargetDirectory = rootTargetDirectory; -try { -// Load some initial properties from the classpath. -final Properties properties = new Properties(); -final InputStream propertyInputStream = -
[24/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Applied some changes to make the FlexEventSpy working with older Maven versions.
- Applied some changes to make the FlexEventSpy working with older Maven versions. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/34ba2e8e Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/34ba2e8e Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/34ba2e8e Branch: refs/heads/as3httpclient-work Commit: 34ba2e8eb8133d94514816f3893f93d391a291e6 Parents: 95af18d Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sun Apr 19 11:52:11 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sun Apr 19 11:52:11 2015 +0200 -- .../converter/mavenextension/FlexEventSpy.java| 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/34ba2e8e/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java -- diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java index 8c62236..a378f98 100644 --- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java +++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java @@ -11,9 +11,9 @@ import org.apache.maven.MavenExecutionException; import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; import org.apache.maven.artifact.resolver.ArtifactResolutionResult; import org.apache.maven.eventspy.AbstractEventSpy; +import org.apache.maven.execution.ExecutionEvent; import org.apache.maven.execution.MavenSession; import org.apache.maven.repository.RepositorySystem; -import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.logging.Logger; import org.eclipse.aether.RepositoryEvent; import org.eclipse.aether.artifact.Artifact; @@ -36,8 +36,7 @@ public class FlexEventSpy extends AbstractEventSpy { @Inject protected Logger logger; -@Inject -protected PlexusContainer plexusContainer; +protected MavenSession mavenSession; protected boolean internalLookup = false; protected boolean flexSplashScreenShown = false; @@ -51,7 +50,9 @@ public class FlexEventSpy extends AbstractEventSpy { @Override public void onEvent(Object o) throws Exception { -if(o instanceof RepositoryEvent) { +if(o instanceof ExecutionEvent) { +mavenSession = ((ExecutionEvent) o).getSession(); +} else if(o instanceof RepositoryEvent) { RepositoryEvent repositoryEvent = (RepositoryEvent) o; if(repositoryEvent.getType() == RepositoryEvent.EventType.ARTIFACT_RESOLVING) { if(!internalLookup) { @@ -100,7 +101,6 @@ public class FlexEventSpy extends AbstractEventSpy { } if (!artifact.isResolved()) { try { -MavenSession mavenSession = plexusContainer.lookup(MavenSession.class); ArtifactResolutionRequest req = new ArtifactResolutionRequest(); req.setArtifact(artifact); req.setLocalRepository(mavenSession.getLocalRepository()); @@ -120,7 +120,6 @@ public class FlexEventSpy extends AbstractEventSpy { logger.info(===); logger.info( - Installing Apache Flex SDK + version); try { -MavenSession mavenSession = plexusContainer.lookup(MavenSession.class); File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir()); DownloadRetriever downloadRetriever = new DownloadRetriever(); File sdkRoot = downloadRetriever.retrieve(SdkType.FLEX, version); @@ -146,7 +145,6 @@ public class FlexEventSpy extends AbstractEventSpy { logger.info(===); logger.info( - Installing Adobe Flash SDK + version); try { -MavenSession mavenSession = plexusContainer.lookup(MavenSession.class); File localRepoBaseDir = new File(mavenSession.getLocalRepository().getBasedir()); DownloadRetriever downloadRetriever = new DownloadRetriever(); File sdkRoot = downloadRetriever.retrieve(SdkType.FLASH, version); @@ -163,7 +161,6 @@ public class FlexEventSpy extends AbstractEventSpy { logger.info(===); logger.info( - Installing Adobe AIR SDK + version); try { -MavenSession
[03/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Added missing fontkit pom
Added missing fontkit pom Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/48b73f3a Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/48b73f3a Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/48b73f3a Branch: refs/heads/as3httpclient-work Commit: 48b73f3ae2760390e0912db808705f944c1e7565 Parents: d1de19d Author: Christofer Dutz christofer.d...@codecentric.de Authored: Fri Apr 10 08:50:01 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Fri Apr 10 08:50:01 2015 +0200 -- mavenizer/converters/fontkit/pom.xml | 41 +++ 1 file changed, 41 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/48b73f3a/mavenizer/converters/fontkit/pom.xml -- diff --git a/mavenizer/converters/fontkit/pom.xml b/mavenizer/converters/fontkit/pom.xml new file mode 100644 index 000..3d472e0 --- /dev/null +++ b/mavenizer/converters/fontkit/pom.xml @@ -0,0 +1,41 @@ +?xml version=1.0 encoding=UTF-8? +!-- + + 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. + +-- +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd; +modelVersion4.0.0/modelVersion + +parent +groupIdorg.apache.flex.utilities.converter/groupId +artifactIdconverters/artifactId +version1.0.0-SNAPSHOT/version +/parent + +artifactIdfontkit-converter/artifactId +version1.0.0-SNAPSHOT/version +packagingjar/packaging + +dependencies +dependency +groupIdorg.apache.flex.utilities.converter/groupId +artifactIdbase-converter/artifactId +version1.0.0-SNAPSHOT/version +/dependency +/dependencies + +/project
[25/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Cleaned up the code a little.
- Cleaned up the code a little. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/bfe6ba99 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/bfe6ba99 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/bfe6ba99 Branch: refs/heads/as3httpclient-work Commit: bfe6ba997093ac3dc7ab315605332a954b0220ed Parents: 34ba2e8 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sun Apr 19 12:17:24 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sun Apr 19 12:17:24 2015 +0200 -- .../converter/mavenextension/FlexEventSpy.java | 32 1 file changed, 19 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/bfe6ba99/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java -- diff --git a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java index a378f98..f275677 100644 --- a/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java +++ b/mavenizer/maven-extension/src/main/java/org/apache/flex/utilities/converter/mavenextension/FlexEventSpy.java @@ -24,6 +24,11 @@ import javax.inject.Singleton; import java.io.File; /** + * Maven EventSpy that listens for resolution requests and in case of Flex related + * artifacts, it pre-checks their availability. If they are not available, it uses + * the apache flex sdk converter to automatically download and convert the missing + * artifacts before continuing the build normally. + * * Created by christoferdutz on 17.04.15. */ @Named @@ -60,26 +65,27 @@ public class FlexEventSpy extends AbstractEventSpy { internalLookup = true; Artifact artifact = repositoryEvent.getArtifact(); if (artifact.getGroupId().startsWith(org.apache.flex)) { +// Output a cool spash-screen ... sorry for that ... couldn't resist :-) if(!flexSplashScreenShown) { showFlexSplashScreen(); } -if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), -artifact.getExtension(), artifact.getClassifier()) == null) { +if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), +artifact.getExtension(), artifact.getClassifier())) { initFlex(artifact.getVersion()); } } else if (artifact.getGroupId().startsWith(com.adobe.flash)) { -if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), -artifact.getExtension(), artifact.getClassifier()) == null) { +if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), +artifact.getExtension(), artifact.getClassifier())) { initFlash(artifact.getVersion()); } } else if (artifact.getGroupId().startsWith(com.adobe.air)) { -if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), -artifact.getExtension(), artifact.getClassifier()) == null) { +if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), +artifact.getExtension(), artifact.getClassifier())) { initAir(artifact.getVersion()); } } else if (artifact.getGroupId().equals(com.adobe) artifact.getArtifactId().equals(fontkit)) { -if(resolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), -artifact.getExtension(), artifact.getClassifier()) == null) { +if(!canResolve(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), +artifact.getExtension(), artifact.getClassifier())) { initFontkit(); }
[38/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - Merge branch 'ant-swf-version' of https://github.com/joshtynjala/flex-utilities into develop. This closes #4
Merge branch 'ant-swf-version' of https://github.com/joshtynjala/flex-utilities into develop. This closes #4 Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/624f41c9 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/624f41c9 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/624f41c9 Branch: refs/heads/as3httpclient-work Commit: 624f41c927bb45d462924ff5627704df4c20f842 Parents: 246511d 1e870fd Author: Alex Harui aha...@apache.org Authored: Tue Apr 28 08:53:42 2015 -0700 Committer: Alex Harui aha...@apache.org Committed: Tue Apr 28 09:01:30 2015 -0700 -- ant_on_air/build.xml | 2 ++ 1 file changed, 2 insertions(+) --
[30/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - AntOnAIR: switched from spark.formatters.DateTimeFormatter to native flash.globalization.DateTimeFormatter to make projec
AntOnAIR: switched from spark.formatters.DateTimeFormatter to native flash.globalization.DateTimeFormatter to make project more easily portable to pure AS3 Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/60186382 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/60186382 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/60186382 Branch: refs/heads/as3httpclient-work Commit: 60186382d1c8d3e3b486751981ca2ea0c99ca461 Parents: 1a46b11 Author: Josh Tynjala joshtynj...@gmail.com Authored: Fri Apr 24 13:58:25 2015 -0700 Committer: Josh Tynjala joshtynj...@gmail.com Committed: Fri Apr 24 13:58:25 2015 -0700 -- ant_on_air/src/org/apache/flex/ant/tags/TStamp.as | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/60186382/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as -- diff --git a/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as b/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as index 8b7f88b..0646a1f 100644 --- a/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as +++ b/ant_on_air/src/org/apache/flex/ant/tags/TStamp.as @@ -21,7 +21,8 @@ package org.apache.flex.ant.tags import mx.core.IFlexModuleFactory; import mx.resources.ResourceManager; -import spark.formatters.DateTimeFormatter; +import flash.globalization.DateTimeFormatter; +import flash.globalization.LocaleID; import org.apache.flex.ant.Ant; import org.apache.flex.ant.tags.supportClasses.TaskHandler; @@ -44,14 +45,14 @@ package org.apache.flex.ant.tags super.execute(callbackMode, context); var d:Date = new Date(); -var df:DateTimeFormatter = new DateTimeFormatter(); -df.dateTimePattern = MMdd; +var df:DateTimeFormatter = new DateTimeFormatter(LocaleID.DEFAULT); +df.setDateTimePattern(MMdd); var dstamp:String = df.format(d); context[DSTAMP] = dstamp; -df.dateTimePattern = hhmm; +df.setDateTimePattern(hhmm); var tstamp:String = df.format(d); context[TSTAMP] = tstamp; -df.dateTimePattern = dd ; +df.setDateTimePattern( dd ); var today:String = df.format(d); context[TODAY] = today;
[10/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - FLEX-34756 The unit test revealed a bug in the solution: isTextFieldReadyForSpellingJob() should return true only if the
FLEX-34756 The unit test revealed a bug in the solution: isTextFieldReadyForSpellingJob() should return true only if the textFlow is not damaged (it used to do the opposite). Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/8363ebf3 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/8363ebf3 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/8363ebf3 Branch: refs/heads/as3httpclient-work Commit: 8363ebf3be1d105dc168f2e75bb6aefe32da6430 Parents: daf48a0 Author: Mihai Chira mih...@apache.org Authored: Fri Apr 10 14:25:47 2015 +0200 Committer: Mihai Chira mih...@apache.org Committed: Fri Apr 10 14:25:47 2015 +0200 -- .../SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/8363ebf3/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as -- diff --git a/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as b/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as index 9b55ff6..0033320 100644 --- a/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as +++ b/Squiggly/main/SpellingUIEx/src/com/adobe/linguistics/spelling/SpellUI.as @@ -352,7 +352,7 @@ package com.adobe.linguistics.spelling if(!textFlow || !textFlow.flowComposer) return true; -return textFlow.flowComposer.isDamaged(textFlow.textLength); +return !textFlow.flowComposer.isDamaged(textFlow.textLength); } private function spellCheckRange(start:uint, end:uint):void {
[04/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Fixed the parent artifact name to apache-flex-sdk-converter
- Fixed the parent artifact name to apache-flex-sdk-converter Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/f21e5281 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/f21e5281 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/f21e5281 Branch: refs/heads/as3httpclient-work Commit: f21e5281f671da19fc9e3eabb978918226eaf3c9 Parents: 48b73f3 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Fri Apr 10 08:53:25 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Fri Apr 10 08:53:25 2015 +0200 -- mavenizer/cli/pom.xml| 2 +- mavenizer/converters/pom.xml | 2 +- mavenizer/deployers/pom.xml | 2 +- mavenizer/retrievers/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f21e5281/mavenizer/cli/pom.xml -- diff --git a/mavenizer/cli/pom.xml b/mavenizer/cli/pom.xml index 4d4c8eb..839838e 100644 --- a/mavenizer/cli/pom.xml +++ b/mavenizer/cli/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.flex.utilities.converter/groupId -artifactIdflex-sdk-converter/artifactId +artifactIdapache-flex-sdk-converter/artifactId version1.0.0-SNAPSHOT/version /parent http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f21e5281/mavenizer/converters/pom.xml -- diff --git a/mavenizer/converters/pom.xml b/mavenizer/converters/pom.xml index 10ba0ef..d2dbad4 100644 --- a/mavenizer/converters/pom.xml +++ b/mavenizer/converters/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.flex.utilities.converter/groupId -artifactIdflex-sdk-converter/artifactId +artifactIdapache-flex-sdk-converter/artifactId version1.0.0-SNAPSHOT/version /parent http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f21e5281/mavenizer/deployers/pom.xml -- diff --git a/mavenizer/deployers/pom.xml b/mavenizer/deployers/pom.xml index 9557778..692b45d 100644 --- a/mavenizer/deployers/pom.xml +++ b/mavenizer/deployers/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.flex.utilities.converter/groupId -artifactIdflex-sdk-converter/artifactId +artifactIdapache-flex-sdk-converter/artifactId version1.0.0-SNAPSHOT/version /parent http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/f21e5281/mavenizer/retrievers/pom.xml -- diff --git a/mavenizer/retrievers/pom.xml b/mavenizer/retrievers/pom.xml index 0ad50ae..a95bf41 100644 --- a/mavenizer/retrievers/pom.xml +++ b/mavenizer/retrievers/pom.xml @@ -22,7 +22,7 @@ parent groupIdorg.apache.flex.utilities.converter/groupId -artifactIdflex-sdk-converter/artifactId +artifactIdapache-flex-sdk-converter/artifactId version1.0.0-SNAPSHOT/version /parent
[16/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Removed the (TM) behind The Works as I don't think it's an actual trademark and I dont want the next release to be
- Removed the (TM) behind The Works as I don't think it's an actual trademark and I dont want the next release to be vetoed because of me being a little humoristic :-) Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/98046356 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/98046356 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/98046356 Branch: refs/heads/as3httpclient-work Commit: 9804635634435284bf5623a10d77d91390da6919 Parents: fe3b8b2 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 11 11:19:51 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 11 11:19:51 2015 +0200 -- mavenizer/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/98046356/mavenizer/README.txt -- diff --git a/mavenizer/README.txt b/mavenizer/README.txt index 9707141..7f84e76 100644 --- a/mavenizer/README.txt +++ b/mavenizer/README.txt @@ -164,7 +164,7 @@ Some typical usage scenarios ... -mavenDir dir with maven artifacts -repoUrl url \ -repoUsername username -repoPassword pasword deploy - - The works (TM): Download, Convert and Deploy using only temp directories: + - The works: Download, Convert and Deploy using only temp directories: ... -flexVersion 4.14.1 -flashVersions 17.0 -airVersion 17.0 -fontkit \ -repoUrl url -repoUsername username -repoPassword pasword \ download convert deploy
[23/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Reduced the maven-core version to the minimal one possible.
- Reduced the maven-core version to the minimal one possible. Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/95af18d9 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/95af18d9 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/95af18d9 Branch: refs/heads/as3httpclient-work Commit: 95af18d9f22e5d650eaecb39ced94d22b511cea1 Parents: cfcd465 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 18 21:58:19 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 18 21:58:19 2015 +0200 -- mavenizer/maven-extension/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95af18d9/mavenizer/maven-extension/pom.xml -- diff --git a/mavenizer/maven-extension/pom.xml b/mavenizer/maven-extension/pom.xml index 210a4e4..384fba9 100644 --- a/mavenizer/maven-extension/pom.xml +++ b/mavenizer/maven-extension/pom.xml @@ -105,7 +105,7 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-core/artifactId -version3.3.1/version +version3.1.1/version scopeprovided/scope /dependency /dependencies
[37/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Fine tuned the example a little
- Fine tuned the example a little Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/246511db Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/246511db Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/246511db Branch: refs/heads/as3httpclient-work Commit: 246511db5c328a2805366abfe5151a43b8c7b357 Parents: f894512 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Sat Apr 25 16:19:46 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Sat Apr 25 16:19:46 2015 +0200 -- maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/246511db/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml -- diff --git a/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml b/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml index e8630d6..6d71468 100644 --- a/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml +++ b/maven-flex-plugin/examples/i18n/locale-chains/swf/pom.xml @@ -45,8 +45,8 @@ localesCompiled localeen_US/locale localeen_GB,en_US/locale -localede_DE,en_US/locale -localede_AT,de_DE,en_US/locale +localede_DE/locale +localede_AT,de_DE/locale /localesCompiled /configuration dependencies
[27/50] [abbrv] git commit: [flex-utilities] [refs/heads/as3httpclient-work] - - Fixed a bug making the converter not copy rsls correctly as we stripped the build number from the version (Which was al
- Fixed a bug making the converter not copy rsls correctly as we stripped the build number from the version (Which was also used for finding the rsls ... which contained the build number in their versions) Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/05922ef7 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/05922ef7 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/05922ef7 Branch: refs/heads/as3httpclient-work Commit: 05922ef7ba1dd02a1a61fff092665c0da7d09819 Parents: 29eeb02 Author: Christofer Dutz christofer.d...@codecentric.de Authored: Mon Apr 20 16:12:39 2015 +0200 Committer: Christofer Dutz christofer.d...@codecentric.de Committed: Mon Apr 20 16:12:39 2015 +0200 -- .../utilities/converter/flex/FlexConverter.java | 40 ++-- 1 file changed, 37 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/05922ef7/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java -- diff --git a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java index 4600b76..6def8a1 100644 --- a/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java +++ b/mavenizer/converters/flex/src/main/java/org/apache/flex/utilities/converter/flex/FlexConverter.java @@ -41,6 +41,7 @@ import java.util.zip.ZipOutputStream; public class FlexConverter extends BaseConverter implements Converter { protected String flexSdkVersion; +protected String flexBuild; /** * @param rootSourceDirectory Path to the root of the original Flex SDK. @@ -52,6 +53,7 @@ public class FlexConverter extends BaseConverter implements Converter { // Get the version of the current Flex SDK. this.flexSdkVersion = getFlexVersion(rootSourceDirectory); +this.flexBuild = getFlexBuild(rootSourceDirectory); } /** @@ -592,8 +594,40 @@ public class FlexConverter extends BaseConverter implements Converter { } } +/** + * Get the version of an Flex SDK from the content of the SDK directory. + * + * @return version string for the current Flex SDK + */ +protected String getFlexBuild(File rootDirectory) throws ConverterException { +final File sdkDescriptor = new File(rootDirectory, flex-sdk-description.xml); + +// If the descriptor is not present, return null as this FDK directory doesn't +// seem to contain a Flex SDK. +if(!sdkDescriptor.exists()) { +return null; +} + +final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); +try { +// Parse the document +final DocumentBuilder db = dbf.newDocumentBuilder(); +final Document dom = db.parse(sdkDescriptor); + +// Get name, version and build nodes +final Element root = dom.getDocumentElement(); +return root.getElementsByTagName(build).item(0).getTextContent(); +} catch (ParserConfigurationException pce) { +throw new RuntimeException(pce); +} catch (SAXException se) { +throw new RuntimeException(se); +} catch (IOException ioe) { +throw new RuntimeException(ioe); +} +} + protected File getRsl(String artifactId) { -final FlexRslFilter filter = new FlexRslFilter(artifactId, flexSdkVersion); +final FlexRslFilter filter = new FlexRslFilter(artifactId, flexSdkVersion, flexBuild); final File rslDirectory = new File(rootSourceDirectory, frameworks + File.separator + rsls); final File[] rsls = rslDirectory.listFiles(filter); if ((rsls != null) (rsls.length == 1)) { @@ -660,8 +694,8 @@ public class FlexConverter extends BaseConverter implements Converter { public static class FlexRslFilter implements FilenameFilter { private String fileName; -public FlexRslFilter(String artifactName, String artifactVersion) { -this.fileName = artifactName + _ + artifactVersion + .swf; +public FlexRslFilter(String artifactName, String artifactVersion, String build) { +this.fileName = artifactName + _ + artifactVersion + . + build + .swf; } public boolean accept(File dir, String name) {
Jenkins build is back to stable : flex-blazeds #362
See http://apacheflexbuild.cloudapp.net:8080/job/flex-blazeds/362/
Build failed in Jenkins: flex-falcon #488
See http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/488/ -- [...truncated 1976 lines...] [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\mx\compile-config.xml [junit] [junit] 1273707 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\_mx2635897169897430274.swc in 27.513 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\automation\compile-config.xml [junit] [junit] 222175 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\automation1989432865003394233.swc in 6.458 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\charts\compile-config.xml [junit] [junit] 785538 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\charts843149755981197696.swc in 17.991 seconds [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\core\compile-config.xml [junit] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\projects\framework\framework-config.xml [junit] [junit] 66837 bytes written to C:\Users\apacheflexbuild\AppData\Local\Temp\2\core4619076588761603519.swc in 2.979 seconds [junit] Tests run: 29, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 265.209 sec [junit] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 jar.tests: [java] Apache Flex MXML and ActionScript Compiler (mxmlc) [java] Version 0.0.3 build 0 [java] [java] mxmlc [options] [defaultVar] [java] Use 'mxmlc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWC Component Compiler (compc) [java] Version 0.0.3 build 0 [java] [java] compc [options] [defaultVar] [java] Use 'compc -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] ActionScript 3.0 Compiler for AVM+ [java] Version 0.0.3 build 0 [java] [java] usage: asc [-abcfuture] [-api version] [-AS3] [-avmtarget vm version [java]number] [-b] [-coach] [-config ns::name=value] [-d] [-doc] [java][-ES] [-ES4] [-exe avmplus path] [-f] [-h] [-i] [-import [java]filename] [-in filename] [-inline] [-l] [-language lang] [java][-le swc file] [-li swc file] [-log] [-m] [-md] [-merge] [java][-movieclip] [-o] [-o2 name=value] [-optimize] [-out [java]basename] [-outdir output directory name] [-p] [-parallel] [java][-removedeadcode] [-sanity] [-static] [-strict] [-swf [java]classname,width,height[,fps]] [-use namespace] [-warnings] [java]FILENAME... [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache ActionScript Compiler (optimizer) [java] Version 0.0.3 build 0 [java] [java] optimizer [options] [defaultVar] [java] Use 'optimizer -help' for more information. [java] [java] [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 [java] Apache Flex SWF Dump Utility [java] Version 0.0.3 build 0 [java] [java] Usage: swfdump [-abc] file1.swf [java] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 [java] Java Result: 1 ant.tests: [mxmlc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [mxmlc] [mxmlc] 509 bytes written to C:\Jenkins\workspace\flex-falcon\compiler.tests\Hello.swf in 8.791 seconds [delete] Deleting: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.tests/Hello.swf [compc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [compc] [compc] 1627 bytes written to C:\Jenkins\workspace\flex-falcon\compiler.tests\Hello.swc in 7.184 seconds [delete] Deleting: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.tests/Hello.swc main: compiler.jx.tests: download: prepare: [mkdir] Created dir: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.jx.tests/lib junit-jar-check: junit-jar: [echo] Obtaining lib/junit-4.10.jar junit-jar-check: junit-download-jar: download-jar: [get] Getting: http://search.maven.org/remotecontent?filepath=junit/junit/4.10/junit-4.10.jar [get] To: http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/ws/compiler.jx.tests/lib/junit-4.10.jar [get]
Jenkins build is still unstable: flex-sdk_test #296
See http://apacheflexbuild.cloudapp.net:8080/job/flex-sdk_test/296/