- Renamed the maven artifacts - Renamed the compiler.jx module directory to compiler-jx - Added some Null checks to the maven-plugins to give sensible error messages if a requested tool-group is not available
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9759a0bc Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9759a0bc Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9759a0bc Branch: refs/heads/feature/maven-migration Commit: 9759a0bca62ae64c893e67830af7522956b7ffcb Parents: 583e8ad Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Tue Mar 29 16:33:28 2016 +0200 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Tue Mar 29 16:33:28 2016 +0200 ---------------------------------------------------------------------- compiler-build-tools/pom.xml | 2 +- compiler-jburg-types/pom.xml | 2 +- compiler.jx/pom.xml | 8 +++++--- compiler/pom.xml | 2 +- externs/GCL/pom.xml | 2 +- externs/cordova/pom.xml | 2 +- externs/createjs/pom.xml | 2 +- externs/google_maps/pom.xml | 2 +- externs/jasmine/pom.xml | 2 +- externs/jquery/pom.xml | 2 +- externs/js/pom.xml | 5 ++++- externs/node/pom.xml | 2 +- externs/pom.xml | 2 +- flex-compiler-oem/pom.xml | 2 +- flexjs-maven-plugin/pom.xml | 2 +- .../main/java/org/apache/flex/maven/flexjs/CompileMojo.java | 4 ++++ .../main/java/org/apache/flex/maven/flexjs/ExterncMojo.java | 4 ++++ pom.xml | 7 +++---- 18 files changed, 33 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/compiler-build-tools/pom.xml ---------------------------------------------------------------------- diff --git a/compiler-build-tools/pom.xml b/compiler-build-tools/pom.xml index ccb9574..0e65fbe 100644 --- a/compiler-build-tools/pom.xml +++ b/compiler-build-tools/pom.xml @@ -30,7 +30,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>maven-plugin</packaging> - <name>Apache Flex - FlexJS Compiler: Build Tools</name> + <name>Apache Flex - FlexJS: Build Tools</name> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/compiler-jburg-types/pom.xml ---------------------------------------------------------------------- diff --git a/compiler-jburg-types/pom.xml b/compiler-jburg-types/pom.xml index 39d8c63..078978b 100644 --- a/compiler-jburg-types/pom.xml +++ b/compiler-jburg-types/pom.xml @@ -30,7 +30,7 @@ <artifactId>compiler-jburg-types</artifactId> <version>0.6.0-SNAPSHOT</version> - <name>Apache Flex - FlexJS Compiler: JBurg Types</name> + <name>Apache Flex - FlexJS: JBurg Types</name> <description>Types needed by JBurg to perform it's code generation.</description> <dependencies> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/compiler.jx/pom.xml ---------------------------------------------------------------------- diff --git a/compiler.jx/pom.xml b/compiler.jx/pom.xml index e9e10a4..380200a 100644 --- a/compiler.jx/pom.xml +++ b/compiler.jx/pom.xml @@ -30,7 +30,7 @@ <artifactId>compiler-jx</artifactId> <version>0.6.0-SNAPSHOT</version> - <name>Apache Flex - FlexJS Compiler: FalconJx Cross Compiler</name> + <name>Apache Flex - FlexJS: Compiler.JX</name> <build> <plugins> @@ -50,8 +50,9 @@ <exclude>**/TestGoogEmiter.java</exclude> <exclude>**/TestGoogFile.java</exclude> <exclude>**/TestVF2JSFile.java</exclude> - <exclude>**/TestFlexJSMXMLApplication.java</exclude> <exclude>**/TestVF2JSMXMLApplication.java</exclude> + <exclude>**/TestFlexJSMXMLApplication.java</exclude> + <exclude>**/TestFlexJSMXMLScript.java</exclude> </excludes> </configuration> </plugin> @@ -66,7 +67,7 @@ <exclude>org/apache/flex/compiler/internal/codegen/js/flexjs/**/Test*.java</exclude> </includes> <excludes> - <!-- Use externs --> + <!-- Use externs/asjs --> <exclude>**/TestExternChrome.java</exclude> <exclude>**/TestExternJasmine.java</exclude> <exclude>**/TestExternJQuery.java</exclude> @@ -77,6 +78,7 @@ <exclude>**/TestFlexJSEmiter.java</exclude> <exclude>**/TestFlexJSClass.java</exclude> <exclude>**/TestFlexJSExpressions.java</exclude> + <exclude>**/TestFlexJSFile.java</exclude> </excludes> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/compiler/pom.xml ---------------------------------------------------------------------- diff --git a/compiler/pom.xml b/compiler/pom.xml index 81aa864..df19faa 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -30,7 +30,7 @@ <artifactId>compiler</artifactId> <version>0.6.0-SNAPSHOT</version> - <name>Apache Flex - FlexJS Compiler</name> + <name>Apache Flex - FlexJS: Compiler</name> <description>The Apache Flex Falcon Compiler</description> <build> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/externs/GCL/pom.xml ---------------------------------------------------------------------- diff --git a/externs/GCL/pom.xml b/externs/GCL/pom.xml index e38b848..da88bda 100644 --- a/externs/GCL/pom.xml +++ b/externs/GCL/pom.xml @@ -31,7 +31,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Flex - FlexJS Compiler: Externs: GCL</name> + <name>Apache Flex - FlexJS: Externs: GCL</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/externs/cordova/pom.xml ---------------------------------------------------------------------- diff --git a/externs/cordova/pom.xml b/externs/cordova/pom.xml index 69bb6b4..aacab74 100644 --- a/externs/cordova/pom.xml +++ b/externs/cordova/pom.xml @@ -31,7 +31,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Flex - FlexJS Compiler: Externs: Cordova</name> + <name>Apache Flex - FlexJS: Externs: Cordova</name> <properties> <cordova.version>4.11</cordova.version> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/externs/createjs/pom.xml ---------------------------------------------------------------------- diff --git a/externs/createjs/pom.xml b/externs/createjs/pom.xml index 33028e9..e6b6e5a 100644 --- a/externs/createjs/pom.xml +++ b/externs/createjs/pom.xml @@ -31,7 +31,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Flex - FlexJS Compiler: Externs: CreateJS</name> + <name>Apache Flex - FlexJS: Externs: CreateJS</name> <properties> <createjs.version>0.8.0</createjs.version> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/externs/google_maps/pom.xml ---------------------------------------------------------------------- diff --git a/externs/google_maps/pom.xml b/externs/google_maps/pom.xml index 4dea139..bd32c75 100644 --- a/externs/google_maps/pom.xml +++ b/externs/google_maps/pom.xml @@ -31,7 +31,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Flex - FlexJS Compiler: Externs: GoogleMaps</name> + <name>Apache Flex - FlexJS: Externs: GoogleMaps</name> <properties> <googlemaps.version>v3_11</googlemaps.version> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/externs/jasmine/pom.xml ---------------------------------------------------------------------- diff --git a/externs/jasmine/pom.xml b/externs/jasmine/pom.xml index 47e6a24..a85335a 100644 --- a/externs/jasmine/pom.xml +++ b/externs/jasmine/pom.xml @@ -31,7 +31,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Flex - FlexJS Compiler: Externs: Jasmine</name> + <name>Apache Flex - FlexJS: Externs: Jasmine</name> <properties> <jasmine.version>2.0</jasmine.version> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/externs/jquery/pom.xml ---------------------------------------------------------------------- diff --git a/externs/jquery/pom.xml b/externs/jquery/pom.xml index 02f3861..3431392 100644 --- a/externs/jquery/pom.xml +++ b/externs/jquery/pom.xml @@ -31,7 +31,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Flex - FlexJS Compiler: Externs: JQuery</name> + <name>Apache Flex - FlexJS: Externs: JQuery</name> <properties> <jquery.version>1.9</jquery.version> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/externs/js/pom.xml ---------------------------------------------------------------------- diff --git a/externs/js/pom.xml b/externs/js/pom.xml index 7ad466e..26cb8df 100644 --- a/externs/js/pom.xml +++ b/externs/js/pom.xml @@ -31,7 +31,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Flex - FlexJS Compiler: Externs: JS</name> + <name>Apache Flex - FlexJS: Externs: JS</name> <build> <plugins> @@ -178,4 +178,7 @@ </plugins> </build> + <dependencies> + </dependencies> + </project> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/externs/node/pom.xml ---------------------------------------------------------------------- diff --git a/externs/node/pom.xml b/externs/node/pom.xml index 32e215a..8247c64 100644 --- a/externs/node/pom.xml +++ b/externs/node/pom.xml @@ -31,7 +31,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>swc</packaging> - <name>Apache Flex - FlexJS Compiler: Externs: Node</name> + <name>Apache Flex - FlexJS: Externs: Node</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/externs/pom.xml ---------------------------------------------------------------------- diff --git a/externs/pom.xml b/externs/pom.xml index 9557f3f..0f5d1a5 100644 --- a/externs/pom.xml +++ b/externs/pom.xml @@ -31,7 +31,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache Flex - FlexJS Compiler: Externs</name> + <name>Apache Flex - FlexJS: Externs</name> <modules> <module>cordova</module> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/flex-compiler-oem/pom.xml ---------------------------------------------------------------------- diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml index 8cd2f1e..aa10fc2 100644 --- a/flex-compiler-oem/pom.xml +++ b/flex-compiler-oem/pom.xml @@ -30,7 +30,7 @@ <artifactId>flex-compiler-oem</artifactId> <version>0.6.0-SNAPSHOT</version> - <name>Apache Flex - FlexJS Compiler: OEM Layer</name> + <name>Apache Flex - FlexJS: OEM Layer</name> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/flexjs-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/flexjs-maven-plugin/pom.xml b/flexjs-maven-plugin/pom.xml index da44094..fc132e7 100644 --- a/flexjs-maven-plugin/pom.xml +++ b/flexjs-maven-plugin/pom.xml @@ -30,7 +30,7 @@ <version>0.6.0-SNAPSHOT</version> <packaging>maven-plugin</packaging> - <name>Apache Flex: FlexJS Maven Plugin</name> + <name>Apache Flex - FlexJS: Maven Plugin</name> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileMojo.java ---------------------------------------------------------------------- diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileMojo.java index 9b17af8..ca2b28a 100644 --- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileMojo.java +++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileMojo.java @@ -53,6 +53,10 @@ public class CompileMojo { FlexToolRegistry toolRegistry = new FlexToolRegistry(); FlexToolGroup toolGroup = toolRegistry.getToolGroup("Falcon"); + if(toolGroup == null) { + throw new MojoExecutionException("Could not find tool group: Falcon"); + } + FlexTool compc = toolGroup.getFlexTool(FlexTool.FLEX_TOOL_COMPC); File outputFile = new File(outputDirectory, outputFileName); String[] args = {"+flexlib=externs", "-debug", "-load-config=" + configFile.getPath(), http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java ---------------------------------------------------------------------- diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java index 063edc2..a330993 100644 --- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java +++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java @@ -49,6 +49,10 @@ public class ExterncMojo FlexToolRegistry toolRegistry = new FlexToolRegistry(); FlexToolGroup toolGroup = toolRegistry.getToolGroup("FlexJS"); + if(toolGroup == null) { + throw new MojoExecutionException("Could not find tool group: FlexJS"); + } + // TODO: Change this to a flex-tool-api constant ... FlexTool compc = toolGroup.getFlexTool("EXTERNC"); String[] args = {"+flexlib=externs", "-debug", "-load-config=" + configFile.getPath()}; http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9759a0bc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 729d608..4c707ab 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,8 @@ <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache Flex - FlexJS Compiler: Parent</name> - <description>The Apache Flex FlexJS Compiler Parent</description> + <name>Apache Flex - FlexJS</name> + <description>The Apache Flex FlexJS Parent</description> <mailingLists> <mailingList> @@ -77,9 +77,8 @@ <activeByDefault>true</activeByDefault> </activation> <modules> - <module>compiler-build-tools</module> <module>compiler</module> - <module>compiler.jx</module> + <module>compiler-jx</module> <module>flex-compiler-oem</module> <module>externs</module> <module>flexjs-maven-plugin</module>