Merge branch 'develop' into feature/add_nav_tabbar_bead
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index aac946c..8865f2a 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -24,7 +24,7 @@
<extension>
<groupId>org.apache.flex.utilities.converter</groupId>
<artifactId>flex-sdk-converter-maven-extension</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</extension>
</extensions>
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 0000000..a2fae99
--- /dev/null
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed 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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.2";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if(mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if(mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if(!outputFile.getParentFile().exists()) {
+ if(!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 0000000..e897577
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,19 @@
+# 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.
+
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar
diff --git a/LICENSE b/LICENSE
index 6ef80c3..425caf4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -394,3 +394,10 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+The files:
+.mvn/wrapper/MavenWrapperDownloader.java
+mvnw
+mvnw.cmd
+Are provided from the Github Project: https://github.com/takari/maven-wrapper
+which is distributed under the Apache 2.0 license.
diff --git a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
index 56881c8..538eb97 100644
--- a/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -89,7 +89,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<properties>
<compiler.debug>false</compiler.debug>
</properties>
diff --git a/archetypes/royale-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
index 55b27c7..98797ec 100644
--- a/archetypes/royale-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
@@ -80,7 +80,7 @@
<profiles>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<properties>
<compiler.debug>false</compiler.debug>
</properties>
diff --git a/archetypes/royale-simple-typedef-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-simple-typedef-archetype/src/main/resources/archetype-resources/pom.xml
index 31ee527..31a825e 100644
--- a/archetypes/royale-simple-typedef-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-simple-typedef-archetype/src/main/resources/archetype-resources/pom.xml
@@ -29,10 +29,6 @@
<version>${version}</version>
<packaging>swc</packaging>
- <properties>
- <git.executable>git</git.executable>
- </properties>
-
<build>
<sourceDirectory>src/main/royale</sourceDirectory>
<plugins>
diff --git a/build.xml b/build.xml
index 28044ec..3350f7c 100644
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,7 @@
<property name="debug" value="true"/>
<property name="strict" value="true"/>
- <property name="javac.src" value="1.5"/>
+ <property name="javac.src" value="1.7"/>
<property name="kit.prefix" value="apache-royale-${release.version}"/>
<property name="source.kit" value="${kit.prefix}-src"/>
diff --git a/examples/amf/pom.xml b/examples/amf/pom.xml
index 7880955..3e9497f 100644
--- a/examples/amf/pom.xml
+++ b/examples/amf/pom.xml
@@ -32,53 +32,8 @@
<name>Apache Royale: Examples: AMF Web Apps</name>
- <properties combine.self="override">
-
- </properties>
-
<modules>
<module>SampleAmfWebApp</module>
</modules>
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <resources combine.self="override">
-
- </resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <inherited>false</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
- <configuration combine.self="override">
-
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <!-- Makes it possible to run the example directly by running 'mvn tomcat7:run' -->
- <plugin>
- <inherited>false</inherited>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration combine.self="override">
-
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>release</id>
-
- <properties combine.self="override">
-
- </properties>
- </profile>
- </profiles>
</project>
\ No newline at end of file
diff --git a/examples/blog/BE0001_Hello_World/pom.xml b/examples/blog/BE0001_Hello_World/pom.xml
index 6490b9b..9e2e0d0 100644
--- a/examples/blog/BE0001_Hello_World/pom.xml
+++ b/examples/blog/BE0001_Hello_World/pom.xml
@@ -40,32 +40,12 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0001_Hello_World.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -85,4 +65,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0002_Using_Jewel_Alert_Control/pom.xml b/examples/blog/BE0002_Using_Jewel_Alert_Control/pom.xml
index bcd0b5c..36f0038 100644
--- a/examples/blog/BE0002_Using_Jewel_Alert_Control/pom.xml
+++ b/examples/blog/BE0002_Using_Jewel_Alert_Control/pom.xml
@@ -41,33 +41,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0002_Using_Jewel_Alert_Control.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -102,4 +82,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0003_Using_Jewel_Slider_Control/pom.xml b/examples/blog/BE0003_Using_Jewel_Slider_Control/pom.xml
index 730c384..326261f 100644
--- a/examples/blog/BE0003_Using_Jewel_Slider_Control/pom.xml
+++ b/examples/blog/BE0003_Using_Jewel_Slider_Control/pom.xml
@@ -41,33 +41,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0003_Using_Jewel_Slider_Control.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -102,4 +82,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0004_Adding_an_item_to_a_Jewel_List/pom.xml b/examples/blog/BE0004_Adding_an_item_to_a_Jewel_List/pom.xml
index 3d63e59..a6e4812 100644
--- a/examples/blog/BE0004_Adding_an_item_to_a_Jewel_List/pom.xml
+++ b/examples/blog/BE0004_Adding_an_item_to_a_Jewel_List/pom.xml
@@ -41,40 +41,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0004_Adding_an_item_to_a_Jewel_List.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -101,4 +74,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0005_Creating_a_group_of_Jewel_RadioButtons/pom.xml b/examples/blog/BE0005_Creating_a_group_of_Jewel_RadioButtons/pom.xml
index 8cc81bf..e2d17f9 100644
--- a/examples/blog/BE0005_Creating_a_group_of_Jewel_RadioButtons/pom.xml
+++ b/examples/blog/BE0005_Creating_a_group_of_Jewel_RadioButtons/pom.xml
@@ -41,40 +41,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0005_Creating_a_group_of_Jewel_RadioButtons.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -101,4 +74,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0006_Binding_the_text_property_of_a_Jewel_Textinput_to_update_a_text_label/pom.xml b/examples/blog/BE0006_Binding_the_text_property_of_a_Jewel_Textinput_to_update_a_text_label/pom.xml
index d7234dd..20040af 100644
--- a/examples/blog/BE0006_Binding_the_text_property_of_a_Jewel_Textinput_to_update_a_text_label/pom.xml
+++ b/examples/blog/BE0006_Binding_the_text_property_of_a_Jewel_Textinput_to_update_a_text_label/pom.xml
@@ -41,33 +41,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0006_Binding_the_text_property_of_a_Jewel_Textinput_to_update_a_text_label.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -87,4 +67,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0007_Selecting_options_from_a_group_of_jewel_checkbox_controls/pom.xml b/examples/blog/BE0007_Selecting_options_from_a_group_of_jewel_checkbox_controls/pom.xml
index 9862331..1d13ce0 100644
--- a/examples/blog/BE0007_Selecting_options_from_a_group_of_jewel_checkbox_controls/pom.xml
+++ b/examples/blog/BE0007_Selecting_options_from_a_group_of_jewel_checkbox_controls/pom.xml
@@ -41,40 +41,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0007_Selecting_options_from_a_group_of_jewel_checkbox_controls.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -101,4 +74,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0008_Using_View_States_to_show_or_hide_content/pom.xml b/examples/blog/BE0008_Using_View_States_to_show_or_hide_content/pom.xml
index b7d28d3..c9d0e11 100644
--- a/examples/blog/BE0008_Using_View_States_to_show_or_hide_content/pom.xml
+++ b/examples/blog/BE0008_Using_View_States_to_show_or_hide_content/pom.xml
@@ -41,40 +41,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0008_Using_View_States_to_show_or_hide_content.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -101,4 +74,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0009_Using_an_Item_ Renderer_with_a_List/pom.xml b/examples/blog/BE0009_Using_an_Item_ Renderer_with_a_List/pom.xml
index 6b5bf0a..6d36448 100644
--- a/examples/blog/BE0009_Using_an_Item_ Renderer_with_a_List/pom.xml
+++ b/examples/blog/BE0009_Using_an_Item_ Renderer_with_a_List/pom.xml
@@ -41,47 +41,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0009_Using_an_Item_Renderer_with_a_List.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Icons</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -115,4 +81,33 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Icons</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0010_Customization_through_the_Royale_API/pom.xml b/examples/blog/BE0010_Customization_through_the_Royale_API/pom.xml
index 3ebeeb1..f0974b2 100644
--- a/examples/blog/BE0010_Customization_through_the_Royale_API/pom.xml
+++ b/examples/blog/BE0010_Customization_through_the_Royale_API/pom.xml
@@ -41,33 +41,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0010_Customization_through_the_Royale_API.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -87,4 +67,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0011_Loading_external_data_through_HTTPService/pom.xml b/examples/blog/BE0011_Loading_external_data_through_HTTPService/pom.xml
index e563cdf..b6bc6bd 100644
--- a/examples/blog/BE0011_Loading_external_data_through_HTTPService/pom.xml
+++ b/examples/blog/BE0011_Loading_external_data_through_HTTPService/pom.xml
@@ -41,7 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0011_Loading_external_data_through_HTTPService.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
<additionalCompilerOptions>-source-map=true;-js-dynamic-access-unknown-members=true</additionalCompilerOptions>
@@ -49,33 +49,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -102,4 +75,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/pom.xml b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/pom.xml
index f921579..78cffb7 100644
--- a/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/pom.xml
+++ b/examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale/pom.xml
@@ -41,7 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>BE0012_Using_external_javascript_libraries_in_Apache_Royale.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
<additionalCompilerOptions>-source-map=true;</additionalCompilerOptions>
@@ -49,32 +49,6 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -101,4 +75,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</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 c3f67b5..058d93c 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
@@ -36,33 +36,6 @@
<module>MainJewelApp</module>
<module>JewelModule</module>
</modules>
-
- <profiles>
- <profile>
- <id>swf-dependencies-modules</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Icons</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -89,4 +62,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Icons</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/blog/pom.xml b/examples/blog/pom.xml
index d58b907..7dd4bb7 100644
--- a/examples/blog/pom.xml
+++ b/examples/blog/pom.xml
@@ -79,60 +79,6 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies-blog</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -187,4 +133,54 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/crux/CruxGitHubCommitLogViewer/pom.xml b/examples/crux/CruxGitHubCommitLogViewer/pom.xml
index 34301af..12369d8 100644
--- a/examples/crux/CruxGitHubCommitLogViewer/pom.xml
+++ b/examples/crux/CruxGitHubCommitLogViewer/pom.xml
@@ -40,7 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>CruxGitHubCommitLogViewer.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<additionalCompilerOptions>
-js-default-initializers=true;
@@ -95,95 +95,6 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>generate-swf</id>
- <properties>
- <!-- no point building the swf target yet, there is a bug in mx ObjectUtil somewhere -->
- <royale.example.targets>JSRoyale</royale.example.targets>
- <!--<title>${project.artifactId}</title>
- <bgcolor>#ffffff</bgcolor>
- <useBrowserHistory>--</useBrowserHistory>
- <version_major>11</version_major>
- <version_minor>5</version_minor>
- <version_revision>0</version_revision>
- <expressInstallSwf>expressInstall.swf</expressInstallSwf>
- <application>${project.artifactId}</application>
- <swf>${project.artifactId}</swf>
- <width>100%</width>
- <height>100%</height>-->
- </properties>
- <!-- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <id>copy-template-swf</id>
- <phase>compile</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/swf</outputDirectory>
- <includeEmptyDirs>true</includeEmptyDirs>
- <resources>
- <resource>
- <directory>${basedir}/../../../templates/swfobject</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.coderplus.maven.plugins</groupId>
- <artifactId>copy-rename-maven-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>rename-file</id>
- <phase>compile</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${basedir}/target/swf/index.template.html</sourceFile>
- <destinationFile>${basedir}/target/swf/${project.artifactId}.html</destinationFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>-->
- </profile>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <!--<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>-->
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -209,5 +120,24 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <properties>
+ <!-- no point building the swf target yet, there is a bug in mx ObjectUtil somewhere -->
+ <royale.targets>JSRoyale</royale.targets>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/examples/crux/CruxQuickStart/pom.xml b/examples/crux/CruxQuickStart/pom.xml
index 5d7cee0..9d4d7b3 100644
--- a/examples/crux/CruxQuickStart/pom.xml
+++ b/examples/crux/CruxQuickStart/pom.xml
@@ -40,7 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>CruxQuickStart.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<additionalCompilerOptions>
-js-default-initializers=true;
@@ -54,33 +54,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>generate-swf</id>
- <properties>
- <!-- no point building the swf target -->
- <royale.example.targets>JSRoyale</royale.example.targets>
- </properties>
- </profile>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -99,4 +72,25 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+
+ <properties>
+ <!-- no point building the swf target -->
+ <royale.targets>JSRoyale</royale.targets>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/crux/CruxQuickStartBasic/pom.xml b/examples/crux/CruxQuickStartBasic/pom.xml
index 6b6f84d..7bed503 100644
--- a/examples/crux/CruxQuickStartBasic/pom.xml
+++ b/examples/crux/CruxQuickStartBasic/pom.xml
@@ -31,9 +31,7 @@
<packaging>swf</packaging>
<name>Apache Royale: Examples: CruxQuickStartBasic</name>
-
-
-
+
<build>
<plugins>
<plugin>
@@ -42,7 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>CruxQuickStart.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<additionalCompilerOptions>
-js-default-initializers=true;
@@ -58,87 +56,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>generate-swf</id>
- <properties>
- <title>${project.artifactId}</title>
- <bgcolor>#ffffff</bgcolor>
- <useBrowserHistory>--</useBrowserHistory>
- <version_major>11</version_major>
- <version_minor>5</version_minor>
- <version_revision>0</version_revision>
- <expressInstallSwf>expressInstall.swf</expressInstallSwf>
- <application>${project.artifactId}</application>
- <swf>${project.artifactId}</swf>
- <width>100%</width>
- <height>100%</height>
- </properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <id>copy-template-swf</id>
- <phase>compile</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/swf</outputDirectory>
- <includeEmptyDirs>true</includeEmptyDirs>
- <resources>
- <resource>
- <directory>${basedir}/../../../templates/swfobject</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.coderplus.maven.plugins</groupId>
- <artifactId>copy-rename-maven-plugin</artifactId>
- <version>1.0.1</version>
- <executions>
- <execution>
- <id>rename-file</id>
- <phase>compile</phase>
- <goals>
- <goal>rename</goal>
- </goals>
- <configuration>
- <sourceFile>${basedir}/target/swf/index.template.html</sourceFile>
- <destinationFile>${basedir}/target/swf/${project.artifactId}.html</destinationFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -156,4 +73,78 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <properties>
+ <title>${project.artifactId}</title>
+ <bgcolor>#ffffff</bgcolor>
+ <useBrowserHistory>--</useBrowserHistory>
+ <version_major>11</version_major>
+ <version_minor>5</version_minor>
+ <version_revision>0</version_revision>
+ <expressInstallSwf>expressInstall.swf</expressInstallSwf>
+ <application>${project.artifactId}</application>
+ <swf>${project.artifactId}</swf>
+ <width>100%</width>
+ <height>100%</height>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <id>copy-template-swf</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/swf</outputDirectory>
+ <includeEmptyDirs>true</includeEmptyDirs>
+ <resources>
+ <resource>
+ <directory>${basedir}/../../../templates/swfobject</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.coderplus.maven.plugins</groupId>
+ <artifactId>copy-rename-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ <executions>
+ <execution>
+ <id>rename-file</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>rename</goal>
+ </goals>
+ <configuration>
+ <sourceFile>${basedir}/target/swf/index.template.html</sourceFile>
+ <destinationFile>${basedir}/target/swf/${project.artifactId}.html</destinationFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/crux/pom.xml b/examples/crux/pom.xml
index 1e3b240..a592967 100644
--- a/examples/crux/pom.xml
+++ b/examples/crux/pom.xml
@@ -69,68 +69,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies-crux</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Crux</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -192,4 +130,61 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Crux</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/examples-integrationtests/pom.xml b/examples/examples-integrationtests/pom.xml
index 461a96c..ec159b8 100644
--- a/examples/examples-integrationtests/pom.xml
+++ b/examples/examples-integrationtests/pom.xml
@@ -36,203 +36,198 @@
<tomcat.version>8.5.13</tomcat.version>
</properties>
- <profiles>
- <profile>
- <id>integrationtests</id>
- <activation>
- <property>
- <name>webdriver.gecko.driver</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.19.1</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <build>
+ <plugins>
+ <!-- Make the build run the integration tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.19.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.6.2</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <container>
- <containerId>tomcat8x</containerId>
- <log>${project.build.directory}/tomcat8x/container.log</log>
- <zipUrlInstaller>
- <url>https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip</url>
- <extractDir>${java.io.tmpdir}/cargo/installs</extractDir>
- </zipUrlInstaller>
- <!-- 3 Minutes -->
- <timeout>180000</timeout>
- </container>
- <configuration>
- <type>standalone</type>
- <home>${project.build.directory}/tomcat8x/container</home>
- <properties>
- <cargo.servlet.port>8082</cargo.servlet.port>
- <cargo.servlet.users>admin::manager</cargo.servlet.users>
- </properties>
- </configuration>
- <deployables>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>ASDoc</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>ChartExample</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>CreateJSExample</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>DataBindingExample</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>DataBindingExample_as</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>DataBindingExample_Flat</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>DataGridExample</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>DateControlsExample</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>DesktopMap</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>RoyaleStore</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>RoyaleStore_jquery</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>RoyaleTeamPage_MDL</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>RoyaleWebsiteStatsViewer</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>HelloWorld</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>ListExample</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>MapSearch</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>MobileMap</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>MobileStocks</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>MobileTrader</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>StorageExample</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>StyleExample</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>TeamPage</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>TodoListSampleApp</artifactId>
- <type>war</type>
- </deployable>
- <deployable>
- <groupId>org.apache.royale.examples</groupId>
- <artifactId>TreeExample</artifactId>
- <type>war</type>
- </deployable>
- </deployables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <!--
+ Prior to the integration-test execution, startup a tomcat server serving all the listed applications.
+ After the tests were executed (successful or unsuccessful) make sure the server is stopped again.
+ -->
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.6.2</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <container>
+ <containerId>tomcat8x</containerId>
+ <log>${project.build.directory}/tomcat8x/container.log</log>
+ <zipUrlInstaller>
+ <url>https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip</url>
+ <extractDir>${java.io.tmpdir}/cargo/installs</extractDir>
+ </zipUrlInstaller>
+ <!-- 3 Minutes -->
+ <timeout>180000</timeout>
+ </container>
+ <configuration>
+ <type>standalone</type>
+ <home>${project.build.directory}/tomcat8x/container</home>
+ <properties>
+ <cargo.servlet.port>8082</cargo.servlet.port>
+ <cargo.servlet.users>admin::manager</cargo.servlet.users>
+ </properties>
+ </configuration>
+ <deployables>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>ASDoc</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>ChartExample</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>CreateJSExample</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>DataBindingExample</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>DataBindingExample_as</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>DataBindingExample_Flat</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>DataGridExample</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>DateControlsExample</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>DesktopMap</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>RoyaleStore</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>RoyaleStore_jquery</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>RoyaleTeamPage_MDL</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>RoyaleWebsiteStatsViewer</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>HelloWorld</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>ListExample</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>MapSearch</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>MobileMap</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>MobileStocks</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>MobileTrader</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>StorageExample</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>StyleExample</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>TeamPage</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>TodoListSampleApp</artifactId>
+ <type>war</type>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.royale.examples</groupId>
+ <artifactId>TreeExample</artifactId>
+ <type>war</type>
+ </deployable>
+ </deployables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<!-- Applications we want to deploy -->
diff --git a/examples/express/DataBindingExample/pom.xml b/examples/express/DataBindingExample/pom.xml
index c0e543c..106282e 100644
--- a/examples/express/DataBindingExample/pom.xml
+++ b/examples/express/DataBindingExample/pom.xml
@@ -40,31 +40,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>DataBindingExample.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -76,4 +56,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/express/DataGridExample/pom.xml b/examples/express/DataGridExample/pom.xml
index 90ff214..5ec0f2b 100644
--- a/examples/express/DataGridExample/pom.xml
+++ b/examples/express/DataGridExample/pom.xml
@@ -44,6 +44,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>DataGridExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
diff --git a/examples/express/GitHubCommitLogViewer/pom.xml b/examples/express/GitHubCommitLogViewer/pom.xml
index b5f8c73..a4b11d8 100644
--- a/examples/express/GitHubCommitLogViewer/pom.xml
+++ b/examples/express/GitHubCommitLogViewer/pom.xml
@@ -40,30 +40,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>GitHubCommitLogViewer.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -75,4 +56,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/express/pom.xml b/examples/express/pom.xml
index c16af2f..1565be8 100644
--- a/examples/express/pom.xml
+++ b/examples/express/pom.xml
@@ -17,7 +17,8 @@
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/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ 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>
@@ -69,111 +70,43 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies-express</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Effects</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Express</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Effects</artifactId>
@@ -205,4 +138,68 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Effects</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Express</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/mxroyale/ControlsExample/pom.xml b/examples/mxroyale/ControlsExample/pom.xml
index 7864d3e..498cf2b 100644
--- a/examples/mxroyale/ControlsExample/pom.xml
+++ b/examples/mxroyale/ControlsExample/pom.xml
@@ -40,7 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>ControlsExample.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
</configuration>
</plugin>
diff --git a/examples/mxroyale/HelloWorld/pom.xml b/examples/mxroyale/HelloWorld/pom.xml
index e9f6555..826f60d 100644
--- a/examples/mxroyale/HelloWorld/pom.xml
+++ b/examples/mxroyale/HelloWorld/pom.xml
@@ -40,7 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>HelloWorld.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
</configuration>
</plugin>
diff --git a/examples/mxroyale/RemoteObjectAMFTest/pom.xml b/examples/mxroyale/RemoteObjectAMFTest/pom.xml
index 5eefd35..f1422d2 100644
--- a/examples/mxroyale/RemoteObjectAMFTest/pom.xml
+++ b/examples/mxroyale/RemoteObjectAMFTest/pom.xml
@@ -17,7 +17,8 @@
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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -48,7 +49,7 @@
<configuration>
<mainClass>App.mxml</mainClass>
<!-- <mainClass>App_Jewel.mxml</mainClass> -->
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>true</debug>
<!-- <additionalCompilerOptions>-source-map=true;-js-dynamic-access-unknown-members=true</additionalCompilerOptions> -->
</configuration>
@@ -63,40 +64,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -114,12 +81,41 @@
<classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/mxroyale/SparkHelloWorld/pom.xml b/examples/mxroyale/SparkHelloWorld/pom.xml
index 3e5224f..f6f2928 100644
--- a/examples/mxroyale/SparkHelloWorld/pom.xml
+++ b/examples/mxroyale/SparkHelloWorld/pom.xml
@@ -40,7 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>HelloWorld.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
</configuration>
</plugin>
diff --git a/examples/mxroyale/pom.xml b/examples/mxroyale/pom.xml
index c9e1555..593b106 100644
--- a/examples/mxroyale/pom.xml
+++ b/examples/mxroyale/pom.xml
@@ -17,7 +17,8 @@
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/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ 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>
@@ -70,75 +71,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies-mxroyale</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>SparkRoyale</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -184,18 +116,18 @@
<classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>MXRoyale</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>SparkRoyale</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>SparkRoyale</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
</dependency>
<!-- Import the shared unit-tests we want to run on all examples -->
@@ -207,4 +139,68 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>MXRoyale</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>SparkRoyale</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/pom.xml b/examples/pom.xml
index 929a842..d923f3b 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -51,7 +51,6 @@
<module>amf</module>
<module>crux</module>
<module>examples-tests</module>
- <module>examples-integrationtests</module>
</modules>
<build>
@@ -62,7 +61,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
<executions>
<execution>
<id>copy-resources-debug</id>
@@ -102,19 +100,16 @@
<plugin>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-maven-plugin</artifactId>
- <version>${royale.compiler.version}</version>
<extensions>true</extensions>
- <configuration>
- <targets>${royale.example.targets}</targets>
- </configuration>
</plugin>
<plugin>
<groupId>org.jboss.errai</groupId>
<artifactId>cordova-maven-plugin</artifactId>
- <version>4.0.0.Beta2</version>
+ <version>4.0.0.Beta3</version>
</plugin>
</plugins>
</pluginManagement>
+
<plugins>
<!-- Makes it possible to run the example directly by running 'mvn tomcat7:run' -->
<plugin>
@@ -131,18 +126,24 @@
</build>
<!--
- When doing a release build tell the war plugin to package a different directory.
+ When doing a build for release artifacts, tell the war plugin to package a different directory.
-->
<profiles>
<profile>
- <id>release</id>
-
+ <id>apache-release</id>
<properties>
<compiler.output-dir>${basedir}/target/javascript/bin/js-release</compiler.output-dir>
</properties>
</profile>
<profile>
+ <id>with-ui-testsuite</id>
+ <modules>
+ <module>examples-integrationtests</module>
+ </modules>
+ </profile>
+
+ <profile>
<id>with-cordova</id>
<build>
<pluginManagement>
@@ -150,7 +151,7 @@
<plugin>
<groupId>org.jboss.errai</groupId>
<artifactId>cordova-maven-plugin</artifactId>
- <version>4.0.0.Beta2</version>
+ <version>4.0.0.Beta3</version>
<executions>
<execution>
<id>build</id>
diff --git a/examples/royale/ASDoc/pom.xml b/examples/royale/ASDoc/pom.xml
index 106fc9e..9c2db67 100644
--- a/examples/royale/ASDoc/pom.xml
+++ b/examples/royale/ASDoc/pom.xml
@@ -17,7 +17,8 @@
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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -40,47 +41,14 @@
<extensions>true</extensions>
<configuration>
<mainClass>ASDoc.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>RoyaleSite</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Network</artifactId>
@@ -89,11 +57,11 @@
<classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -109,7 +77,35 @@
<type>swc</type>
<scope>theme</scope>
</dependency>
-
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>RoyaleSite</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/AccordionExample/pom.xml b/examples/royale/AccordionExample/pom.xml
index ce2b8eb..8530a79 100644
--- a/examples/royale/AccordionExample/pom.xml
+++ b/examples/royale/AccordionExample/pom.xml
@@ -46,6 +46,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>AccordionExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<namespaces>
<namespace>
<uri>http://ns.adobe.com/mxml/2009</uri>
@@ -57,26 +58,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -94,4 +75,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/Ace/pom.xml b/examples/royale/Ace/pom.xml
index e515876..fa8cdba 100644
--- a/examples/royale/Ace/pom.xml
+++ b/examples/royale/Ace/pom.xml
@@ -46,54 +46,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>DragDrop</artifactId>
- <version>0.9.2-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Effects</artifactId>
- <version>0.9.2-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Formatters</artifactId>
- <version>0.9.2-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>JQuery</artifactId>
- <version>0.9.2-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.2-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -141,4 +93,47 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>DragDrop</artifactId>
+ <version>0.9.2-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Effects</artifactId>
+ <version>0.9.2-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Formatters</artifactId>
+ <version>0.9.2-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>JQuery</artifactId>
+ <version>0.9.2-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.2-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/AlertExample/pom.xml b/examples/royale/AlertExample/pom.xml
index 352e553..f455dd2 100644
--- a/examples/royale/AlertExample/pom.xml
+++ b/examples/royale/AlertExample/pom.xml
@@ -42,31 +42,12 @@
<extensions>true</extensions>
<configuration>
<mainClass>AlertExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -90,5 +71,27 @@
<scope>theme</scope>
</dependency>
</dependencies>
-
+
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/ChartExample/pom.xml b/examples/royale/ChartExample/pom.xml
index 3155c68..a6563fd 100644
--- a/examples/royale/ChartExample/pom.xml
+++ b/examples/royale/ChartExample/pom.xml
@@ -46,30 +46,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>ChartExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Charts</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -88,4 +69,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Charts</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/CordovaCameraExample/pom.xml b/examples/royale/CordovaCameraExample/pom.xml
index 84374a9..e0ffe4b 100644
--- a/examples/royale/CordovaCameraExample/pom.xml
+++ b/examples/royale/CordovaCameraExample/pom.xml
@@ -40,6 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>CordovaCameraExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
<plugin>
@@ -48,26 +49,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Mobile</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -86,4 +67,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Mobile</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/CreateJSExample/pom.xml b/examples/royale/CreateJSExample/pom.xml
index 2b070fc..5b65763 100644
--- a/examples/royale/CreateJSExample/pom.xml
+++ b/examples/royale/CreateJSExample/pom.xml
@@ -46,30 +46,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>CreateJSExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>CreateJS</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -97,4 +78,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>CreateJS</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DataBindingExample/pom.xml b/examples/royale/DataBindingExample/pom.xml
index 535dd78..c5dbad3 100644
--- a/examples/royale/DataBindingExample/pom.xml
+++ b/examples/royale/DataBindingExample/pom.xml
@@ -40,37 +40,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>DataBindingExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -96,4 +70,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DataBindingExampleWithFlexLayout/pom.xml b/examples/royale/DataBindingExampleWithFlexLayout/pom.xml
index 4a6393b..2879d18 100644
--- a/examples/royale/DataBindingExampleWithFlexLayout/pom.xml
+++ b/examples/royale/DataBindingExampleWithFlexLayout/pom.xml
@@ -40,37 +40,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>DataBindingExampleWithFlexLayout.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -96,4 +70,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DataBindingExample_Flat/pom.xml b/examples/royale/DataBindingExample_Flat/pom.xml
index 8bf8da0..f6ce255 100644
--- a/examples/royale/DataBindingExample_Flat/pom.xml
+++ b/examples/royale/DataBindingExample_Flat/pom.xml
@@ -46,41 +46,6 @@
<war.source.directory>${project.build.directory}/javascript/bin/js-debug</war.source.directory>
</properties>
- <profiles>
- <profile>
- <id>release</id>
-
- <properties>
- <war.source.directory>${project.build.directory}/javascript/bin/js-release</war.source.directory>
- </properties>
- </profile>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Flat</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
<build>
<plugins>
<plugin>
@@ -89,6 +54,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>DataBindingExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
@@ -146,4 +112,33 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <properties>
+ <war.source.directory>${project.build.directory}/javascript/bin/js-release</war.source.directory>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Flat</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DataBindingExample_as/pom.xml b/examples/royale/DataBindingExample_as/pom.xml
index 027a068..fbae6c9 100644
--- a/examples/royale/DataBindingExample_as/pom.xml
+++ b/examples/royale/DataBindingExample_as/pom.xml
@@ -40,6 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>DataBindingExample.as</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
<defines>
<define>
@@ -55,33 +56,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -107,4 +81,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DataGridExample/pom.xml b/examples/royale/DataGridExample/pom.xml
index f1ce47d..e0f3cc5 100644
--- a/examples/royale/DataGridExample/pom.xml
+++ b/examples/royale/DataGridExample/pom.xml
@@ -44,31 +44,12 @@
<extensions>true</extensions>
<configuration>
<mainClass>DataGridExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -86,4 +67,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DateControlsExample/pom.xml b/examples/royale/DateControlsExample/pom.xml
index 83b0436..7d2ef08 100644
--- a/examples/royale/DateControlsExample/pom.xml
+++ b/examples/royale/DateControlsExample/pom.xml
@@ -44,31 +44,12 @@
<extensions>true</extensions>
<configuration>
<mainClass>DateControlsExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Formatters</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -86,4 +67,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Formatters</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DebuggingExample/pom.xml b/examples/royale/DebuggingExample/pom.xml
index 6766e57..935ec75 100644
--- a/examples/royale/DebuggingExample/pom.xml
+++ b/examples/royale/DebuggingExample/pom.xml
@@ -40,37 +40,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>DebuggingExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -94,7 +68,28 @@
<type>swc</type>
<scope>theme</scope>
</dependency>
-
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DesktopMap/pom.xml b/examples/royale/DesktopMap/pom.xml
index 0beda2d..ff390c5 100644
--- a/examples/royale/DesktopMap/pom.xml
+++ b/examples/royale/DesktopMap/pom.xml
@@ -46,32 +46,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>DesktopMap.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>GoogleMaps</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -96,7 +77,21 @@
<type>swc</type>
<scope>theme</scope>
</dependency>
-
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>GoogleMaps</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DividedContainerExample/pom.xml b/examples/royale/DividedContainerExample/pom.xml
index e913dbe..3d45335 100644
--- a/examples/royale/DividedContainerExample/pom.xml
+++ b/examples/royale/DividedContainerExample/pom.xml
@@ -44,30 +44,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>DividedContainerExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -86,4 +67,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/DragAndDropExample/pom.xml b/examples/royale/DragAndDropExample/pom.xml
index 0fa278e..8848cd2 100644
--- a/examples/royale/DragAndDropExample/pom.xml
+++ b/examples/royale/DragAndDropExample/pom.xml
@@ -44,30 +44,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>DragAndDropExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>DragDrop</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -85,4 +66,20 @@
<scope>theme</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>DragDrop</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/FileProxy/pom.xml b/examples/royale/FileProxy/pom.xml
index 155920d..0425925 100644
--- a/examples/royale/FileProxy/pom.xml
+++ b/examples/royale/FileProxy/pom.xml
@@ -39,10 +39,10 @@
<artifactId>royale-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <targets>SWF,JSRoyale</targets>
+ <mainClass>FileProxy.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<removeCirculars>true</removeCirculars>
- <mainClass>FileProxy.mxml</mainClass>
<additionalCompilerOptions>
-js-complex-implicit-coercions=false;
-js-vector-index-checks=false;
@@ -52,36 +52,9 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>${flash.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Basic</artifactId>
<version>0.9.7-SNAPSHOT</version>
@@ -97,4 +70,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/Flex2Royale/pom.xml b/examples/royale/Flex2Royale/pom.xml
index 3b82c84..c292ac0 100644
--- a/examples/royale/Flex2Royale/pom.xml
+++ b/examples/royale/Flex2Royale/pom.xml
@@ -40,37 +40,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>Flex2Royale.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -96,4 +70,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/HTMLElements/pom.xml b/examples/royale/HTMLElements/pom.xml
index 8d2328c..851f0b3 100644
--- a/examples/royale/HTMLElements/pom.xml
+++ b/examples/royale/HTMLElements/pom.xml
@@ -40,30 +40,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>HTMLElements.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -82,4 +63,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/HelloWorld/pom.xml b/examples/royale/HelloWorld/pom.xml
index 9e92f54..87d9f0a 100644
--- a/examples/royale/HelloWorld/pom.xml
+++ b/examples/royale/HelloWorld/pom.xml
@@ -40,6 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>HelloWorld.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<additionalCompilerOptions>
-js-complex-implicit-coercions=false;
-js-vector-index-checks=false;
@@ -50,33 +51,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>${flash.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -94,4 +68,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/JSON2ASVO/pom.xml b/examples/royale/JSON2ASVO/pom.xml
index d3c31a9..2981fed 100644
--- a/examples/royale/JSON2ASVO/pom.xml
+++ b/examples/royale/JSON2ASVO/pom.xml
@@ -46,46 +46,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>JSON2ASVO.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Storage</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -94,7 +61,6 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
-
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Reflection</artifactId>
@@ -102,7 +68,6 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
-
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Basic</artifactId>
@@ -111,12 +76,41 @@
<classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>BasicTheme</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <scope>theme</scope>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>BasicTheme</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <scope>theme</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Storage</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/ListExample/pom.xml b/examples/royale/ListExample/pom.xml
index d40e3cc..5946263 100644
--- a/examples/royale/ListExample/pom.xml
+++ b/examples/royale/ListExample/pom.xml
@@ -44,37 +44,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>ListExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -99,4 +73,27 @@
<scope>theme</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/MapSearch/pom.xml b/examples/royale/MapSearch/pom.xml
index 8177e07..9b9f397 100644
--- a/examples/royale/MapSearch/pom.xml
+++ b/examples/royale/MapSearch/pom.xml
@@ -50,31 +50,12 @@
<extensions>true</extensions>
<configuration>
<mainClass>MapSearch.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>GoogleMaps</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -102,4 +83,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>GoogleMaps</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/MenuExample/pom.xml b/examples/royale/MenuExample/pom.xml
index 1f32a8a..30ad791 100644
--- a/examples/royale/MenuExample/pom.xml
+++ b/examples/royale/MenuExample/pom.xml
@@ -41,30 +41,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>MenuExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -90,4 +71,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/MobileMap/pom.xml b/examples/royale/MobileMap/pom.xml
index b720931..cad0352 100644
--- a/examples/royale/MobileMap/pom.xml
+++ b/examples/royale/MobileMap/pom.xml
@@ -44,6 +44,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>MobileMap.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
@@ -53,33 +54,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Mobile</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>GoogleMaps</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -111,7 +85,28 @@
<type>swc</type>
<scope>theme</scope>
</dependency>
-
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Mobile</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>GoogleMaps</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/MobileStocks/pom.xml b/examples/royale/MobileStocks/pom.xml
index 2314cfd..9632de2 100644
--- a/examples/royale/MobileStocks/pom.xml
+++ b/examples/royale/MobileStocks/pom.xml
@@ -46,6 +46,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>MobileStocks.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
@@ -55,54 +56,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Charts</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Mobile</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Storage</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>XML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -149,4 +102,47 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Charts</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Mobile</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Storage</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>XML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/MobileTrader/pom.xml b/examples/royale/MobileTrader/pom.xml
index 34d3e41..a3f35fd 100644
--- a/examples/royale/MobileTrader/pom.xml
+++ b/examples/royale/MobileTrader/pom.xml
@@ -46,6 +46,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>MobileTrader.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
@@ -55,40 +56,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Charts</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Mobile</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -121,4 +88,33 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Charts</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Mobile</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/ModuleExample/MainApp/pom.xml b/examples/royale/ModuleExample/MainApp/pom.xml
index 24d4d1d..0a02ac3 100644
--- a/examples/royale/ModuleExample/MainApp/pom.xml
+++ b/examples/royale/ModuleExample/MainApp/pom.xml
@@ -40,6 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>MainApp.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<additionalCompilerOptions>-js-compiler-option=--variable_map_output_file gccvars.txt;-js-compiler-option+=--property_map_output_file gccprops.txt</additionalCompilerOptions>
</configuration>
diff --git a/examples/royale/ModuleExample/Module/pom.xml b/examples/royale/ModuleExample/Module/pom.xml
index 51c86a0..5cf9000 100644
--- a/examples/royale/ModuleExample/Module/pom.xml
+++ b/examples/royale/ModuleExample/Module/pom.xml
@@ -40,6 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>Module.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<debug>false</debug>
<additionalCompilerOptions>-js-compiler-option=--variable_map_input_file ../../../../../MainApp/target/javascript/bin/js-release/gccvars.txt;-js-compiler-option+=--property_map_input_file ../../../../../MainApp/target/javascript/bin/js-release/gccprops.txt</additionalCompilerOptions>
</configuration>
diff --git a/examples/royale/ModuleExample/pom.xml b/examples/royale/ModuleExample/pom.xml
index e8108f7..3de183e 100644
--- a/examples/royale/ModuleExample/pom.xml
+++ b/examples/royale/ModuleExample/pom.xml
@@ -70,26 +70,6 @@
</build>
-->
- <profiles>
- <profile>
- <id>swf-dependencies-modules</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -107,4 +87,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/RemoteObjectAMFTest/pom.xml b/examples/royale/RemoteObjectAMFTest/pom.xml
index 06393aa..1b4fdac 100644
--- a/examples/royale/RemoteObjectAMFTest/pom.xml
+++ b/examples/royale/RemoteObjectAMFTest/pom.xml
@@ -53,7 +53,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>App.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<!-- <debug>false</debug> -->
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate>
</configuration>
@@ -68,40 +68,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -142,4 +108,33 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/RemoteObjectAMFTestBasic/pom.xml b/examples/royale/RemoteObjectAMFTestBasic/pom.xml
index 3972121..e822214 100644
--- a/examples/royale/RemoteObjectAMFTestBasic/pom.xml
+++ b/examples/royale/RemoteObjectAMFTestBasic/pom.xml
@@ -47,7 +47,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>App.mxml</mainClass>
- <targets>${royale.example.targets}</targets>
+ <targets>${royale.targets}</targets>
<debug>true</debug>
</configuration>
</plugin>
@@ -61,33 +61,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -106,4 +79,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/RoyaleStore/pom.xml b/examples/royale/RoyaleStore/pom.xml
index 27f5804..b18253b 100644
--- a/examples/royale/RoyaleStore/pom.xml
+++ b/examples/royale/RoyaleStore/pom.xml
@@ -40,6 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>RoyaleStore.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
<namespaces>
<namespace>
@@ -51,47 +52,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>DragDrop</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Effects</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Formatters</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<!--
@@ -145,4 +105,40 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>DragDrop</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Effects</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Formatters</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/RoyaleStore_jquery/pom.xml b/examples/royale/RoyaleStore_jquery/pom.xml
index 50ae9a3..6e513ed 100644
--- a/examples/royale/RoyaleStore_jquery/pom.xml
+++ b/examples/royale/RoyaleStore_jquery/pom.xml
@@ -40,6 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>RoyaleStore.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
<namespaces>
<namespace>
@@ -51,54 +52,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>DragDrop</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Effects</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Formatters</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>JQuery</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -154,4 +107,47 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>DragDrop</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Effects</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Formatters</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>JQuery</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/RoyaleWebsiteStatsViewer/pom.xml b/examples/royale/RoyaleWebsiteStatsViewer/pom.xml
index dd2a0d4..38fae49 100644
--- a/examples/royale/RoyaleWebsiteStatsViewer/pom.xml
+++ b/examples/royale/RoyaleWebsiteStatsViewer/pom.xml
@@ -40,39 +40,13 @@
<extensions>true</extensions>
<configuration>
<mainClass>RoyaleWebsiteStatsViewer.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Charts</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -97,4 +71,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Charts</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/StorageExample/pom.xml b/examples/royale/StorageExample/pom.xml
index dc5f039..9a3076c 100644
--- a/examples/royale/StorageExample/pom.xml
+++ b/examples/royale/StorageExample/pom.xml
@@ -40,6 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>StorageExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
<plugin>
@@ -48,33 +49,6 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Storage</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Mobile</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
@@ -108,4 +82,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Storage</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Mobile</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/StyleExample/pom.xml b/examples/royale/StyleExample/pom.xml
index 5168966..ef42c38 100644
--- a/examples/royale/StyleExample/pom.xml
+++ b/examples/royale/StyleExample/pom.xml
@@ -40,38 +40,12 @@
<extensions>true</extensions>
<configuration>
<mainClass>StyleExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -97,4 +71,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/TableExample/pom.xml b/examples/royale/TableExample/pom.xml
index 8860301..708bc2d 100644
--- a/examples/royale/TableExample/pom.xml
+++ b/examples/royale/TableExample/pom.xml
@@ -44,31 +44,12 @@
<extensions>true</extensions>
<configuration>
<mainClass>TableExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -86,4 +67,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/TeamPage/pom.xml b/examples/royale/TeamPage/pom.xml
index 07c9df5..df4cbe8 100644
--- a/examples/royale/TeamPage/pom.xml
+++ b/examples/royale/TeamPage/pom.xml
@@ -40,6 +40,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>TeamPage.mxml</mainClass>
+ <targets>${royale.targets}</targets>
<removeCirculars>true</removeCirculars>
<!-- Not a config option of royale-maven-plugin -->
<!--flashVersion>20.0</flashVersion-->
@@ -47,33 +48,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -99,4 +73,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/TodoListSampleApp/pom.xml b/examples/royale/TodoListSampleApp/pom.xml
index 9a735ce..e07ac4e 100644
--- a/examples/royale/TodoListSampleApp/pom.xml
+++ b/examples/royale/TodoListSampleApp/pom.xml
@@ -46,31 +46,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>TodoListSampleApp.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
@@ -89,4 +69,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/TourDeJewel/pom.xml b/examples/royale/TourDeJewel/pom.xml
index a7d7b57..68c80c4 100644
--- a/examples/royale/TourDeJewel/pom.xml
+++ b/examples/royale/TourDeJewel/pom.xml
@@ -49,54 +49,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Formatters</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Icons</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -167,4 +119,47 @@
</dependency> -->
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Formatters</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Icons</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/TreeExample/pom.xml b/examples/royale/TreeExample/pom.xml
index 461a929..d9e0f8f 100644
--- a/examples/royale/TreeExample/pom.xml
+++ b/examples/royale/TreeExample/pom.xml
@@ -40,30 +40,11 @@
<extensions>true</extensions>
<configuration>
<mainClass>TreeExample.mxml</mainClass>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -82,4 +63,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/examples/royale/pom.xml b/examples/royale/pom.xml
index bb71405..be37fc5 100644
--- a/examples/royale/pom.xml
+++ b/examples/royale/pom.xml
@@ -108,61 +108,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies-royale</id>
- <activation>
- <property>
- <name>generate.swf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -217,4 +162,54 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/fontsrc/pom.xml b/frameworks/fontsrc/pom.xml
index 6cd2eb8..0459b34 100644
--- a/frameworks/fontsrc/pom.xml
+++ b/frameworks/fontsrc/pom.xml
@@ -41,7 +41,6 @@
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
- <version>1.2.1</version>
<executions>
<!-- Download Flat-UI and unpack it into the target directory -->
<execution>
diff --git a/frameworks/projects/Ace/pom.xml b/frameworks/projects/Ace/pom.xml
index f42a15e..816a20b 100644
--- a/frameworks/projects/Ace/pom.xml
+++ b/frameworks/projects/Ace/pom.xml
@@ -26,11 +26,11 @@
<version>0.9.7-SNAPSHOT</version>
</parent>
- <artifactId>JQuery</artifactId>
+ <artifactId>Ace</artifactId>
<version>0.9.7-SNAPSHOT</version>
<packaging>swc</packaging>
- <name>Apache Royale: Framework: Libs: JQuery</name>
+ <name>Apache Royale: Framework: Libs: Ace</name>
<build>
<sourceDirectory>src/main/royale</sourceDirectory>
@@ -63,34 +63,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -117,4 +89,25 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/frameworks/projects/Basic/pom.xml b/frameworks/projects/Basic/pom.xml
index fe153bd..88586b4 100644
--- a/frameworks/projects/Basic/pom.xml
+++ b/frameworks/projects/Basic/pom.xml
@@ -73,47 +73,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -146,4 +105,40 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridLinesBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridLinesBead.as
index ccac610..6341217 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridLinesBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridLinesBead.as
@@ -32,6 +32,7 @@
import org.apache.royale.graphics.SolidColorStroke;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.html.beads.DataGridView;
import org.apache.royale.html.beads.models.DataGridPresentationModel;
import org.apache.royale.html.supportClasses.DataGridColumn;
@@ -66,8 +67,10 @@
stroke = lineStroke;
}
- private var _strand:IStrand;
+ protected var _strand:IStrand;
+ private var _view:DataGridView;
+
/**
* @copy org.apache.royale.core.UIBase#strand
*
@@ -79,10 +82,12 @@
public function set strand(value:IStrand):void
{
_strand = value;
-
+ var host:UIBase = _strand as UIBase;
+ _view = host.view as DataGridView; // need to get its initComplete handler to run first
+
_overlay = new CompoundGraphic();
- IEventDispatcher(_strand).addEventListener("beadsAdded", handleBeadsAdded);
+ IEventDispatcher(_strand).addEventListener("initComplete", handleInitComplete);
}
private var _stroke:IStroke;
@@ -104,8 +109,8 @@
_stroke = value;
}
- private var _overlay:CompoundGraphic;
- private var _area:UIBase;
+ protected var _overlay:CompoundGraphic;
+ protected var _area:UIBase;
/**
* Invoked when all of the beads have been added to the DataGrid. This
@@ -118,18 +123,11 @@
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- private function handleBeadsAdded(event:Event):void
+ protected function handleInitComplete(event:Event):void
{
var host:UIBase = _strand as UIBase;
- var n:int = host.numElements;
- for (var i:int=0; i < n; i++) {
- var child:UIBase = host.getElementAt(i) as UIBase;
- if (child.id == "dataGridListArea") {
- _area = child;
- _area.addElement(_overlay);
- break;
- }
- }
+ _area = _view.listArea as UIBase;
+ _area.addElement(_overlay);
// Now set up listeners to handle changes in the size of the DataGrid.
IEventDispatcher(_strand).addEventListener("sizeChanged", drawLines);
@@ -143,6 +141,13 @@
IEventDispatcher(model).addEventListener("dataProviderChanged", drawLines);
}
+ protected function getDataProviderLength():int
+ {
+ var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
+ var arrayList:ArrayList = sharedModel.dataProvider as ArrayList;
+ return arrayList.length;
+ }
+
/**
* This event handler is invoked whenever something happens to the DataGrid. This
* function draws the lines either using a default stroke or the one specified by
@@ -153,7 +158,7 @@
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- private function drawLines(event:Event):void
+ protected function drawLines(event:Event):void
{
var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
var presentationModel:DataGridPresentationModel = _strand.getBeadByType(DataGridPresentationModel) as DataGridPresentationModel;
@@ -161,10 +166,9 @@
var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
var columns:Array = sharedModel.columns;
- var arrayList:ArrayList = sharedModel.dataProvider as ArrayList;
var rowHeight:Number = presentationModel.rowHeight;
-
- var totalHeight:Number = arrayList.length * rowHeight;
+ var n:int = getDataProviderLength();
+ var totalHeight:Number = n * rowHeight;
var columnWidth:Number = _area.width / columns.length;
// translate the stroke to a fill since rectangles are used for the grid
@@ -188,8 +192,6 @@
xpos += isNaN(columnWidth) ? _area.width / columns.length : columnWidth;
}
- var n:int = arrayList.length;
-
// draw the horizontals
for (i=1; i < n+1; i++) {
_overlay.drawRect(0, i*rowHeight, _area.width, weight);
diff --git a/frameworks/projects/Binding/pom.xml b/frameworks/projects/Binding/pom.xml
index 64bfc97..8f4f17f 100644
--- a/frameworks/projects/Binding/pom.xml
+++ b/frameworks/projects/Binding/pom.xml
@@ -55,26 +55,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -85,4 +65,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Charts/pom.xml b/frameworks/projects/Charts/pom.xml
index 82c9b79..897db54 100644
--- a/frameworks/projects/Charts/pom.xml
+++ b/frameworks/projects/Charts/pom.xml
@@ -63,54 +63,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -149,4 +101,47 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Collections/pom.xml b/frameworks/projects/Collections/pom.xml
index e544a22..cdc8831 100644
--- a/frameworks/projects/Collections/pom.xml
+++ b/frameworks/projects/Collections/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
<artifactId>projects</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<packaging>swc</packaging>
<name>Apache Royale: Framework: Libs: Collections</name>
@@ -56,49 +56,44 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
+
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Language</artifactId>
<version>0.9.7-SNAPSHOT</version>
<type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Core/pom.xml b/frameworks/projects/Core/pom.xml
index a095475..f1a34d2 100644
--- a/frameworks/projects/Core/pom.xml
+++ b/frameworks/projects/Core/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.framework</groupId>
<artifactId>projects</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
</parent>
<artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.7-SNAPSHOT</version>
<packaging>swc</packaging>
<name>Apache Royale: Framework: Libs: Core</name>
@@ -76,14 +76,22 @@
<artifactId>Language</artifactId>
<version>0.9.7-SNAPSHOT</version>
<type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
<classifier>js</classifier>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/MouseEvent.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/MouseEvent.as
index 9674055..5d93700 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/MouseEvent.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/MouseEvent.as
@@ -507,7 +507,7 @@
public function get localX():Number
{
- return clientX;
+ return wrappedEvent ? wrappedEvent.clientX - wrappedEvent.currentTarget.getBoundingClientRect().left : _localX;
}
private var _localX:Number;
@@ -533,7 +533,7 @@
public function get localY():Number
{
- return clientY;
+ return wrappedEvent ? wrappedEvent.clientY - wrappedEvent.currentTarget.getBoundingClientRect().top : _localY;
}
private var _localY:Number;
diff --git a/frameworks/projects/CreateJS/pom.xml b/frameworks/projects/CreateJS/pom.xml
index 917c20c..f0c1834 100644
--- a/frameworks/projects/CreateJS/pom.xml
+++ b/frameworks/projects/CreateJS/pom.xml
@@ -63,47 +63,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Effects</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -144,4 +103,40 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Effects</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Crux/pom.xml b/frameworks/projects/Crux/pom.xml
index 7dc69c8..4776684 100644
--- a/frameworks/projects/Crux/pom.xml
+++ b/frameworks/projects/Crux/pom.xml
@@ -61,94 +61,7 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
<dependencies>
-
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
- </dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
<artifactId>Core</artifactId>
@@ -165,10 +78,96 @@
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>MXRoyale</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
<artifactId>Language</artifactId>
<version>0.9.7-SNAPSHOT</version>
<type>swc</type>
<classifier>js</classifier>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>MXRoyale</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/DragDrop/pom.xml b/frameworks/projects/DragDrop/pom.xml
index 11a98e6..3c4d78e 100644
--- a/frameworks/projects/DragDrop/pom.xml
+++ b/frameworks/projects/DragDrop/pom.xml
@@ -17,7 +17,8 @@
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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -56,47 +57,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -107,11 +67,11 @@
<classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -129,4 +89,40 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Effects/pom.xml b/frameworks/projects/Effects/pom.xml
index 39d26e3..58dfbcb 100644
--- a/frameworks/projects/Effects/pom.xml
+++ b/frameworks/projects/Effects/pom.xml
@@ -56,33 +56,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -99,7 +72,28 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
-
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Express/pom.xml b/frameworks/projects/Express/pom.xml
index df54516..b44ecd5 100644
--- a/frameworks/projects/Express/pom.xml
+++ b/frameworks/projects/Express/pom.xml
@@ -17,7 +17,8 @@
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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -68,61 +69,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>DragDrop</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -161,12 +107,62 @@
<classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>DragDrop</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>DragDrop</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>DragDrop</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml
index 77abcdd..811076f 100644
--- a/frameworks/projects/Flat/pom.xml
+++ b/frameworks/projects/Flat/pom.xml
@@ -68,54 +68,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -148,4 +100,40 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/FontAwesome/pom.xml b/frameworks/projects/FontAwesome/pom.xml
index b23a248..4b91e98 100644
--- a/frameworks/projects/FontAwesome/pom.xml
+++ b/frameworks/projects/FontAwesome/pom.xml
@@ -69,54 +69,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -155,4 +107,47 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Formatters/pom.xml b/frameworks/projects/Formatters/pom.xml
index 776956d..224723a 100644
--- a/frameworks/projects/Formatters/pom.xml
+++ b/frameworks/projects/Formatters/pom.xml
@@ -57,40 +57,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -108,4 +74,25 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency> </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/GoogleMaps/pom.xml b/frameworks/projects/GoogleMaps/pom.xml
index 0c240d7..30b842b 100644
--- a/frameworks/projects/GoogleMaps/pom.xml
+++ b/frameworks/projects/GoogleMaps/pom.xml
@@ -17,7 +17,8 @@
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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -63,33 +64,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -100,11 +74,11 @@
<classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
@@ -117,4 +91,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Graphics/pom.xml b/frameworks/projects/Graphics/pom.xml
index ef12fcc..ef633f3 100644
--- a/frameworks/projects/Graphics/pom.xml
+++ b/frameworks/projects/Graphics/pom.xml
@@ -117,26 +117,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -147,4 +127,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml
index afcec27..447171c 100644
--- a/frameworks/projects/HTML/pom.xml
+++ b/frameworks/projects/HTML/pom.xml
@@ -67,54 +67,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -154,4 +106,47 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/HTML5/pom.xml b/frameworks/projects/HTML5/pom.xml
index d84bdbe..6b8349f 100644
--- a/frameworks/projects/HTML5/pom.xml
+++ b/frameworks/projects/HTML5/pom.xml
@@ -63,33 +63,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -107,4 +80,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Icons/pom.xml b/frameworks/projects/Icons/pom.xml
index 1c5d963..6d89926 100644
--- a/frameworks/projects/Icons/pom.xml
+++ b/frameworks/projects/Icons/pom.xml
@@ -72,33 +72,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -116,4 +89,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/JQuery/pom.xml b/frameworks/projects/JQuery/pom.xml
index e9d52b9..03cf02f 100644
--- a/frameworks/projects/JQuery/pom.xml
+++ b/frameworks/projects/JQuery/pom.xml
@@ -63,34 +63,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -117,4 +89,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Jewel/pom.xml b/frameworks/projects/Jewel/pom.xml
index a64e50d..67b9313 100644
--- a/frameworks/projects/Jewel/pom.xml
+++ b/frameworks/projects/Jewel/pom.xml
@@ -94,68 +94,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Formatters</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -209,4 +147,61 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Formatters</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/MXRoyale/pom.xml b/frameworks/projects/MXRoyale/pom.xml
index 011f565..9b59b8c 100644
--- a/frameworks/projects/MXRoyale/pom.xml
+++ b/frameworks/projects/MXRoyale/pom.xml
@@ -90,96 +90,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>DragDrop</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Express</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Effects</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Charts</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -267,4 +177,96 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>DragDrop</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Express</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Effects</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Charts</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Network</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>XML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
index a595918..fc84bb2 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
@@ -45,9 +45,17 @@
import mx.collections.IHierarchicalCollectionViewCursor;
import mx.collections.IHierarchicalData;
import mx.collections.IViewCursor;
+ import mx.collections.ISort;
+ import mx.collections.Sort;
+ import mx.collections.SortField;
+ import mx.controls.beads.AdvancedDataGridSortBead;
+ import mx.controls.beads.AdvancedDataGridView;
+ import mx.controls.beads.DataGridLinesBeadForICollectionView;
+ import mx.controls.beads.DataGridColumnResizeBead;
import mx.controls.dataGridClasses.DataGridColumn;
import mx.controls.listClasses.AdvancedListBase;
import mx.core.mx_internal;
+ import mx.events.AdvancedDataGridEvent;
import mx.events.CollectionEvent;
import mx.events.CollectionEventKind;
@@ -56,7 +64,8 @@
import org.apache.royale.core.IDataGridModel;
import org.apache.royale.core.IDataGridPresentationModel;
import org.apache.royale.core.ValuesManager;
- import org.apache.royale.events.Event;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.html.DataGridButtonBar;
use namespace mx_internal;
//--------------------------------------
@@ -643,6 +652,9 @@
false, EventPriority.DEFAULT_HANDLER);
addEventListener(FlexEvent.UPDATE_COMPLETE, updateCompleteHandler); */
+
+ addBead(new DataGridLinesBeadForICollectionView());
+ addBead(new DataGridColumnResizeBead());
}
//--------------------------------------------------------------------------
@@ -9366,6 +9378,10 @@
public function set columns(value:Array):void
{
IDataGridModel(model).columns = value;
+ for each (var col:DataGridColumn in value)
+ {
+ col.owner = this;
+ }
}
//----------------------------------
@@ -9712,6 +9728,34 @@
}
+ override public function addedToParent():void
+ {
+ super.addedToParent();
+
+ addBead(new AdvancedDataGridSortBead());
+ addEventListener(AdvancedDataGridEvent.SORT, sortHandler);
+ }
+
+ protected function sortHandler(event:AdvancedDataGridEvent):void
+ {
+ var oldSort:ISort = collection.sort;
+
+ var sort:Sort = new Sort();
+ var sortField:SortField = new SortField();
+ sortField.name = event.dataField;
+ var column:DataGridColumn = columns[event.columnIndex] as DataGridColumn;
+ if (oldSort && oldSort.fields[0].name == sortField.name)
+ column.sortDescending = !column.sortDescending;
+ sortField.descending = column.sortDescending;
+
+ sort.fields = [ sortField ];
+ collection.sort = sort;
+ collection.refresh();
+ // force redraw of column headers
+ ((view as AdvancedDataGridView).header as DataGridButtonBar).model.dispatchEvent(new Event("dataProviderChanged"));
+ }
+
+
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
index 9c93e0e..d8d2115 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/DataGrid.as
@@ -92,11 +92,15 @@
use namespace mx_internal;
*/
+import mx.controls.dataGridClasses.DataGridColumn;
import mx.controls.listClasses.ListBase;
+import mx.core.mx_internal;
+use namespace mx_internal;
+
import org.apache.royale.core.IBead;
import org.apache.royale.core.IDataGrid;
-import org.apache.royale.core.IDataGridPresentationModel;
import org.apache.royale.core.IDataGridModel;
+import org.apache.royale.core.IDataGridPresentationModel;
import org.apache.royale.core.ValuesManager;
//--------------------------------------
@@ -785,6 +789,10 @@
public function set columns(value:Array):void
{
IDataGridModel(model).columns = value;
+ for each (var col:DataGridColumn in value)
+ {
+ col.owner = this;
+ }
}
/**
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
index 3faccd6..505737f 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
@@ -23,26 +23,16 @@
/* import flash.display.DisplayObject;
import flash.events.Event;
*/
-import org.apache.royale.core.UIBase;
-import org.apache.royale.events.Event;
-
-import mx.controls.AdvancedDataGrid; //BaseEx;
+import mx.controls.AdvancedDataGrid;
import mx.controls.TextInput;
-//import mx.controls.listClasses.IListItemRenderer;
+import mx.controls.dataGridClasses.DataGridColumn;
import mx.core.ClassFactory;
-//import mx.core.ContextualClassFactory;
-//import mx.core.IEmbeddedFontRegistry;
import mx.core.IFactory;
-//import mx.core.IFlexModuleFactory;
-//import mx.core.IIMESupport;
-//import mx.core.Singleton;
import mx.core.mx_internal;
-//import mx.formatters.Formatter;
-//import mx.formatters.IFormatter;
-//import mx.styles.CSSStyleDeclaration;
import mx.utils.StringUtil;
-import mx.controls.dataGridClasses.DataGridColumn;
+import org.apache.royale.core.UIBase;
+import org.apache.royale.events.Event;
use namespace mx_internal;
//--------------------------------------
@@ -295,12 +285,6 @@
//
//--------------------------------------------------------------------------
- /**
- * @private
- * The AdvancedDataGrid that owns this column.
- */
- mx_internal var owner:AdvancedDataGrid; //BaseEx;
-
mx_internal var list:UIBase; //BaseEx;
/**
@@ -1185,7 +1169,7 @@
if (owner)
{
- owner.columnsInvalid();
+ (owner as AdvancedDataGrid).columnsInvalid();
//owner.invalidateProperties();
//owner.invalidateSize();
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSortBead.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSortBead.as
new file mode 100644
index 0000000..5df4061
--- /dev/null
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/AdvancedDataGridSortBead.as
@@ -0,0 +1,69 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package mx.controls.beads
+{
+ import mx.controls.AdvancedDataGrid;
+ import mx.controls.beads.DataGridView;
+ import mx.events.AdvancedDataGridEvent;
+
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.MouseEvent;
+ import org.apache.royale.html.DataGridButtonBar;
+
+ public class AdvancedDataGridSortBead implements IBead
+ {
+ public function AdvancedDataGridSortBead()
+ {
+ super();
+ }
+
+ private var adg:AdvancedDataGrid;
+
+ /**
+ * @copy org.apache.royale.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+ adg = value as AdvancedDataGrid;
+ (adg.view as DataGridView).header.addEventListener(MouseEvent.CLICK, mouseClickHandler, false);
+ }
+
+ /**
+ * @private
+ */
+ private function mouseClickHandler(event:MouseEvent):void
+ {
+ var buttonBar:DataGridButtonBar = ((adg.view as DataGridView).header as DataGridButtonBar);
+ // probably down on one button and up on another button
+ // so the ButtonBar won't change selection
+ if (event.target == buttonBar) return;
+ var adgEvent:AdvancedDataGridEvent = new AdvancedDataGridEvent(AdvancedDataGridEvent.SORT);
+ adgEvent.columnIndex = buttonBar.selectedIndex;
+ adgEvent.dataField = adg.columns[adgEvent.columnIndex].dataField;
+ adg.dispatchEvent(adgEvent);
+ }
+ }
+}
\ No newline at end of file
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridColumnResizeBead.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridColumnResizeBead.as
new file mode 100644
index 0000000..8d45924
--- /dev/null
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridColumnResizeBead.as
@@ -0,0 +1,342 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package mx.controls.beads
+{
+ import mx.collections.ICollectionView;
+ import mx.controls.AdvancedDataGrid;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridColumn;
+ import mx.events.AdvancedDataGridEvent;
+
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IBeadModel;
+ import org.apache.royale.core.IDataGridModel;
+ import org.apache.royale.core.ILayoutHost;
+ import org.apache.royale.core.IParentIUIBase;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.UIBase;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.MouseEvent;
+ import org.apache.royale.graphics.IStroke;
+ import org.apache.royale.graphics.SolidColor;
+ import org.apache.royale.graphics.SolidColorStroke;
+ import org.apache.royale.html.DataGridButtonBar;
+ import org.apache.royale.html.beads.DataGridLinesBead;
+ import org.apache.royale.html.beads.DataGridView;
+ import org.apache.royale.html.beads.models.DataGridPresentationModel;
+ import org.apache.royale.svg.CompoundGraphic;
+
+
+
+ public class DataGridColumnResizeBead implements IBead
+ {
+ public function DataGridColumnResizeBead()
+ {
+ super();
+ // Set default separator line stroke.
+ var lineStroke:SolidColorStroke = new SolidColorStroke();
+ lineStroke.color = 0xFF0000; //0x333333;
+ lineStroke.alpha = 1.0;
+ lineStroke.weight = 3;
+ stroke = lineStroke;
+ }
+
+ protected var _strand:IStrand;
+
+ private var _view:org.apache.royale.html.beads.DataGridView;
+
+ private var adg:AdvancedDataGrid;
+
+ /**
+ * @copy org.apache.royale.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ var host:UIBase = _strand as UIBase;
+ _view = host.view as org.apache.royale.html.beads.DataGridView; // need to get its initComplete handler to run first
+
+ _overlay = new CompoundGraphic();
+
+ IEventDispatcher(_strand).addEventListener("initComplete", handleInitComplete);
+
+ adg = value as AdvancedDataGrid;
+ }
+
+ private var _stroke:IStroke;
+
+ /**
+ * Describes the line style used to separate the rows and columns.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public function get stroke():IStroke
+ {
+ return _stroke;
+ }
+ public function set stroke(value:IStroke):void
+ {
+ _stroke = value;
+ }
+
+ protected var _overlay:CompoundGraphic;
+ protected var _header:UIBase;
+ protected var _dragGraphic:CompoundGraphic;
+
+ /**
+ * Invoked when all of the beads have been added to the DataGrid. This
+ * function seeks the Container that parents the lists that are the DataGrid's
+ * columns. An overlay GraphicContainer is added to this Container so that the
+ * grid lines will scroll with the rows.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ private function handleInitComplete(event:Event):void
+ {
+ var host:UIBase = _strand as UIBase;
+ _header = _view.header as UIBase;
+ _header.addElement(_overlay);
+ _overlay.addEventListener(MouseEvent.MOUSE_OVER, mouseOverHandler, false);
+
+ // Now set up listeners to handle changes in the size of the DataGrid.
+ IEventDispatcher(_strand).addEventListener("sizeChanged", drawLines);
+ IEventDispatcher(_strand).addEventListener("widthChanged", drawLines);
+ IEventDispatcher(_strand).addEventListener("heightChanged", drawLines);
+
+ // Also set up a listener on the model to know when the dataProvider has
+ // changed which might affect the number of rows/columns and thus the
+ // grid lines.
+ var model:IBeadModel = _strand.getBeadByType(IBeadModel) as IBeadModel;
+ IEventDispatcher(model).addEventListener("dataProviderChanged", drawLines);
+ }
+
+
+ /**
+ * This event handler is invoked whenever something happens to the DataGrid. This
+ * function draws the lines either using a default stroke or the one specified by
+ * the stroke property.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ *
+ * @royaleignorecoercion Array
+ * @royaleignorecoercion SVGElement
+ */
+ protected function drawLines(event:Event):void
+ {
+ var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
+ var columns:Array = sharedModel.columns;
+ var totalHeight:Number = _header.height;
+
+ // translate the stroke to a fill since rectangles are used for the grid
+ // lines and not lines.
+ var lineFill:SolidColor = new SolidColor();
+ var weight:Number = 1;
+ lineFill.color = (stroke as SolidColorStroke).color;
+ lineFill.alpha = 0; //(stroke as SolidColorStroke).alpha; // invisible overlay over each column boundary
+ weight = (stroke as SolidColorStroke).weight;
+ _overlay.fill = lineFill;
+ COMPILE::JS
+ {
+ _overlay.element.style.position = "absolute";
+ _overlay.element.style.pointerEvents = "none";
+ }
+
+ var xpos:Number = 0;
+
+ _overlay.clear();
+
+ var firstOne:Boolean = true;
+ // draw the verticals
+ for (var i:int=0; i < columns.length - 1; i++) {
+ var column:AdvancedDataGridColumn = columns[i] as AdvancedDataGridColumn;
+ if (column.visible)
+ {
+ // if a column is visible, don't draw a resize target unless
+ // there is a column to its right that is visible
+ if (firstOne)
+ firstOne = false;
+ else
+ _overlay.drawRect(xpos - (weight / 2), 0, weight, totalHeight);
+ xpos += column.columnWidth;
+ }
+ }
+ COMPILE::JS
+ {
+ var rects:Array = _overlay.element.childNodes as Array;
+ var n:int = rects.length;
+ for (i = 0; i < n; i++)
+ {
+ var e:SVGElement = rects[i] as SVGElement;
+ e.style.pointerEvents = "auto";
+ }
+ }
+
+ /*
+ // draw the horizontals
+ for (i=1; i < n+1; i++) {
+ _overlay.drawRect(0, i*rowHeight, _area.width, weight);
+ }
+ */
+ }
+
+ private var columnIndex:int;
+
+ /**
+ * @private
+ */
+ private function mouseOverHandler(event:MouseEvent):void
+ {
+ var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
+ var columns:Array = sharedModel.columns;
+ var totalHeight:Number = _header.height;
+
+ _overlay.addEventListener(MouseEvent.MOUSE_OUT, mouseOutHandler, false);
+ _overlay.addEventListener(MouseEvent.MOUSE_DOWN, mouseDownHandler, false);
+
+ // translate the stroke to a fill since rectangles are used for the grid
+ // lines and not lines.
+ var lineFill:SolidColor = new SolidColor();
+ var weight:Number = 1;
+ lineFill.color = (stroke as SolidColorStroke).color;
+ lineFill.alpha = (stroke as SolidColorStroke).alpha;
+ weight = (stroke as SolidColorStroke).weight;
+
+ var xpos:Number = 0;
+
+ columnIndex = -1;
+ for (var i:int=0; i < columns.length - 1; i++) {
+ var column:AdvancedDataGridColumn = columns[i] as AdvancedDataGridColumn;
+ if (column.visible)
+ {
+ xpos += column.columnWidth;
+ }
+ else
+ continue;
+ var left:Number = xpos - (weight / 2);
+ var right:Number = left + weight;
+ if (left < event.localX && event.localX < right)
+ {
+ columnIndex = i;
+ break;
+ }
+ }
+ if (columnIndex == -1)
+ return;
+
+ _dragGraphic = new CompoundGraphic();
+ _header.addElement(_dragGraphic);
+ _dragGraphic.fill = lineFill;
+ COMPILE::JS
+ {
+ _dragGraphic.element.style.position = "absolute";
+ _dragGraphic.element.style.pointerEvents = "none";
+ }
+ _dragGraphic.clear();
+ _dragGraphic.drawRect(weight / 2, 0, weight, totalHeight);
+ _dragGraphic.drawRect(0, (totalHeight / 2) - (weight / 2),
+ weight * 2, weight);
+
+ _dragGraphic.x = xpos - weight;
+ }
+
+ /**
+ * @private
+ */
+ private function mouseOutHandler(event:MouseEvent):void
+ {
+ if (_dragGraphic)
+ {
+ _header.removeElement(_dragGraphic);
+ _dragGraphic = null;
+ }
+ _overlay.removeEventListener(MouseEvent.MOUSE_OUT, mouseOutHandler, false);
+ _overlay.removeEventListener(MouseEvent.MOUSE_DOWN, mouseDownHandler, false);
+ }
+
+ private var lastX:Number = -1;
+ private var startX:Number;
+
+ /**
+ * @private
+ */
+ private function mouseDownHandler(event:MouseEvent):void
+ {
+ _overlay.removeEventListener(MouseEvent.MOUSE_OUT, mouseOutHandler, false);
+ _header.addEventListener(MouseEvent.MOUSE_UP, mouseUpHandler, false);
+ _header.addEventListener(MouseEvent.MOUSE_MOVE, mouseMoveHandler, false);
+ startX = lastX = event.localX;
+ }
+
+ /**
+ * @private
+ */
+ private function mouseMoveHandler(event:MouseEvent):void
+ {
+ if (!_dragGraphic) return;
+ var deltaX:Number = event.localX - lastX;
+ lastX = event.localX;
+ _dragGraphic.x += deltaX;
+ }
+
+ /**
+ * @private
+ */
+ private function mouseUpHandler(event:MouseEvent):void
+ {
+ if (_dragGraphic)
+ {
+ _header.removeElement(_dragGraphic);
+ _dragGraphic = null;
+ }
+ _header.removeEventListener(MouseEvent.MOUSE_UP, mouseUpHandler, false);
+ _header.removeEventListener(MouseEvent.MOUSE_MOVE, mouseMoveHandler, false);
+
+ var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
+ var columns:Array = sharedModel.columns;
+ var oldWidth:Number = columns[columnIndex].columnWidth;
+ var deltaWidth:Number = lastX - startX;
+ // set column.width to column.columnWidth. The DG may scale
+ // columns to fit.
+ for (var i:int = 0; i < columns.length; i++)
+ {
+ columns[i].width = columns[i].columnWidth;
+ }
+ columns[columnIndex].width += deltaWidth;
+ columns[columnIndex].columnWidth += deltaWidth;
+ columns[columnIndex + 1].columnWidth -= deltaWidth;
+ columns[columnIndex + 1].width -= deltaWidth;
+ adg.dispatchEvent(new Event("layoutNeeded"));
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridLinesBeadForICollectionView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridLinesBeadForICollectionView.as
new file mode 100644
index 0000000..af8f51f
--- /dev/null
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/DataGridLinesBeadForICollectionView.as
@@ -0,0 +1,115 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.
+//
+////////////////////////////////////////////////////////////////////////////////
+package mx.controls.beads
+{
+ import mx.collections.ICollectionView;
+
+ import org.apache.royale.core.IBeadModel;
+ import org.apache.royale.core.IDataGridModel;
+ import org.apache.royale.core.ILayoutHost;
+ import org.apache.royale.core.IParentIUIBase;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.graphics.SolidColor;
+ import org.apache.royale.graphics.SolidColorStroke;
+ import org.apache.royale.html.beads.DataGridLinesBead;
+ import org.apache.royale.html.beads.models.DataGridPresentationModel;
+ import mx.controls.advancedDataGridClasses.AdvancedDataGridColumn;
+
+ public class DataGridLinesBeadForICollectionView extends DataGridLinesBead
+ {
+ public function DataGridLinesBeadForICollectionView()
+ {
+ super();
+ }
+
+ override protected function handleInitComplete(event:Event):void
+ {
+ super.handleInitComplete(event);
+ // column resizing
+ IEventDispatcher(_strand).addEventListener("layoutNeeded", drawLines);
+ }
+
+
+ override protected function getDataProviderLength():int
+ {
+ var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
+ var arrayList:ICollectionView = sharedModel.dataProvider as ICollectionView;
+ return arrayList ? arrayList.length : 0;
+ }
+
+ /**
+ * This event handler is invoked whenever something happens to the DataGrid. This
+ * function draws the lines either using a default stroke or the one specified by
+ * the stroke property.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ override protected function drawLines(event:Event):void
+ {
+ var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;
+ var presentationModel:DataGridPresentationModel = _strand.getBeadByType(DataGridPresentationModel) as DataGridPresentationModel;
+ var layoutParent:ILayoutHost = _area.getBeadByType(ILayoutHost) as ILayoutHost;
+ var contentView:IParentIUIBase = layoutParent.contentView as IParentIUIBase;
+
+ var columns:Array = sharedModel.columns;
+ var rowHeight:Number = presentationModel.rowHeight;
+ var n:int = getDataProviderLength();
+ var totalHeight:Number = n * rowHeight;
+
+ // translate the stroke to a fill since rectangles are used for the grid
+ // lines and not lines.
+ var lineFill:SolidColor = new SolidColor();
+ var weight:Number = 1;
+ lineFill.color = (stroke as SolidColorStroke).color;
+ lineFill.alpha = (stroke as SolidColorStroke).alpha;
+ weight = (stroke as SolidColorStroke).weight;
+ _overlay.fill = lineFill;
+ COMPILE::JS
+ {
+ _overlay.element.style.position = "absolute";
+ }
+
+ var xpos:Number = 0;
+
+ _overlay.clear();
+
+ // draw the verticals
+ for (var i:int=0; i < columns.length - 1; i++) {
+ var column:AdvancedDataGridColumn = columns[i] as AdvancedDataGridColumn;
+ if (column.visible)
+ {
+ xpos += column.columnWidth;
+ _overlay.drawRect(xpos - 1, 0, weight, totalHeight);
+ }
+ }
+
+ /*
+ // draw the horizontals
+ for (i=1; i < n+1; i++) {
+ _overlay.drawRect(0, i*rowHeight, _area.width, weight);
+ }
+ */
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/buttonBarClasses/TextButtonDataGridColumnItemRenderer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/buttonBarClasses/TextButtonDataGridColumnItemRenderer.as
index 9e0652e..810e53c 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/buttonBarClasses/TextButtonDataGridColumnItemRenderer.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/buttonBarClasses/TextButtonDataGridColumnItemRenderer.as
@@ -19,8 +19,13 @@
package mx.controls.buttonBarClasses
{
+import mx.core.UIComponent;
+import mx.core.mx_internal;
+use namespace mx_internal;
+import org.apache.royale.html.beads.DataGridView;
import mx.controls.dataGridClasses.DataGridColumn;
+import org.apache.royale.html.DataGridButtonBar;
import org.apache.royale.html.supportClasses.TextButtonItemRenderer;
/**
@@ -36,7 +41,17 @@
{
override protected function updateButtonLabelFromData():void
{
- text = data ? (data as DataGridColumn).headerText : "";
+ var s:String = data ? (data as DataGridColumn).headerText : "";
+ if (data)
+ {
+ var column:DataGridColumn = data as DataGridColumn;
+ var dg:UIComponent = column.owner;
+ if (index == ((dg.view as DataGridView).header as DataGridButtonBar).selectedIndex)
+ {
+ s += " " + (column.sortDescending ? "â–¼" : "â–²");
+ }
+ }
+ text = s;
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
index fbee89e..e6bd987 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridColumn.as
@@ -34,12 +34,14 @@
import mx.core.IFlexModuleFactory;
import mx.core.IIMESupport;
import mx.core.Singleton;
-import mx.core.mx_internal;
import mx.styles.StyleManager;
import mx.utils.StringUtil;
-use namespace mx_internal;
*/
+import mx.core.UIComponent;
+import mx.core.mx_internal;
+use namespace mx_internal;
+
import org.apache.royale.html.supportClasses.DataGridColumn;
//--------------------------------------
@@ -395,6 +397,9 @@
_width = value;
}
+ public var sortDescending:Boolean = false;
+
+ mx_internal var owner:UIComponent;
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
index 189ef4c..0c929d7 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
@@ -87,6 +87,9 @@
import org.apache.royale.events.MouseEvent;
import mx.events.ListEvent;
import mx.collections.ICollectionView;
+import mx.collections.Sort;
+import mx.collections.SortField;
+import mx.controls.dataGridClasses.DataGridColumn;
import mx.core.IFactory;
import mx.core.UIComponent;
import mx.core.ScrollControlBase;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/AdvancedDataGridEvent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/AdvancedDataGridEvent.as
index 5e8b946..999f6b5 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/AdvancedDataGridEvent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/AdvancedDataGridEvent.as
@@ -720,7 +720,7 @@
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
- //public static const SORT:String = "sort";
+ public static const SORT:String = "sort";
//--------------------------------------------------------------------------
//
diff --git a/frameworks/projects/MaterialDesignLite/pom.xml b/frameworks/projects/MaterialDesignLite/pom.xml
index f5cac45..d4e2e6d 100644
--- a/frameworks/projects/MaterialDesignLite/pom.xml
+++ b/frameworks/projects/MaterialDesignLite/pom.xml
@@ -68,61 +68,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Binding</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Collections</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -169,4 +114,54 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Collections</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Mobile/pom.xml b/frameworks/projects/Mobile/pom.xml
index 46a3670..a9f9b8d 100644
--- a/frameworks/projects/Mobile/pom.xml
+++ b/frameworks/projects/Mobile/pom.xml
@@ -66,40 +66,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Graphics</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -125,4 +91,33 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Graphics</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Network/pom.xml b/frameworks/projects/Network/pom.xml
index 0c6c752..5795a25 100644
--- a/frameworks/projects/Network/pom.xml
+++ b/frameworks/projects/Network/pom.xml
@@ -64,33 +64,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -106,7 +79,28 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
-
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Reflection/pom.xml b/frameworks/projects/Reflection/pom.xml
index 8ebf4b3..66aaea3 100644
--- a/frameworks/projects/Reflection/pom.xml
+++ b/frameworks/projects/Reflection/pom.xml
@@ -57,33 +57,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -101,4 +74,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/RoyaleSite/pom.xml b/frameworks/projects/RoyaleSite/pom.xml
index 9459693..e4f5426 100644
--- a/frameworks/projects/RoyaleSite/pom.xml
+++ b/frameworks/projects/RoyaleSite/pom.xml
@@ -59,40 +59,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -118,4 +84,33 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/RoyaleUnit/pom.xml b/frameworks/projects/RoyaleUnit/pom.xml
index f0754f0..955d6a0 100644
--- a/frameworks/projects/RoyaleUnit/pom.xml
+++ b/frameworks/projects/RoyaleUnit/pom.xml
@@ -49,40 +49,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -107,4 +73,33 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/SparkRoyale/pom.xml b/frameworks/projects/SparkRoyale/pom.xml
index 5b3f5e4..9cdd9d6 100644
--- a/frameworks/projects/SparkRoyale/pom.xml
+++ b/frameworks/projects/SparkRoyale/pom.xml
@@ -70,54 +70,6 @@
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Basic</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>MXRoyale</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Text</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>TLF</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
@@ -157,4 +109,47 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>MXRoyale</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Text</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>TLF</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Storage/pom.xml b/frameworks/projects/Storage/pom.xml
index 7451af1..e532c40 100644
--- a/frameworks/projects/Storage/pom.xml
+++ b/frameworks/projects/Storage/pom.xml
@@ -62,26 +62,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -102,4 +82,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/TLF/pom.xml b/frameworks/projects/TLF/pom.xml
index 8470554..e93dbfc 100644
--- a/frameworks/projects/TLF/pom.xml
+++ b/frameworks/projects/TLF/pom.xml
@@ -17,7 +17,8 @@
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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -64,7 +65,8 @@
<allowSubclassOverrides>true</allowSubclassOverrides>
<skipAS>${royale.skipAS}</skipAS>
<skipExtern>true</skipExtern>
- <additionalCompilerOptions>${project.compiler.options};-js-vector-emulation-class=Array</additionalCompilerOptions>
+ <additionalCompilerOptions>${project.compiler.options};-js-vector-emulation-class=Array
+ </additionalCompilerOptions>
<defines>
<define>
<name>CONFIG::debug</name>
@@ -79,40 +81,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Text</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -123,19 +91,48 @@
<classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Reflection</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
</dependency>
<dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>XML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>js</classifier>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>XML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Text</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Reflection</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>XML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/Text/pom.xml b/frameworks/projects/Text/pom.xml
index 8a2791f..e9f4f87 100644
--- a/frameworks/projects/Text/pom.xml
+++ b/frameworks/projects/Text/pom.xml
@@ -69,33 +69,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -106,4 +79,19 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/XML/pom.xml b/frameworks/projects/XML/pom.xml
index cc50b01..ebade11 100644
--- a/frameworks/projects/XML/pom.xml
+++ b/frameworks/projects/XML/pom.xml
@@ -57,33 +57,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.royale.framework</groupId>
@@ -101,4 +74,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml
index 1681c27..7090865 100644
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@ -37,39 +37,40 @@
<name>Apache Royale: Framework: Libs</name>
<modules>
+ <!--module>Ace</module-->
+ <module>Basic</module>
<module>Binding</module>
<module>Charts</module>
<module>Collections</module>
<module>Core</module>
- <module>Crux</module>
- <module>Basic</module>
<module>CreateJS</module>
+ <module>Crux</module>
<module>DragDrop</module>
<module>Effects</module>
<module>Express</module>
<module>Flat</module>
- <module>Formatters</module>
<module>FontAwesome</module>
+ <module>Formatters</module>
<module>GoogleMaps</module>
<module>Graphics</module>
<module>HTML</module>
<module>HTML5</module>
+ <module>Icons</module>
+ <module>Jewel</module>
<module>JQuery</module>
<module>Language</module>
<module>MaterialDesignLite</module>
<module>Mobile</module>
- <module>Reflection</module>
+ <module>MXRoyale</module>
<module>Network</module>
+ <module>Reflection</module>
+ <module>RoyaleSite</module>
+ <module>RoyaleUnit</module>
+ <module>SparkRoyale</module>
<module>Storage</module>
- <module>XML</module>
<module>Text</module>
<module>TLF</module>
- <module>RoyaleSite</module>
- <module>MXRoyale</module>
- <module>Icons</module>
- <module>SparkRoyale</module>
- <module>Jewel</module>
- <module>RoyaleUnit</module>
+ <module>XML</module>
</modules>
<build>
@@ -77,11 +78,11 @@
<plugin>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-maven-plugin</artifactId>
- <version>${royale.compiler.version}</version>
<configuration>
<!-- We don't want dependencies to be linked into the resulting libraries -->
<forceSwcExternalLibraryPath>true</forceSwcExternalLibraryPath>
<additionalCompilerOptions>${project.compiler.options}</additionalCompilerOptions>
+ <targets>${royale.targets}</targets>
</configuration>
</plugin>
</plugins>
diff --git a/frameworks/themes/JewelTheme/pom.xml b/frameworks/themes/JewelTheme/pom.xml
index 2d82cae..2d0e714 100644
--- a/frameworks/themes/JewelTheme/pom.xml
+++ b/frameworks/themes/JewelTheme/pom.xml
@@ -98,40 +98,6 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>swf-dependencies</id>
- <activation>
- <property>
- <name>generate.swf.swcs</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>${flash.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.royale.framework</groupId>
- <artifactId>Jewel</artifactId>
- <version>0.9.7-SNAPSHOT</version>
- <type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
<dependencies>
<dependency>
@@ -150,4 +116,26 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>option-with-swf</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Language</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Jewel</artifactId>
+ <version>0.9.7-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
</project>
diff --git a/frameworks/themes/pom.xml b/frameworks/themes/pom.xml
index cb84e46..54d3930 100644
--- a/frameworks/themes/pom.xml
+++ b/frameworks/themes/pom.xml
@@ -17,7 +17,8 @@
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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -35,88 +36,88 @@
<modules>
<module>Basic</module>
<module>MDL</module>
- <module>MXRoyale</module>
+ <module>MXRoyale</module>
<module>JewelTheme</module>
-
- <module>Jewel-Light-NoFlat-Primary-Amethyst-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Blue-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Emerald-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Green-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Orange-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Red-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Sapphire-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Sunflower-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Topaz-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Turquoise-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Violet-Theme</module>
- <module>Jewel-Light-NoFlat-Primary-Yellow-Theme</module>
-
- <module>Jewel-Light-NoFlat-Secondary-Amethyst-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Blue-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Emerald-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Green-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Orange-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Red-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Sapphire-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Sunflower-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Topaz-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Turquoise-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Violet-Theme</module>
- <module>Jewel-Light-NoFlat-Secondary-Yellow-Theme</module>
-
- <module>Jewel-Light-NoFlat-Emphasized-Amethyst-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Blue-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Emerald-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Green-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Orange-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Red-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Sapphire-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Sunflower-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Topaz-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Turquoise-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Violet-Theme</module>
- <module>Jewel-Light-NoFlat-Emphasized-Yellow-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Amethyst-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Blue-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Emerald-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Green-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Orange-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Red-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Sapphire-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Sunflower-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Topaz-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Turquoise-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Violet-Theme</module>
- <module>Jewel-Dark-NoFlat-Primary-Yellow-Theme</module>
-
- <module>Jewel-Dark-NoFlat-Secondary-Amethyst-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Blue-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Emerald-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Green-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Orange-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Red-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Sapphire-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Sunflower-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Topaz-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Turquoise-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Violet-Theme</module>
- <module>Jewel-Dark-NoFlat-Secondary-Yellow-Theme</module>
-
- <module>Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Blue-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Emerald-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Green-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Orange-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Red-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Topaz-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Violet-Theme</module>
- <module>Jewel-Dark-NoFlat-Emphasized-Yellow-Theme</module>
-
+ <module>Jewel-Light-NoFlat-Primary-Amethyst-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Blue-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Emerald-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Green-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Orange-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Red-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Sapphire-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Sunflower-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Topaz-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Turquoise-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Violet-Theme</module>
+ <module>Jewel-Light-NoFlat-Primary-Yellow-Theme</module>
+
+ <module>Jewel-Light-NoFlat-Secondary-Amethyst-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Blue-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Emerald-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Green-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Orange-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Red-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Sapphire-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Sunflower-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Topaz-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Turquoise-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Violet-Theme</module>
+ <module>Jewel-Light-NoFlat-Secondary-Yellow-Theme</module>
+
+ <module>Jewel-Light-NoFlat-Emphasized-Amethyst-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Blue-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Emerald-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Green-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Orange-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Red-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Sapphire-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Sunflower-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Topaz-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Turquoise-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Violet-Theme</module>
+ <module>Jewel-Light-NoFlat-Emphasized-Yellow-Theme</module>
+
+ <module>Jewel-Dark-NoFlat-Primary-Amethyst-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Blue-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Emerald-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Green-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Orange-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Red-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Sapphire-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Sunflower-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Topaz-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Turquoise-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Violet-Theme</module>
+ <module>Jewel-Dark-NoFlat-Primary-Yellow-Theme</module>
+
+ <module>Jewel-Dark-NoFlat-Secondary-Amethyst-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Blue-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Emerald-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Green-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Orange-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Red-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Sapphire-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Sunflower-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Topaz-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Turquoise-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Violet-Theme</module>
+ <module>Jewel-Dark-NoFlat-Secondary-Yellow-Theme</module>
+
+ <module>Jewel-Dark-NoFlat-Emphasized-Amethyst-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Blue-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Emerald-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Green-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Orange-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Red-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Sapphire-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Sunflower-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Topaz-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Turquoise-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Violet-Theme</module>
+ <module>Jewel-Dark-NoFlat-Emphasized-Yellow-Theme</module>
+
</modules>
<dependencies>
@@ -127,7 +128,7 @@
<type>swc</type>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.royale.typedefs</groupId>
<artifactId>royale-typedefs-gcl</artifactId>
diff --git a/manualtests/pom.xml b/manualtests/pom.xml
index fd63e7f..773cf14 100644
--- a/manualtests/pom.xml
+++ b/manualtests/pom.xml
@@ -172,11 +172,11 @@
<classifier>js</classifier>
</dependency>
</dependencies>
+
<profiles>
<profile>
- <id>release</id>
+ <id>apache-release</id>
<properties>
- <compiler.debug>false</compiler.debug>
<compiler.output-dir>${basedir}/target/javascript/bin/js-release</compiler.output-dir>
</properties>
</profile>
diff --git a/mvnw b/mvnw
new file mode 100755
index 0000000..afe2c11
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,305 @@
+#!/bin/bash
+# ----------------------------------------------------------------------------
+# 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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG="$0"
+
+ # need this for relative symlinks
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ "$MVNW_REPOURL" = true ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 0000000..025217a
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,172 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ echo Found %WRAPPER_JAR%
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.2/maven-wrapper-0.5.2.jar"
+ )
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f6729e6..37588b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,15 +17,16 @@
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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
- <relativePath />
+ <version>21</version>
+ <relativePath/>
</parent>
<groupId>org.apache.royale.framework</groupId>
@@ -50,37 +51,34 @@
</scm>
<properties>
- <java.version>1.6</java.version>
+ <java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
<maven.version>3.5.4</maven.version>
+ <!-- Timestamp for the reproducible builds -->
+ <!--project.build.outputTimestamp>2019-11-01T10:30:00Z</project.build.outputTimestamp-->
+
+ <royale.build-tools.version>1.1.0</royale.build-tools.version>
<royale.compiler.version>0.9.7-SNAPSHOT</royale.compiler.version>
<royale.typedefs.version>0.9.7-SNAPSHOT</royale.typedefs.version>
- <royale.build-tools.version>1.0.0</royale.build-tools.version>
- <royale.swc-date>9/24/19 9:06 -0800</royale.swc-date>
- <royale.example.targets>JSRoyale</royale.example.targets>
-
+ <royale.targets>JSRoyale</royale.targets>
<royale.skipAS>true</royale.skipAS>
<royale.debug>true</royale.debug>
- <repo.compiler.options />
-
+ <repo.compiler.options/>
+
<flex.version>4.15.0</flex.version>
<flash.version>20.0</flash.version>
<air.version>20.0</air.version>
<!-- For SWF versions see: http://www.adobe.com/devnet/articles/flashplayer-air-feature-list.html -->
<swf.version>31</swf.version>
<source.map>true</source.map>
-
+
+ <!-- This parameter has to be provided from the outside -->
+ <webdriver.gecko.driver/>
<selenium.version>3.4.0</selenium.version>
<junit.version>4.12</junit.version>
- <skipgpg>false</skipgpg>
-
- <!-- URL of the ASF SonarQube server -->
- <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
- <!-- Exclude all generated code -->
- <sonar.exclusions>file:**/generated-sources/**</sonar.exclusions>
</properties>
<!-- Only configure the site distribution as the rest is handled by the apache parent -->
@@ -113,16 +111,32 @@
</mailingList>
</mailingLists>
+ <modules>
+ <module>frameworks</module>
+ <module>archetypes</module>
+ </modules>
+
<build>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <configuration>
- <skip>${skipgpg}</skip><!--true to skip gpg if building release on CI server -->
- </configuration>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.4.2</version>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+
<plugin>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-maven-plugin</artifactId>
@@ -154,7 +168,7 @@
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -164,19 +178,7 @@
<plugin>
<groupId>nl.geodienstencentrum.maven</groupId>
<artifactId>sass-maven-plugin</artifactId>
- <version>3.6.0</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.7.2</version>
</plugin>
<plugin>
@@ -190,15 +192,53 @@
<artifactId>maven-scm-plugin</artifactId>
<version>1.10.0</version>
</plugin>
-<!--
+
<plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.2</version>
- </plugin>-->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <!-- In case of a maven release, we want to build the distribution as well as the swfs -->
+ <arguments>-Papache-release,with-distribution,option-with-swf ${arguments}</arguments>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>com.theoryinpractise</groupId>
+ <artifactId>reproducible-maven-plugin</artifactId>
+ <version>1.0.1</version>
+ </plugin>
</plugins>
</pluginManagement>
+
<plugins>
+ <!-- Execute some checks if the environment ist correctly configured -->
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <executions>
+ <!-- Do some pre-build checks and report any findings to the user -->
+ <execution>
+ <id>prerequisite-check</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <properties>
+ <!--
+ We have to pass this value in this way or we can't
+ access the value overridden by the commandline.
+ -->
+ <geckoProperty>${webdriver.gecko.driver}</geckoProperty>
+ </properties>
+ <source>${project.basedir}/src/main/script/prerequisiteCheckFramework.groovy</source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- Check if all source files have the required apache license headers -->
<plugin>
<groupId>org.apache.rat</groupId>
@@ -255,285 +295,106 @@
<exclude>lib/external/*.html</exclude>
</excludes>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>1.6</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </plugin>
-
- <!-- Configure the Site generation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <!-- Downgraded to 3.4 as 3.5 and 3.5.1 seem to have issues with the velocity tools -->
- <version>3.7.1</version>
- <configuration>
- <generateReports>true</generateReports>
- <generateSitemap>true</generateSitemap>
- <relativizeDecorationLinks>false</relativizeDecorationLinks>
- <locales>en</locales>
- <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
- <outputEncoding>${project.reporting.outputencoding}</outputEncoding>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>1.8</version>
- </dependency>
- <!-- All dependencies needed by the reflow skin -->
- <dependency>
- <groupId>lt.velykis.maven.skins</groupId>
- <artifactId>reflow-velocity-tools</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <!--
- Make the maven-site-plugin stage the output in the "asf-site" branch
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>scm-publish</id>
- <phase>site-deploy</phase>
- <!-- deploy site with maven-scm-publish-plugin -->
- <goals>
- <goal>publish-scm</goal>
- </goals>
- <configuration>
- <!-- mono-module doesn't require site:stage -->
- <content>${project.build.directory}/site</content>
- <!-- branch where to deploy -->
- <scmBranch>asf-site</scmBranch>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- <configuration>
- <providerImplementations>
- <git>jgit</git>
- </providerImplementations>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-jgit</artifactId>
- <version>1.11.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-api</artifactId>
- <version>1.11.2-SNAPSHOT</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>main</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>frameworks</module>
- <module>archetypes</module>
- </modules>
- </profile>
- <profile>
- <id>release</id>
- <properties>
- <royale.debug>false</royale.debug>
- </properties>
- </profile>
-
- <profile>
- <id>build-examples</id>
+ <id>with-examples</id>
<modules>
<module>examples</module>
</modules>
</profile>
<profile>
- <id>build-distribution</id>
+ <id>with-distribution</id>
<modules>
<module>distribution</module>
</modules>
</profile>
<profile>
- <id>build-manualtests</id>
+ <id>with-manualtests</id>
<modules>
<module>manualtests</module>
</modules>
</profile>
<profile>
- <id>run-testsuite</id>
- <modules>
+ <id>with-ui-testsuite</id>
+ <!-- Disabled for now till I find out what the module is about -->
+ <!--modules>
<module>testsuite</module>
- </modules>
+ </modules-->
</profile>
+
<profile>
- <id>upload-release-to-staging</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules><!-- only run on top-level, not for each module -->
- </modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <version>2.0.0</version>
- <configuration>
- <serverId>apache.releases.https</serverId>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>generate-swf</id>
- <properties>
- <royale.example.targets>SWF,JSRoyale</royale.example.targets>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>${flash.version}</version>
- <type>swc</type>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>generate-swcs-for-swf</id>
+ <id>option-with-swf</id>
<properties>
- <royale.skipAS>false</royale.skipAS>
+ <royale.targets>SWF,JSRoyale</royale.targets>
+ <royale.skipAS>false</royale.skipAS>
</properties>
<dependencies>
- <dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>runtime</scope>
- </dependency>
+ <dependency>
+ <groupId>com.adobe.air.framework</groupId>
+ <artifactId>airglobal</artifactId>
+ <version>${air.version}</version>
+ <type>swc</type>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</profile>
-
+
<profile>
- <id>release-swcs</id>
- <properties>
- <repo.compiler.options>-metadata.date="${royale.swc-date}";-metadata.dateFormat="MM/dd/yy HH:mm Z";-swf-debugfile-alias=/org/apache/royale/0.9.7;</repo.compiler.options>
- <source.map>false</source.map>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.royale.compiler</groupId>
- <artifactId>royale-maven-plugin</artifactId>
- <version>${royale.compiler.version}</version>
- <extensions>true</extensions>
- <configuration>
- <additionalCompilerOptions>${repo.compiler.options}</additionalCompilerOptions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <id>_reproducible-build</id>
+ <activation>
+ <property>
+ <name>project.build.outputTimestamp</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.royale.compiler</groupId>
+ <artifactId>royale-maven-plugin</artifactId>
+ <version>${royale.compiler.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <additionalCompilerOptions>
+ -metadata.date=${project.build.outputTimestamp};-metadata.dateFormat=yyyy-MM-dd'T'HH:mm:ss'Z'
+ </additionalCompilerOptions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- Make the release-plugin use the new reproducible build plugin extension -->
+ <profile>
+ <id>apache-release</id>
+ <properties>
+ <source.map>false</source.map>
+ <royale.debug>false</royale.debug>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.theoryinpractise</groupId>
+ <artifactId>reproducible-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <preparationGoals>clean com.theoryinpractise:reproducible-maven-plugin:apply install</preparationGoals>
+ <completionGoals>com.theoryinpractise:reproducible-maven-plugin:clear</completionGoals>
+ <goals>deploy</goals>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
- <repositories>
- <repository>
- <id>apache-release</id>
- <url>https://repository.apache.org/content/repositories/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jspresso</id>
- <url>http://repository.jspresso.org/maven2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>apache-plugins-release</id>
- <url>https://repository.apache.org/content/repositories/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>apache-plugins-snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
</project>
diff --git a/settings-template.xml b/settings-template.xml
index bc78230..93af862 100644
--- a/settings-template.xml
+++ b/settings-template.xml
@@ -1,21 +1,21 @@
<?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.
-
+
-->
<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
xmlns="http://maven.apache.org/SETTINGS/1.1.0"
@@ -50,6 +50,16 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>apache-mavenizer-staging</id>
+ <url>https://repository.apache.org/content/repositories/orgapacheflex-1022</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -62,6 +72,16 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <id>apache-mavenizer-staging</id>
+ <url>https://repository.apache.org/content/repositories/orgapacheflex-1022</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
</profile>
</profiles>
@@ -71,3 +91,4 @@
<activeProfile>apache-snapshots-enabled</activeProfile>
</activeProfiles>
</settings>
+
diff --git a/src/main/script/prerequisiteCheckFramework.groovy b/src/main/script/prerequisiteCheckFramework.groovy
new file mode 100644
index 0000000..443b9bd
--- /dev/null
+++ b/src/main/script/prerequisiteCheckFramework.groovy
@@ -0,0 +1,229 @@
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.xpath.XPathFactory
+import java.lang.reflect.Field
+import java.util.regex.Matcher
+
+/*
+ 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.
+ */
+
+allConditionsMet = true
+
+baseDirectory = project.model.pomFile.parent
+
+def checkTotalMemory(long requiredMaxMegs) {
+ print "Checking available memory: "
+ long curMaxMegs = (long) (Runtime.runtime.maxMemory() / (1024*1024))
+ if(curMaxMegs < requiredMaxMegs) {
+ println "Failed:"
+ println ""
+ println "Too little memory available. "
+ println "Please set the MAVEN_OPTS environment variable to allow at least " + requiredMaxMegs + "MB of ram."
+ println "Example:"
+ if(os == "win") {
+ println "set MAVEN_OPTS=-Xmx" + requiredMaxMegs + "m"
+ } else {
+ println "export MAVEN_OPTS=-Xmx" + requiredMaxMegs + "m"
+ }
+ println ""
+ allConditionsMet = false
+ } else {
+ println "OK (" + curMaxMegs + " MB)"
+ }
+}
+
+def checkGeckoDriver() {
+ print "Checking Gecko WebDriver configuration: "
+ String webdriverGeckoDriverPath = geckoProperty
+ if(webdriverGeckoDriverPath == null || webdriverGeckoDriverPath.isEmpty()) {
+ println "Failed"
+ println ""
+ println "When running the 'with-ui-testsuite' profile it is mandatory to pass along the path to the Gecko Webdriver in the 'webdriver.gecko.driver' variable."
+ println "Get versions from: https://github.com/mozilla/geckodriver/releases"
+ if(os == "win") {
+ println "Pass the location to the 'geckodriver.exe' executable by adding '-Dwebdriver.gecko.driver={path-to-geckodriver.exe}' to your maven build command"
+ } else {
+ println "Pass the location to the 'geckodriver' executable by adding '-Dwebdriver.gecko.driver={path-to-geckodriver}' to your maven build command"
+ }
+ println ""
+ allConditionsMet = false
+ return
+ }
+ // If the property is specified with surrounding double-quotes, remove them.
+ if(webdriverGeckoDriverPath.startsWith("\"") && webdriverGeckoDriverPath.endsWith("\"")) {
+ flashplayerDebuggerPath = webdriverGeckoDriverPath.substring(1, webdriverGeckoDriverPath.length() - 1)
+ }
+
+ File webdriverGeckoDriverFile = new File(webdriverGeckoDriverPath)
+ if(webdriverGeckoDriverFile.exists()) {
+ if(webdriverGeckoDriverFile.exists()) {
+ if(!webdriverGeckoDriverFile.isFile()) {
+ println "Failed: 'webdriver.gecko.driver' must point to a file"
+ allConditionsMet = false
+ return
+ }
+
+ def output = (webdriverGeckoDriverPath + " --version").execute().text
+ Matcher matcher = extractVersion(output)
+ if(matcher.size() > 0) {
+ def curVersion = matcher[0][1]
+ println "OK (Gecko Version " + curVersion + ")"
+ } else {
+ println "Failed"
+ println ""
+ println "not a valid Gecko WebDriver executable at " + webdriverGeckoDriverPath
+ allConditionsMet = false
+ }
+ } else {
+ println "Failed: File referenced by 'webdriver.gecko.driver' does not exist. " + webdriverGeckoDriverPath
+ allConditionsMet = false
+ }
+ }
+}
+
+/*
+ Checks if a given version number is at least as high as a given reference version.
+*/
+def checkVersionAtLeast(String current, String minimum) {
+ def currentSegments = current.tokenize('.')
+ def minimumSegments = minimum.tokenize('.')
+ def numSegments = Math.min(currentSegments.size(), minimumSegments.size())
+ for (int i = 0; i < numSegments; ++i) {
+ def currentSegment = currentSegments[i].toInteger()
+ def minimumSegment = minimumSegments[i].toInteger()
+ if(currentSegment < minimumSegment) {
+ println current.padRight(14) + "FAILED (required " + minimum + ")"
+ return false
+ } else if(currentSegment > minimumSegment) {
+ println current.padRight(14) + "OK"
+ return true
+ }
+ }
+ def curNotShorter = currentSegments.size() >= minimumSegments.size()
+ if(curNotShorter) {
+ println current.padRight(14) + " OK"
+ } else {
+ println current.padRight(14) + " (required " + minimum + ")"
+ }
+ curNotShorter
+}
+
+/**
+ * Version extraction function/macro. It looks for occurrence of x.y or x.y.z
+ * in passed input text (likely output from `program --version` command if found).
+ *
+ * @param input
+ * @return
+ */
+private Matcher extractVersion(input) {
+ def matcher = input =~ /(\d+\.\d+(\.\d+)?).*/
+ matcher
+}
+
+/////////////////////////////////////////////////////
+// Find out which OS and arch are bring used.
+/////////////////////////////////////////////////////
+
+def osString = project.properties['os.type']
+def osMatcher = osString =~ /(.*)/
+if(osMatcher.size() == 0) {
+ throw new RuntimeException("Currently unsupported OS")
+}
+os = osMatcher[0][1]
+println "Detected OS: " + os
+
+flashVersion = project.properties['flash.version']
+println "Detected minimum Flash version: " + flashVersion
+
+airVersion = project.properties['air.version']
+println "Detected minimum Air version: " + airVersion
+
+// Save the gecko property (Somehow the groovy maven plugin doesn't like overridden properties)
+geckoProperty = properties['geckoProperty']
+
+/////////////////////////////////////////////////////
+// Find out which profiles are enabled.
+/////////////////////////////////////////////////////
+
+println "Enabled profiles:"
+def distributionEnabled = false
+def examplesEnabled = false
+def manualtestsEnabled = false
+def uiTestsuiteEnabled = false
+def optionWithSwfEnabled = false
+def activeProfiles = session.request.activeProfiles
+for (def activeProfile : activeProfiles) {
+ if(activeProfile == "with-distribution") {
+ distributionEnabled = true
+ println "with-distribution"
+ } else if(activeProfile == "with-examples") {
+ examplesEnabled = true
+ println "with-examples"
+ } else if(activeProfile == "with-manualtests") {
+ manualtestsEnabled = true
+ println "with-manualtests"
+ } else if(activeProfile == "with-ui-testsuite") {
+ uiTestsuiteEnabled = true
+ println "with-ui-testsuite"
+ } else if(activeProfile == "option-with-swf") {
+ optionWithSwfEnabled = true
+ println "option-with-swf"
+ }
+}
+println ""
+
+// - Windows:
+// - Check the length of the path of the base dir as we're having issues with the length of paths being too long.
+if(os == "win") {
+ File pomFile = project.model.pomFile
+ if(pomFile.absolutePath.length() > 100) {
+ println "On Windows we encounter problems with maximum path lengths. " +
+ "Please move the project to a place it has a shorter base path " +
+ "and run the build again."
+ allConditionsMet = false
+ }
+}
+
+/////////////////////////////////////////////////////
+// Do the actual checks depending on the enabled
+// profiles.
+/////////////////////////////////////////////////////
+
+if(examplesEnabled) {
+ // Check at least 1536MB of memory are available to the build.
+ checkTotalMemory(1536)
+}
+
+if(uiTestsuiteEnabled) {
+ // Check if the gecko driver is configured and available in the right version.
+ checkGeckoDriver()
+}
+
+if(distributionEnabled) {
+ if(!optionWithSwfEnabled) {
+ println "If the 'with-distribution' profile is enabled the 'option-with-swf' profile must be enabled too, as the distribution bundles both swf and js artifacts."
+ allConditionsMet = false
+ }
+}
+
+if(!allConditionsMet) {
+ throw new RuntimeException("Not all conditions met, see log for details.")
+}
+println ""
+println "All known conditions met successfully."
+println ""
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 303d4b7..c48b8cc 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -36,7 +36,7 @@
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
- <version>2.0.0</version>
+ <version>3.2.1</version>
<configuration>
<!-- Define the place the projects are copied to and executed in -->
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
