- Added support for Cordova packaging (In order to have this working, you have to enable the "with-cordova" maven profile)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c0007ff9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c0007ff9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c0007ff9 Branch: refs/heads/feature/mdl Commit: c0007ff9d3595097ee5dc8d94b6f3040cf504f3c Parents: afdc5f4 Author: Christofer Dutz <[email protected]> Authored: Sun Oct 23 11:51:00 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Sun Oct 23 11:51:00 2016 +0200 ---------------------------------------------------------------------- examples/flexjs/CordovaCameraExample/pom.xml | 17 +---- .../CordovaCameraExample/resources/config.xml | 44 +++++++++++++ examples/flexjs/MobileMap/pom.xml | 4 ++ examples/flexjs/MobileMap/resources/config.xml | 44 +++++++++++++ examples/flexjs/MobileStocks/pom.xml | 4 ++ .../flexjs/MobileStocks/resources/config.xml | 44 +++++++++++++ examples/flexjs/MobileTrader/pom.xml | 4 ++ .../flexjs/MobileTrader/resources/config.xml | 44 +++++++++++++ examples/flexjs/StorageExample/pom.xml | 4 ++ .../flexjs/StorageExample/resources/config.xml | 44 +++++++++++++ examples/pom.xml | 40 ++++++++++++ src/site/site.xml | 65 ++++++++++++++++++++ 12 files changed, 343 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/CordovaCameraExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/CordovaCameraExample/pom.xml b/examples/flexjs/CordovaCameraExample/pom.xml index dd9bc94..54e0853 100644 --- a/examples/flexjs/CordovaCameraExample/pom.xml +++ b/examples/flexjs/CordovaCameraExample/pom.xml @@ -52,23 +52,10 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> </plugin> - <!-- - Do the Cordova packaging of the javascript application - --> - <!--plugin> + <plugin> <groupId>org.jboss.errai</groupId> <artifactId>cordova-maven-plugin</artifactId> - <version>3.2.4.Final</version> - <executions> - <execution> - <id>build</id> - <phase>package</phase> - <goals> - <goal>build-project</goal> - </goals> - </execution> - </executions> - </plugin--> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/CordovaCameraExample/resources/config.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/CordovaCameraExample/resources/config.xml b/examples/flexjs/CordovaCameraExample/resources/config.xml new file mode 100644 index 0000000..00b9f64 --- /dev/null +++ b/examples/flexjs/CordovaCameraExample/resources/config.xml @@ -0,0 +1,44 @@ +<?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. + +--> +<widget id="${groupId}.${artifactId}" version="${version}" xmlns="http://www.w3.org/ns/widgets"; xmlns:cdv="http://cordova.apache.org/ns/1.0";> + <name>${artifactId}</name> + <description> + ${description} + </description> + <author email="[email protected]" href="http://flex.apache.org";> + Apache Flex Team + </author> + <content src="index.html" /> + <plugin name="cordova-plugin-whitelist" version="1" /> + <access origin="*" /> + <allow-intent href="http://*/*"; /> + <allow-intent href="https://*/*"; /> + <allow-intent href="tel:*" /> + <allow-intent href="sms:*" /> + <allow-intent href="mailto:*"; /> + <allow-intent href="geo:*" /> + <platform name="android"> + <allow-intent href="market:*" /> + </platform> + <platform name="ios"> + <allow-intent href="itms:*" /> + <allow-intent href="itms-apps:*" /> + </platform> +</widget> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/MobileMap/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileMap/pom.xml b/examples/flexjs/MobileMap/pom.xml index 71fa5de..4b7088a 100644 --- a/examples/flexjs/MobileMap/pom.xml +++ b/examples/flexjs/MobileMap/pom.xml @@ -59,6 +59,10 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> </plugin> + <plugin> + <groupId>org.jboss.errai</groupId> + <artifactId>cordova-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/MobileMap/resources/config.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileMap/resources/config.xml b/examples/flexjs/MobileMap/resources/config.xml new file mode 100644 index 0000000..00b9f64 --- /dev/null +++ b/examples/flexjs/MobileMap/resources/config.xml @@ -0,0 +1,44 @@ +<?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. + +--> +<widget id="${groupId}.${artifactId}" version="${version}" xmlns="http://www.w3.org/ns/widgets"; xmlns:cdv="http://cordova.apache.org/ns/1.0";> + <name>${artifactId}</name> + <description> + ${description} + </description> + <author email="[email protected]" href="http://flex.apache.org";> + Apache Flex Team + </author> + <content src="index.html" /> + <plugin name="cordova-plugin-whitelist" version="1" /> + <access origin="*" /> + <allow-intent href="http://*/*"; /> + <allow-intent href="https://*/*"; /> + <allow-intent href="tel:*" /> + <allow-intent href="sms:*" /> + <allow-intent href="mailto:*"; /> + <allow-intent href="geo:*" /> + <platform name="android"> + <allow-intent href="market:*" /> + </platform> + <platform name="ios"> + <allow-intent href="itms:*" /> + <allow-intent href="itms-apps:*" /> + </platform> +</widget> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/MobileStocks/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileStocks/pom.xml b/examples/flexjs/MobileStocks/pom.xml index f34b042..dd9a9f2 100644 --- a/examples/flexjs/MobileStocks/pom.xml +++ b/examples/flexjs/MobileStocks/pom.xml @@ -59,6 +59,10 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> </plugin> + <plugin> + <groupId>org.jboss.errai</groupId> + <artifactId>cordova-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/MobileStocks/resources/config.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileStocks/resources/config.xml b/examples/flexjs/MobileStocks/resources/config.xml new file mode 100644 index 0000000..00b9f64 --- /dev/null +++ b/examples/flexjs/MobileStocks/resources/config.xml @@ -0,0 +1,44 @@ +<?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. + +--> +<widget id="${groupId}.${artifactId}" version="${version}" xmlns="http://www.w3.org/ns/widgets"; xmlns:cdv="http://cordova.apache.org/ns/1.0";> + <name>${artifactId}</name> + <description> + ${description} + </description> + <author email="[email protected]" href="http://flex.apache.org";> + Apache Flex Team + </author> + <content src="index.html" /> + <plugin name="cordova-plugin-whitelist" version="1" /> + <access origin="*" /> + <allow-intent href="http://*/*"; /> + <allow-intent href="https://*/*"; /> + <allow-intent href="tel:*" /> + <allow-intent href="sms:*" /> + <allow-intent href="mailto:*"; /> + <allow-intent href="geo:*" /> + <platform name="android"> + <allow-intent href="market:*" /> + </platform> + <platform name="ios"> + <allow-intent href="itms:*" /> + <allow-intent href="itms-apps:*" /> + </platform> +</widget> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/MobileTrader/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileTrader/pom.xml b/examples/flexjs/MobileTrader/pom.xml index 16a8487..12d0ac6 100644 --- a/examples/flexjs/MobileTrader/pom.xml +++ b/examples/flexjs/MobileTrader/pom.xml @@ -59,6 +59,10 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> </plugin> + <plugin> + <groupId>org.jboss.errai</groupId> + <artifactId>cordova-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/MobileTrader/resources/config.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileTrader/resources/config.xml b/examples/flexjs/MobileTrader/resources/config.xml new file mode 100644 index 0000000..00b9f64 --- /dev/null +++ b/examples/flexjs/MobileTrader/resources/config.xml @@ -0,0 +1,44 @@ +<?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. + +--> +<widget id="${groupId}.${artifactId}" version="${version}" xmlns="http://www.w3.org/ns/widgets"; xmlns:cdv="http://cordova.apache.org/ns/1.0";> + <name>${artifactId}</name> + <description> + ${description} + </description> + <author email="[email protected]" href="http://flex.apache.org";> + Apache Flex Team + </author> + <content src="index.html" /> + <plugin name="cordova-plugin-whitelist" version="1" /> + <access origin="*" /> + <allow-intent href="http://*/*"; /> + <allow-intent href="https://*/*"; /> + <allow-intent href="tel:*" /> + <allow-intent href="sms:*" /> + <allow-intent href="mailto:*"; /> + <allow-intent href="geo:*" /> + <platform name="android"> + <allow-intent href="market:*" /> + </platform> + <platform name="ios"> + <allow-intent href="itms:*" /> + <allow-intent href="itms-apps:*" /> + </platform> +</widget> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/StorageExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/StorageExample/pom.xml b/examples/flexjs/StorageExample/pom.xml index 9f999ce..2c5e6e2 100644 --- a/examples/flexjs/StorageExample/pom.xml +++ b/examples/flexjs/StorageExample/pom.xml @@ -58,6 +58,10 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> </plugin> + <plugin> + <groupId>org.jboss.errai</groupId> + <artifactId>cordova-maven-plugin</artifactId> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/flexjs/StorageExample/resources/config.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/StorageExample/resources/config.xml b/examples/flexjs/StorageExample/resources/config.xml new file mode 100644 index 0000000..00b9f64 --- /dev/null +++ b/examples/flexjs/StorageExample/resources/config.xml @@ -0,0 +1,44 @@ +<?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. + +--> +<widget id="${groupId}.${artifactId}" version="${version}" xmlns="http://www.w3.org/ns/widgets"; xmlns:cdv="http://cordova.apache.org/ns/1.0";> + <name>${artifactId}</name> + <description> + ${description} + </description> + <author email="[email protected]" href="http://flex.apache.org";> + Apache Flex Team + </author> + <content src="index.html" /> + <plugin name="cordova-plugin-whitelist" version="1" /> + <access origin="*" /> + <allow-intent href="http://*/*"; /> + <allow-intent href="https://*/*"; /> + <allow-intent href="tel:*" /> + <allow-intent href="sms:*" /> + <allow-intent href="mailto:*"; /> + <allow-intent href="geo:*" /> + <platform name="android"> + <allow-intent href="market:*" /> + </platform> + <platform name="ios"> + <allow-intent href="itms:*" /> + <allow-intent href="itms-apps:*" /> + </platform> +</widget> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 6c5c156..6f981d4 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -43,6 +43,12 @@ <build> <sourceDirectory>src</sourceDirectory> + <resources> + <resource> + <directory>resources</directory> + <filtering>true</filtering> + </resource> + </resources> <pluginManagement> <plugins> <plugin> @@ -80,6 +86,11 @@ <configuration> <warSourceDirectory>${basedir}/target/javascript/bin/js-debug</warSourceDirectory> <failOnMissingWebXml>false</failOnMissingWebXml> + <webResources> + <resource> + <directory>${build.outputDirectory}</directory> + </resource> + </webResources> </configuration> </plugin> <plugin> @@ -104,6 +115,11 @@ </artifacts> </configuration> </plugin> + <plugin> + <groupId>org.jboss.errai</groupId> + <artifactId>cordova-maven-plugin</artifactId> + <version>4.0.0.Beta2</version> + </plugin> </plugins> </pluginManagement> </build> @@ -129,6 +145,30 @@ </pluginManagement> </build> </profile> + + <profile> + <id>with-cordova</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.errai</groupId> + <artifactId>cordova-maven-plugin</artifactId> + <version>4.0.0.Beta2</version> + <executions> + <execution> + <id>build</id> + <phase>package</phase> + <goals> + <goal>build-project</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> </profiles> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c0007ff9/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..c7e1098 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + 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 name="Maven" xmlns="https://maven.apache.org/xsd/decoration-1.7.0.xsd";> + + <!-- Use the nicer looking fluido skin instead of the default --> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.5</version> + </skin> + + <bannerLeft> + <name>Apache Flex</name> + <src>http://flex.apache.org/images/logo_01_fullcolor-sm.png</src> + <href>http://flex.apache.org/</href> + </bannerLeft> + + <!--bannerRight> + <src>http://maven.apache.org/images/maven-small.gif</src> + </bannerRight--> + + <body> + <links> + <item name="Apache Flex Homepage" href="http://flex.apache.org/"; /> + <!--item name="Apache FlexJS Homepage" href="http://flex.apache.org/"; /--> + <item name="Apache Flex Wiki" href="https://cwiki.apache.org/confluence/display/FLEX/Apache+Flex+Wiki"/> + </links> + + <menu name="FlexJS"> + <item name="Introduction" href="index.html"/> + <!--item name="Download" href="download.html"/> + <item name="Release Notes" href="release-notes.html" /> + <item name="General Information" href="about.html"/--> + </menu> + + <menu name="Howtos"> + <!-- Generated from src/site/asciidoc/build.adoc --> + <item name="Building from Source" href="build.html"/> + <item name="Featurebranch Autobuilds" href="featurebranch-autobuild.html"/> + <item name="Build structure" href="structure.html"/> + </menu> + + <menu ref="reports" /> + <menu ref="parent" /> + <menu ref="modules" /> + + </body> +</project> \ No newline at end of file
