This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new ee5292b BE0013: Update to load jewel modules
ee5292b is described below
commit ee5292b3e3133714f66b5d1998a13cbd1471fcaa
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun Jun 16 21:48:33 2019 +0200
BE0013: Update to load jewel modules
---
..._Apache_Royale_application_with_modules.as3proj | 2 +-
.../{ => JewelModule}/build.xml | 39 ++++++----
.../{ => JewelModule}/pom.xml | 41 ++--------
.../JewelModule/src/main/royale/JewelModule.mxml | 45 +++++++++++
.../{ => MainJewelApp}/build.xml | 28 +++----
.../{ => MainJewelApp}/pom.xml | 50 ++----------
.../resources/jewel-example-index-template.html | 0
.../src/main/royale/MainJewelApp.mxml} | 14 ++--
.../README.txt | 2 +-
.../asconfig.json | 11 +--
.../build.xml | 91 ++++++++++++++--------
.../pom.xml | 43 ++--------
.../src/main/royale/WelcomeSection.mxml | 2 +-
13 files changed, 175 insertions(+), 193 deletions(-)
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/BE0013_Dividing_an_Apache_Royale_application_with_modules.as3proj
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/BE0013_Dividing_an_Apache_Royale_application_with_modules.as3proj
index 965d90a..25442c7 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/BE0013_Dividing_an_Apache_Royale_application_with_modules.as3proj
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/BE0013_Dividing_an_Apache_Royale_application_with_modules.as3proj
@@ -20,7 +20,7 @@
<project>
<output>
<movie disabled="False"/>
- <movie
path="bin-debug/BE0012_Using_external_javascript_libraries_in_Apache_Royale.swf"/>
+ <movie
path="bin-debug/BE0013_Dividing_an_Apache_Royale_application_with_modules.swf"/>
<movie version="11"/>
<movie input=""/>
<movie width="800"/>
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/JewelModule/build.xml
similarity index 54%
copy from
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
copy to
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/JewelModule/build.xml
index 42a4550..bd4dc09 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/JewelModule/build.xml
@@ -19,28 +19,38 @@
-->
-<project name="BE0013_Dividing_an_Apache_Royale_application_with_modules"
default="main" basedir=".">
- <property name="ROYALE_HOME" location="../../.."/>
- <property name="example" value="App" />
+<project name="JewelModule" default="main" basedir=".">
+ <property name="ROYALE_HOME" location="../../../.."/>
+ <property name="example" value="JewelModule" />
<property file="${ROYALE_HOME}/env.properties"/>
<property environment="env"/>
<property file="${ROYALE_HOME}/build.properties"/>
<property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
- <include file="${basedir}/../../build_example.xml" />
+ <include file="${basedir}/../../../build_example.xml" />
<target name="main" depends="clean,build_example.compile"
description="Clean build of ${example}">
- <mkdir dir="${basedir}/bin/js-debug/assets" />
- <copy todir="${basedir}/bin/js-debug/assets" failonerror="false">
- <fileset dir="${basedir}/src/main/resources/assets">
- <include name="**" />
+ <mkdir dir="${basedir}/../MainJewelApp/bin-debug/modules" />
+ <mkdir dir="${basedir}/../MainJewelApp/bin/js-debug/modules" />
+ <mkdir dir="${basedir}/../MainJewelApp/bin/js-release/modules" />
+ <replace file="${basedir}/bin/js-debug/Module__deps.js"
+ token="/JewelModule.js"
+ value="/modules/JewelModule.js" />
+ <copy file="${basedir}/bin-debug/JewelModule.swf"
todir="${basedir}/../MainJewelApp/bin-debug/modules" failonerror="false" />
+ <copy todir="${basedir}/../MainJewelApp/bin/js-debug/modules"
failonerror="false">
+ <fileset dir="${basedir}/bin/js-debug">
+ <include name="*"/>
</fileset>
</copy>
- <mkdir dir="${basedir}/bin/js-release/assets" />
- <copy todir="${basedir}/bin/js-release/assets" failonerror="false">
- <fileset dir="${basedir}/src/main/resources/assets">
- <include name="**" />
+ <copy todir="${basedir}/../MainJewelApp/bin/js-debug/org"
failonerror="false">
+ <fileset dir="${basedir}/bin/js-debug/org">
+ <include name="**/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/../MainJewelApp/bin/js-release/modules"
failonerror="false">
+ <fileset dir="${basedir}/bin/js-release">
+ <include name="**/**"/>
</fileset>
</copy>
</target>
@@ -54,7 +64,10 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
- <echo message="See various team members."/>
+ <echo message="Make sure label appears."/>
+ <exec executable="${browser}" dir="${basedir}/bin-${which}"
failonerror="true">
+ <arg value="${basedir}/bin-${which}/${example}.html"/>
+ </exec>
<exec executable="${browser}" dir="${basedir}/bin/js-${which}"
failonerror="true">
<arg value="${basedir}/bin/js-${which}/index.html"/>
</exec>
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/JewelModule/pom.xml
similarity index 55%
copy from
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
copy to
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/JewelModule/pom.xml
index 5ce04bb..b671c47 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/JewelModule/pom.xml
@@ -17,34 +17,31 @@
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";>
+<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";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.royale.examples</groupId>
- <artifactId>examples-blog</artifactId>
+
<artifactId>BE0013_Dividing_an_Apache_Royale_application_with_modules</artifactId>
<version>0.9.6-SNAPSHOT</version>
</parent>
-
<artifactId>BE0013_Dividing_an_Apache_Royale_application_with_modules</artifactId>
+ <artifactId>JewelModule</artifactId>
<version>0.9.6-SNAPSHOT</version>
<packaging>swf</packaging>
- <name>Apache Royale: Examples: Blog: 0013: Dividing an Apache Royale
application with modules</name>
+ <name>BE0013_Dividing_an_Apache_Royale_application_with_modules:
JewelModule</name>
<build>
- <sourceDirectory>src/main/royale</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
-
<mainClass>BE0013_Dividing_an_Apache_Royale_application_with_modules.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <mainClass>JewelModule.mxml</mainClass>
<debug>false</debug>
-
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
-
<additionalCompilerOptions>-source-map=true;</additionalCompilerOptions>
+
<additionalCompilerOptions>-js-compiler-option=--variable_map_input_file
../../../../../MainJewelApp/target/javascript/bin/js-release/gccvars.txt;-js-compiler-option+=--property_map_input_file
../../../../../MainJewelApp/target/javascript/bin/js-release/gccprops.txt</additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
@@ -53,40 +50,18 @@
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
+ <artifactId>Icons</artifactId>
<version>0.9.6-SNAPSHOT</version>
<type>swc</type>
<classifier>swf</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
+ <artifactId>Icons</artifactId>
<version>0.9.6-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel-Light-NoFlat-Primary-Sunflower-Theme</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <scope>theme</scope>
- <classifier>js</classifier>
- </dependency>
</dependencies>
</project>
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/JewelModule/src/main/royale/JewelModule.mxml
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/JewelModule/src/main/royale/JewelModule.mxml
new file mode 100644
index 0000000..68712fe
--- /dev/null
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/JewelModule/src/main/royale/JewelModule.mxml
@@ -0,0 +1,45 @@
+<?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.
+
+-->
+<j:Module xmlns:fx="http://ns.adobe.com/mxml/2009";
+ xmlns:j="library://ns.apache.org/royale/jewel"
+ xmlns:js="library://ns.apache.org/royale/basic">
+
+ <j:valuesImpl>
+ <js:SimpleCSSValuesImpl/>
+ </j:valuesImpl>
+
+ <j:HGroup gap="3">
+ <j:IconTextInput>
+ <j:beads>
+ <j:TextPrompt prompt="Search..."/>
+ <j:SizeControl size="xlarge"/>
+ </j:beads>
+ <j:icon>
+ <js:FontIcon text="{MaterialIconType.SEARCH}" material="true"/>
+ </j:icon>
+ </j:IconTextInput>
+ <j:Button text="Search" emphasis="secondary">
+ <j:beads>
+ <j:SizeControl size="xlarge"/>
+ </j:beads>
+ </j:Button>
+ </j:HGroup>
+
+</j:Module>
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/build.xml
similarity index 67%
copy from
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
copy to
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/build.xml
index 42a4550..0754b13 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/build.xml
@@ -19,30 +19,19 @@
-->
-<project name="BE0013_Dividing_an_Apache_Royale_application_with_modules"
default="main" basedir=".">
- <property name="ROYALE_HOME" location="../../.."/>
- <property name="example" value="App" />
+<project name="MainJewelApp" default="main" basedir=".">
+ <property name="ROYALE_HOME" location="../../../.."/>
+ <property name="example" value="MainJewelApp" />
<property file="${ROYALE_HOME}/env.properties"/>
<property environment="env"/>
<property file="${ROYALE_HOME}/build.properties"/>
<property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
- <include file="${basedir}/../../build_example.xml" />
-
+ <include file="${basedir}/../../../build_example.xml" />
+
+ <!-- MainJewelApp must be build before JewelModule to generate variable
and property maps -->
<target name="main" depends="clean,build_example.compile"
description="Clean build of ${example}">
- <mkdir dir="${basedir}/bin/js-debug/assets" />
- <copy todir="${basedir}/bin/js-debug/assets" failonerror="false">
- <fileset dir="${basedir}/src/main/resources/assets">
- <include name="**" />
- </fileset>
- </copy>
- <mkdir dir="${basedir}/bin/js-release/assets" />
- <copy todir="${basedir}/bin/js-release/assets" failonerror="false">
- <fileset dir="${basedir}/src/main/resources/assets">
- <include name="**" />
- </fileset>
- </copy>
</target>
<target name="clean">
@@ -54,7 +43,10 @@
<target name="examine" depends="build_example.get.browser">
<property name="which" value="debug" />
- <echo message="See various team members."/>
+ <echo message="Make sure label appears."/>
+ <exec executable="${browser}" dir="${basedir}/bin-${which}"
failonerror="true">
+ <arg value="${basedir}/bin-${which}/${example}.html"/>
+ </exec>
<exec executable="${browser}" dir="${basedir}/bin/js-${which}"
failonerror="true">
<arg value="${basedir}/bin/js-${which}/index.html"/>
</exec>
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/pom.xml
similarity index 50%
copy from
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
copy to
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/pom.xml
index 5ce04bb..c128b36 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/pom.xml
@@ -22,71 +22,31 @@
<parent>
<groupId>org.apache.royale.examples</groupId>
- <artifactId>examples-blog</artifactId>
+
<artifactId>BE0013_Dividing_an_Apache_Royale_application_with_modules</artifactId>
<version>0.9.6-SNAPSHOT</version>
</parent>
-
<artifactId>BE0013_Dividing_an_Apache_Royale_application_with_modules</artifactId>
+ <artifactId>MainJewelApp</artifactId>
<version>0.9.6-SNAPSHOT</version>
<packaging>swf</packaging>
- <name>Apache Royale: Examples: Blog: 0013: Dividing an Apache Royale
application with modules</name>
+ <name>BE0013_Dividing_an_Apache_Royale_application_with_modules:
MainJewelApp</name>
<build>
- <sourceDirectory>src/main/royale</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
-
<mainClass>BE0013_Dividing_an_Apache_Royale_application_with_modules.mxml</mainClass>
+ <mainClass>MainJewelApp.mxml</mainClass>
<targets>${royale.example.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
-
<additionalCompilerOptions>-source-map=true;</additionalCompilerOptions>
+
<additionalCompilerOptions>-source-map=true;-js-compiler-option=--variable_map_output_file
gccvars.txt;-js-compiler-option+=--property_map_output_file
gccprops.txt</additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel-Light-NoFlat-Primary-Sunflower-Theme</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <scope>theme</scope>
- <classifier>js</classifier>
- </dependency>
- </dependencies>
-
</project>
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/src/main/resources/jewel-example-index-template.html
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/src/main/resources/jewel-example-index-template.html
similarity index 100%
rename from
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/src/main/resources/jewel-example-index-template.html
rename to
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/src/main/resources/jewel-example-index-template.html
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/src/main/royale/BE0013_Dividing_an_Apache_Royale_application_with_modules.mxml
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/src/main/royale/MainJewelApp.mxml
similarity index 78%
rename from
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/src/main/royale/BE0013_Dividing_an_Apache_Royale_application_with_modules.mxml
rename to
examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/src/main/royale/MainJewelApp.mxml
index d8b7714..d55fcf1 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/src/main/royale/BE0013_Dividing_an_Apache_Royale_application_with_modules.mxml
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/MainJewelApp/src/main/royale/MainJewelApp.mxml
@@ -20,15 +20,17 @@
<j:Application xmlns:fx="http://ns.adobe.com/mxml/2009";
xmlns:j="library://ns.apache.org/royale/jewel"
xmlns:js="library://ns.apache.org/royale/basic"
- xmlns:html="library://ns.apache.org/royale/html"
- xmlns:mx="library://ns.apache.org/royale/mx">
+ xmlns:html="library://ns.apache.org/royale/html">
<fx:Script>
<![CDATA[
[Bindable]
public var code_txt:String;
-
+ public function loadModule():void
+ {
+
+ }
]]>
</fx:Script>
@@ -43,13 +45,13 @@
</js:beads>
<j:Card percentWidth="90">
- <html:H3 text="Using external Javascript Libraries"/>
+ <html:H3 text="Dividing an Apache Royale application with
modules"/>
<j:Label html="This example uses Modules to load other
application parts"/>
- <mx:ModuleLoader id="moduleLoader" width="100%" height="100%"/>
+ <js:UIModuleLoader modulePath="modules"
moduleName="JewelModule" />
- <j:Button text="highlight Block" emphasis="primary"/>
+ <j:Button text="Load a Module" emphasis="primary"
click="loadModule()"/>
</j:Card>
</j:View>
</j:initialView>
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/README.txt
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/README.txt
index 6e0ea53..5d702f2 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/README.txt
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/README.txt
@@ -19,7 +19,7 @@
DESCRIPTION
-Using external javascript libraries in Apache Royale
+Dividing an Apache Royale application with modules
Learn how to use external Javascript libraries in your Apache Royale
application. This will be very useful to add quick functionality to your
Application adding code that is not part of Apache Royale itself or even was
not written in ActionsScript, but with the powerful capabilities like type
checking or code completion.
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/asconfig.json
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/asconfig.json
index 234cdcb..29f37c6 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/asconfig.json
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/asconfig.json
@@ -23,18 +23,13 @@
"targets": ["JSRoyale"],
"source-map": true,
"html-template":
"src/main/resources/jewel-example-index-template.html",
- "theme":
"${royalelib}/themes/JewelTheme/src/main/resources/defaults.css",
- "library-path": [
- "${royalelib}/js/libs/MXRoyaleJS.swc"
- ],
- "js-library-path": [
- "${royalelib}/js/libs/MXRoyaleJS.swc"
- ]
+ "theme":
"${royalelib}/themes/JewelTheme/src/main/resources/defaults.css"
},
"copySourcePathAssets": true,
"additionalOptions": "-remove-circulars
-js-output-optimization=skipAsCoercions",
"files":
[
-
"src/main/royale/BE0012_Using_external_javascript_libraries_in_Apache_Royale.mxml"
+ "MainJewelApp/src/main/royale/MainJewelApp.mxml",
+ "JewelModule/src/main/royale/JewelModule.mxml"
]
}
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
index 42a4550..e98108f 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/build.xml
@@ -20,44 +20,71 @@
<project name="BE0013_Dividing_an_Apache_Royale_application_with_modules"
default="main" basedir=".">
- <property name="ROYALE_HOME" location="../../.."/>
- <property name="example" value="App" />
-
- <property file="${ROYALE_HOME}/env.properties"/>
- <property environment="env"/>
- <property file="${ROYALE_HOME}/build.properties"/>
- <property name="ROYALE_HOME" value="${ROYALE_HOME}"/>
+ <property name="ROYALE_HOME" location=".."/>
+
+ <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+ <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+ <!-- local.d32 is set/used in build.properties so this needs to be done
first. -->
+ <condition property="local.d32" value="-d32">
+ <and>
+ <os family="mac"/>
+ <matches pattern="1.6.*" string="${java.version}"/>
+ <equals arg1="${sun.arch.data.model}" arg2="64"/>
+ <equals arg1="${os.arch}" arg2="x86_64"/>
+ </and>
+ </condition>
+
+ <!-- Property for the platform. -->
+ <condition property="isMac">
+ <os family="mac"/>
+ </condition>
+ <condition property="isWindows">
+ <os family="windows" />
+ </condition>
+ <condition property="isLinux">
+ <and>
+ <os family="unix"/>
+ <not>
+ <os family="mac"/>
+ </not>
+ </and>
+ </condition>
+
+ <target name="main" depends="check-compile-env,clean,prepare,compile"
+ description="Clean build of all examples"/>
+
+ <target name="check-compile-env" description="Check for the required
environment variables">
+ </target>
- <include file="${basedir}/../../build_example.xml" />
- <target name="main" depends="clean,build_example.compile"
description="Clean build of ${example}">
- <mkdir dir="${basedir}/bin/js-debug/assets" />
- <copy todir="${basedir}/bin/js-debug/assets" failonerror="false">
- <fileset dir="${basedir}/src/main/resources/assets">
- <include name="**" />
- </fileset>
- </copy>
- <mkdir dir="${basedir}/bin/js-release/assets" />
- <copy todir="${basedir}/bin/js-release/assets" failonerror="false">
- <fileset dir="${basedir}/src/main/resources/assets">
- <include name="**" />
- </fileset>
- </copy>
+ <target name="prepare" depends="thirdparty-downloads"/>
+
+ <target name="thirdparty-downloads" unless="no.thirdparty-downloads"
description="Downloads all the required thirdparty code.">
+ <!--<ant antfile="${basedir}/downloads.xml" dir="${basedir}"/>-->
+ </target>
+
+ <target name="compile" description="Compile Examples" >
+ <ant dir="${basedir}/MainJewelApp/" inheritall="false"/>
+ <ant dir="${basedir}/JewelModule" inheritall="false"/>
+ </target>
+
+ <!--
+ Cleanup
+ -->
+
+ <target name="super-clean" depends="thirdparty-clean,clean"
description="Cleans everything including thirdparty downloads."/>
+
+ <target name="thirdparty-clean" unless="no.thirdparty-clean"
description="Removes all thirdparty downloads.">
+ <!--<ant antfile="${basedir}/downloads.xml" target="clean"
dir="${basedir}"/>-->
</target>
- <target name="clean">
- <delete dir="${basedir}/bin" failonerror="false" />
- <delete dir="${basedir}/bin-debug" failonerror="false" />
- <delete dir="${basedir}/bin-release" failonerror="false" />
- <delete dir="${basedir}/target" failonerror="false" />
+ <target name="clean" description="Cleans all SWCs and their resource
bundles">
+ <ant dir="${basedir}/MainJewelApp" target="clean"/>
+ <ant dir="${basedir}/JewelModule" target="clean"/>
</target>
- <target name="examine" depends="build_example.get.browser">
- <property name="which" value="debug" />
- <echo message="See various team members."/>
- <exec executable="${browser}" dir="${basedir}/bin/js-${which}"
failonerror="true">
- <arg value="${basedir}/bin/js-${which}/index.html"/>
- </exec>
+ <target name="examine" description="Cleans all SWCs and their resource
bundles">
+ <ant dir="${basedir}/MainJewelApp" target="examine"/>
</target>
</project>
diff --git
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
index 5ce04bb..28e691b 100644
---
a/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
+++
b/examples/blog/BE0013_Dividing_an_Apache_Royale_application_with_modules/pom.xml
@@ -28,43 +28,16 @@
<artifactId>BE0013_Dividing_an_Apache_Royale_application_with_modules</artifactId>
<version>0.9.6-SNAPSHOT</version>
- <packaging>swf</packaging>
+ <packaging>pom</packaging>
<name>Apache Royale: Examples: Blog: 0013: Dividing an Apache Royale
application with modules</name>
+
+ <modules>
+ <module>MainJewelApp</module>
+ <module>JewelModule</module>
+ </modules>
- <build>
- <sourceDirectory>src/main/royale</sourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.royale.compiler</groupId>
- <artifactId>royale-maven-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
-
<mainClass>BE0013_Dividing_an_Apache_Royale_application_with_modules.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
- <debug>false</debug>
-
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
-
<additionalCompilerOptions>-source-map=true;</additionalCompilerOptions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
- <version>0.9.6-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
+ <dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Jewel</artifactId>
@@ -81,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel-Light-NoFlat-Primary-Sunflower-Theme</artifactId>
+ <artifactId>Jewel-Light-NoFlat-Primary-Red-Theme</artifactId>
<version>0.9.6-SNAPSHOT</version>
<type>swc</type>
<scope>theme</scope>
diff --git a/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
b/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
index 3384519..cfe29bf 100644
--- a/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
+++ b/examples/royale/TourDeJewel/src/main/royale/WelcomeSection.mxml
@@ -40,7 +40,7 @@ limitations under the License.
<j:Image src="assets/apache-royale-logo.svg" height="300"/>
- <html:H1 text="Welcome to Apache Royale Tour de Jewel Component
Explorer v.0.9.4">
+ <html:H1 text="Welcome to Apache Royale Tour de Jewel Component
Explorer v.0.9.6">
<html:beads>
<j:TextAlign align="center"/>
</html:beads>
