Repository: flex-asjs Updated Branches: refs/heads/develop 8221a6685 -> 953167882
- Changed the build to do the war packaging with the maven-war-plugin and the attaching of the artifact using the build-helper-maven-plugin - Added a "release" profile to set the flex.debug property and change the directory that is packaged by the maven-war-plugin - Added some more error reports for JavaScript output - Added the font-data to the DataBindingExample_Flat project - Removed the dependencies on the air-framework as it seems that this wasn't needed at all Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/95316788 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/95316788 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/95316788 Branch: refs/heads/develop Commit: 953167882cdf5fc1439d1673d5c64891b2b68589 Parents: 8221a66 Author: Christofer Dutz <[email protected]> Authored: Wed Jul 6 14:29:24 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Wed Jul 6 14:29:24 2016 +0200 ---------------------------------------------------------------------- examples/flexjs/ChartExample/pom.xml | 9 ++- examples/flexjs/CordovaCameraExample/pom.xml | 11 ++-- examples/flexjs/CreateJSExample/pom.xml | 9 ++- examples/flexjs/DataBindingExample/pom.xml | 23 ++++++- examples/flexjs/DataBindingExample_Flat/pom.xml | 32 +++++++++- examples/flexjs/DataBindingExample_as/pom.xml | 18 +++++- examples/flexjs/DataGridExample/pom.xml | 9 ++- examples/flexjs/DesktopMap/pom.xml | 18 +++--- examples/flexjs/FlexJSStore/pom.xml | 9 ++- examples/flexjs/FlexJSStore_jquery/pom.xml | 9 ++- examples/flexjs/FlexWebsiteStatsViewer/pom.xml | 37 +++++++++++- examples/flexjs/HelloWorld/pom.xml | 9 ++- examples/flexjs/MapSearch/pom.xml | 17 +++--- examples/flexjs/MobileMap/pom.xml | 9 ++- examples/flexjs/MobileTrader/pom.xml | 9 ++- examples/flexjs/StorageExample/pom.xml | 15 ++--- examples/flexjs/StyleExample/pom.xml | 9 ++- examples/flexjs/TodoListSampleApp/pom.xml | 9 ++- examples/flexjs/TreeExample/pom.xml | 9 ++- examples/pom.xml | 63 ++++++++++++++++++++ pom.xml | 9 +++ 21 files changed, 297 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/ChartExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/ChartExample/pom.xml b/examples/flexjs/ChartExample/pom.xml index 183de9c..f09dac0 100644 --- a/examples/flexjs/ChartExample/pom.xml +++ b/examples/flexjs/ChartExample/pom.xml @@ -43,12 +43,19 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>ChartExample.mxml</mainClass> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/CordovaCameraExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/CordovaCameraExample/pom.xml b/examples/flexjs/CordovaCameraExample/pom.xml index 820e782..267d444 100644 --- a/examples/flexjs/CordovaCameraExample/pom.xml +++ b/examples/flexjs/CordovaCameraExample/pom.xml @@ -41,12 +41,15 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>CordovaCameraExample.mxml</mainClass> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> <!-- Do the Cordova packaging of the javascript application --> @@ -75,12 +78,6 @@ <type>swc</type> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.adobe.air</groupId> - <artifactId>framework</artifactId> - <version>${air.version}</version> - <type>pom</type> - </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/CreateJSExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/CreateJSExample/pom.xml b/examples/flexjs/CreateJSExample/pom.xml index 756389a..531f783 100644 --- a/examples/flexjs/CreateJSExample/pom.xml +++ b/examples/flexjs/CreateJSExample/pom.xml @@ -43,12 +43,19 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>CreateJSExample.mxml</mainClass> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/DataBindingExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataBindingExample/pom.xml b/examples/flexjs/DataBindingExample/pom.xml index 3c88ea5..292e120 100644 --- a/examples/flexjs/DataBindingExample/pom.xml +++ b/examples/flexjs/DataBindingExample/pom.xml @@ -22,6 +22,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> + <!-- + TODO: + JavaScript version: + When changing the radio-button selection errors are logged in the console: + Language.js:74 Uncaught TypeError: Type Coercion failed + org.apache.flex.utils.Language.as @ Language.js:74 + MyInitialView.radioChanged @ MyInitialView.js:307 + MyInitialView.$EH4 @ MyInitialView.js:415 + goog.events.fireListener @ events.js:728 + org.apache.flex.core.HTMLElementWrapper.fireListenerOverride @ HTMLElementWrapper.js:43 + goog.events.handleBrowserEvent_ @ events.js:852 + (anonymous function) @ events.js:277 + --> + <parent> <groupId>org.apache.flex.flexjs.examples</groupId> <artifactId>examples-flexjs</artifactId> @@ -37,13 +51,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>DataBindingExample.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/DataBindingExample_Flat/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataBindingExample_Flat/pom.xml b/examples/flexjs/DataBindingExample_Flat/pom.xml index 38af345..44995c0 100644 --- a/examples/flexjs/DataBindingExample_Flat/pom.xml +++ b/examples/flexjs/DataBindingExample_Flat/pom.xml @@ -43,13 +43,34 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>DataBindingExample.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <!-- + Add the content of the 'Fonts' artifact inside a 'fonts' directory, + making the font definitions available to the JavaScript application. + --> + <overlays> + <overlay> + <id>add-font-resources</id> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>Fonts</artifactId> + <targetPath>fonts</targetPath> + </overlay> + </overlays> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> @@ -74,6 +95,15 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> </dependency> + + <!-- This dependency is needed by the war plugin to add the overlay --> + <dependency> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>Fonts</artifactId> + <version>0.7.0-SNAPSHOT</version> + <type>war</type> + <scope>runtime</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/DataBindingExample_as/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataBindingExample_as/pom.xml b/examples/flexjs/DataBindingExample_as/pom.xml index 81643ae..eeeadc4 100644 --- a/examples/flexjs/DataBindingExample_as/pom.xml +++ b/examples/flexjs/DataBindingExample_as/pom.xml @@ -36,7 +36,14 @@ JS Version: - Checkbox binding doesn't seem to work. Details field is always visible - - RadioButton changes only change the value-output not the title-label. + - When changing the radio-button selection errors are logged in the console: + Language.js:74 Uncaught TypeError: Type Coercion failed + org.apache.flex.utils.Language.as @ Language.js:74 + MyInitialView.radioChanged @ MyInitialView.js:75 + goog.events.fireListener @ events.js:728 + org.apache.flex.core.HTMLElementWrapper.fireListenerOverride @ HTMLElementWrapper.js:43 + goog.events.handleBrowserEvent_ @ events.js:852 + (anonymous function) @ events.js:277 --> <parent> @@ -54,7 +61,6 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>DataBindingExample.as</mainClass> @@ -71,6 +77,14 @@ </defines> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/DataGridExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataGridExample/pom.xml b/examples/flexjs/DataGridExample/pom.xml index d3dd0b5..f9a3449 100644 --- a/examples/flexjs/DataGridExample/pom.xml +++ b/examples/flexjs/DataGridExample/pom.xml @@ -41,12 +41,19 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>DataGridExample.mxml</mainClass> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/DesktopMap/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DesktopMap/pom.xml b/examples/flexjs/DesktopMap/pom.xml index 4989a5a..dc50e20 100644 --- a/examples/flexjs/DesktopMap/pom.xml +++ b/examples/flexjs/DesktopMap/pom.xml @@ -24,6 +24,9 @@ <!-- TODO: + Flash version: + Needs AIR + JavaScript Version: MixinManager.js:46 Uncaught TypeError: Cannot read property 'mixins' of undefined set @ MixinManager.js:46org.apache.flex.core.HTMLElementWrapper.addBead @ HTMLElementWrapper.js:108 @@ -46,13 +49,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>DesktopMap.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> @@ -64,12 +74,6 @@ <type>swc</type> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.adobe.air</groupId> - <artifactId>framework</artifactId> - <version>${air.version}</version> - <type>pom</type> - </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/FlexJSStore/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore/pom.xml b/examples/flexjs/FlexJSStore/pom.xml index e24464b..0a248dc 100644 --- a/examples/flexjs/FlexJSStore/pom.xml +++ b/examples/flexjs/FlexJSStore/pom.xml @@ -50,13 +50,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>FlexJSStore.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/FlexJSStore_jquery/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/pom.xml b/examples/flexjs/FlexJSStore_jquery/pom.xml index 533b1f3..610a369 100644 --- a/examples/flexjs/FlexJSStore_jquery/pom.xml +++ b/examples/flexjs/FlexJSStore_jquery/pom.xml @@ -51,13 +51,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>FlexJSStore.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/FlexWebsiteStatsViewer/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml index 35a11e9..e5fb9f9 100644 --- a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml +++ b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml @@ -22,6 +22,34 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> + <!-- + TODO: + JavaScript version: + When clicking on one of the bars, I get an error in the log: + EventDispatcher.js:48 Uncaught TypeError: Cannot read property 'flexjs_wrapper' of undefined + org.apache.flex.core.UIBase.getElementAt @ UIBase.js:416 + org.apache.flex.html.supportClasses.DataGroup.getItemRendererForIndex @ DataGroup.js:82 + org.apache.flex.html.beads.ListView.selectionChangeHandler @ ListView.js:96 + goog.events.EventTarget.fireListeners @ eventtarget.js:284 + goog.events.EventTarget.dispatchEventInternal_ @ eventtarget.js:381 + goog.events.EventTarget.dispatchEvent @ eventtarget.js:196 + childCtor.base @ base.js:2219org.apache.flex.events.EventDispatcher.dispatchEvent @ EventDispatcher.js:45 + set @ ArraySelectionModel.js:125 + org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController.selectedHandler @ ListSingleSelectionMouseController.js:85 + goog.events.EventTarget.fireListeners @ eventtarget.js:284 + goog.events.EventTarget.dispatchEventInternal_ @ eventtarget.js:381 + goog.events.EventTarget.dispatchEvent @ eventtarget.js:196 + childCtor.base @ base.js:2219 + org.apache.flex.events.EventDispatcher.dispatchEvent @ EventDispatcher.js:45 + childCtor.base @ base.js:2219 + org.apache.flex.core.HTMLElementWrapper.dispatchEvent @ HTMLElementWrapper.js:222 + org.apache.flex.html.beads.controllers.ItemRendererMouseController.handleMouseUp @ ItemRendererMouseController.js:98 + goog.events.fireListener @ events.js:728 + org.apache.flex.core.HTMLElementWrapper.fireListenerOverride @ HTMLElementWrapper.js:45 + goog.events.handleBrowserEvent_ @ events.js:852 + (anonymous function) @ events.js:277 + --> + <parent> <groupId>org.apache.flex.flexjs.examples</groupId> <artifactId>examples-flexjs</artifactId> @@ -37,13 +65,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>FlexWebsiteStatsViewer.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/HelloWorld/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/HelloWorld/pom.xml b/examples/flexjs/HelloWorld/pom.xml index de5dbe8..266d39e 100644 --- a/examples/flexjs/HelloWorld/pom.xml +++ b/examples/flexjs/HelloWorld/pom.xml @@ -37,12 +37,19 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>HelloWorld.mxml</mainClass> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/MapSearch/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MapSearch/pom.xml b/examples/flexjs/MapSearch/pom.xml index 2ca8e04..a5cfca4 100644 --- a/examples/flexjs/MapSearch/pom.xml +++ b/examples/flexjs/MapSearch/pom.xml @@ -24,7 +24,7 @@ <!-- TODO: - No Flash Version built in ANT + No Flash Version built in ANT JavaScript Version: base.js:2189 Uncaught TypeError: Cannot read property 'prototype' of undefined @@ -51,13 +51,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>MapSearch.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> @@ -69,12 +76,6 @@ <type>swc</type> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.adobe.air</groupId> - <artifactId>framework</artifactId> - <version>${air.version}</version> - <type>pom</type> - </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/MobileMap/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileMap/pom.xml b/examples/flexjs/MobileMap/pom.xml index 2df62dc..3ca2c32 100644 --- a/examples/flexjs/MobileMap/pom.xml +++ b/examples/flexjs/MobileMap/pom.xml @@ -43,13 +43,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>MobileMap.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/MobileTrader/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileTrader/pom.xml b/examples/flexjs/MobileTrader/pom.xml index 6ef25d0..6cefad8 100644 --- a/examples/flexjs/MobileTrader/pom.xml +++ b/examples/flexjs/MobileTrader/pom.xml @@ -43,13 +43,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>MobileTrader.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/StorageExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/StorageExample/pom.xml b/examples/flexjs/StorageExample/pom.xml index 00d75a5..e802d1b 100644 --- a/examples/flexjs/StorageExample/pom.xml +++ b/examples/flexjs/StorageExample/pom.xml @@ -47,12 +47,19 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>StorageExample.mxml</mainClass> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> @@ -64,12 +71,6 @@ <type>swc</type> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.adobe.air</groupId> - <artifactId>framework</artifactId> - <version>${air.version}</version> - <type>pom</type> - </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/StyleExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/StyleExample/pom.xml b/examples/flexjs/StyleExample/pom.xml index a1dbb81..a7bd45b 100644 --- a/examples/flexjs/StyleExample/pom.xml +++ b/examples/flexjs/StyleExample/pom.xml @@ -48,13 +48,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>StyleExample.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/TodoListSampleApp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/TodoListSampleApp/pom.xml b/examples/flexjs/TodoListSampleApp/pom.xml index 5d10b88..77a4365 100644 --- a/examples/flexjs/TodoListSampleApp/pom.xml +++ b/examples/flexjs/TodoListSampleApp/pom.xml @@ -43,13 +43,20 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>TodoListSampleApp.mxml</mainClass> <removeCirculars>true</removeCirculars> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/flexjs/TreeExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/TreeExample/pom.xml b/examples/flexjs/TreeExample/pom.xml index fc88637..c3ab179 100644 --- a/examples/flexjs/TreeExample/pom.xml +++ b/examples/flexjs/TreeExample/pom.xml @@ -37,12 +37,19 @@ <plugin> <groupId>org.apache.flex.flexjs.compiler</groupId> <artifactId>flexjs-maven-plugin</artifactId> - <version>0.7.0-SNAPSHOT</version> <extensions>true</extensions> <configuration> <mainClass>TreeExample.mxml</mainClass> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 05eeac1..f1f2a39 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -60,8 +60,71 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>package-javascript</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + </execution> + </executions> + <configuration> + <warSourceDirectory>${basedir}/target/javascript/bin/js-debug</warSourceDirectory> + <failOnMissingWebXml>false</failOnMissingWebXml> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.11</version> + <executions> + <execution> + <id>attach-war</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + </execution> + </executions> + <configuration> + <artifacts> + <artifact> + <file>${basedir}/target/${artifactId}-${version}.war</file> + <type>war</type> + </artifact> + </artifacts> + </configuration> + </plugin> </plugins> </pluginManagement> </build> + <!-- + When doing a release build tell the war plugin to package a different directory. + --> + <profiles> + <profile> + <id>release</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.6</version> + <configuration> + <warSourceDirectory>${basedir}/target/javascript/bin/js-release</warSourceDirectory> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> + </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/95316788/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 05ce6e1..0611fd2 100644 --- a/pom.xml +++ b/pom.xml @@ -119,6 +119,15 @@ </pluginManagement> </build> + <profiles> + <profile> + <id>release</id> + <properties> + <flex.debug>false</flex.debug> + </properties> + </profile> + </profiles> + <repositories> <repository> <id>apache-release</id>
