- Merged stuff that seems to have been lost in previous merges - Removed the clearing of the debug-js and release-js directories - Fixed issues with the cordova build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/52d4f35c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/52d4f35c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/52d4f35c Branch: refs/heads/develop Commit: 52d4f35c1dcf22a9a41f18c9435bed4673a82b54 Parents: 4bac096 Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Tue Nov 8 16:10:44 2016 +0100 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Tue Nov 8 16:10:44 2016 +0100 ---------------------------------------------------------------------- .../flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as | 2 +- examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as | 2 +- examples/flexjs/TeamPage/src/main/flex/models/MemberList.as | 2 +- examples/flexjs/TeamPage/src/main/flex/models/Person.as | 2 +- examples/pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as ---------------------------------------------------------------------- diff --git a/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as b/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as index 6f1e77b..cafb4a9 100644 --- a/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as +++ b/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as @@ -16,7 +16,7 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package main.flex +package { import models.Person; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as ---------------------------------------------------------------------- diff --git a/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as b/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as index 380668d..0a8af0a 100644 --- a/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as +++ b/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as @@ -16,7 +16,7 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package main.flex +package { import org.apache.flex.core.IBeadController; import org.apache.flex.core.IStrand; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as ---------------------------------------------------------------------- diff --git a/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as b/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as index 8fa77dc..1b5c3e7 100644 --- a/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as +++ b/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as @@ -16,7 +16,7 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package main.flex.models +package models { import org.apache.flex.collections.LazyCollection; import org.apache.flex.core.Application; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/flexjs/TeamPage/src/main/flex/models/Person.as ---------------------------------------------------------------------- diff --git a/examples/flexjs/TeamPage/src/main/flex/models/Person.as b/examples/flexjs/TeamPage/src/main/flex/models/Person.as index c513157..36ed24a 100644 --- a/examples/flexjs/TeamPage/src/main/flex/models/Person.as +++ b/examples/flexjs/TeamPage/src/main/flex/models/Person.as @@ -16,7 +16,7 @@ // limitations under the License. // //////////////////////////////////////////////////////////////////////////////// -package main.flex.models +package models { import org.apache.flex.events.Event; import org.apache.flex.events.EventDispatcher; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index ea865fa..3c5398a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -97,11 +97,11 @@ </execution> </executions> <configuration> - <warSourceDirectory>${compiler.output-dir}</warSourceDirectory> + <warSourceDirectory>${basedir}/target/javascript/bin/js-debug</warSourceDirectory> <failOnMissingWebXml>false</failOnMissingWebXml> <webResources> <resource> - <directory>${build.outputDirectory}</directory> + <directory>${compiler.output-dir}</directory> </resource> </webResources> </configuration>