flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-falcon] [refs/heads/feature/flexmojos-tests] - - Did some more work on the failing test-modules.
Date Mon, 03 Nov 2014 17:44:48 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/feature/flexmojos-tests f85d0dc5a -> a9bdaccd3


- Did some more work on the failing test-modules.


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a9bdaccd
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a9bdaccd
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a9bdaccd

Branch: refs/heads/feature/flexmojos-tests
Commit: a9bdaccd3458f8b61d5d534b9b000bf4ccaa2eaf
Parents: f85d0dc
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Mon Nov 3 18:44:40 2014 +0100
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Mon Nov 3 18:44:40 2014 +0100

----------------------------------------------------------------------
 flexmojos-tests/generated-sources/pom.xml       | 31 ++++++++++++++------
 .../src/main/flex/TestApplication.mxml          |  4 +--
 .../src/main/flex/a/b/c/d/TestModel.as          | 14 +++++++++
 .../main/flex/org/apache/flex/swc/SWCDigest.as  | 26 ----------------
 flexmojos-tests/mx-mxml-module/pom.xml          |  2 +-
 .../mx-mxml-module/src/main/flex/MxModule.mxml  | 25 ++++++++++++++++
 .../src/main/flex/test/MxModule.mxml            | 25 ----------------
 .../no-embedding-of-resources/pom.xml           |  5 ----
 flexmojos-tests/no-font-embedding/pom.xml       |  5 ----
 flexmojos-tests/pom.xml                         |  5 ++--
 flexmojos-tests/spark-mxml-module/pom.xml       |  2 +-
 .../src/main/flex/SparkModule.mxml              | 25 ++++++++++++++++
 .../src/main/flex/test/SparkModule.mxml         | 25 ----------------
 flexmojos-tests/test-java/pom.xml               | 30 +++++++++++++++++++
 .../src/main/java/a/b/c/d/TestModel.java        | 14 +++++++++
 15 files changed, 137 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/generated-sources/pom.xml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/generated-sources/pom.xml b/flexmojos-tests/generated-sources/pom.xml
index a5f20e6..a8dd1bf 100644
--- a/flexmojos-tests/generated-sources/pom.xml
+++ b/flexmojos-tests/generated-sources/pom.xml
@@ -42,26 +42,39 @@
 						</goals>
                         <configuration>
                             <includeJavaClasses>
-                                <class>org.apache.flex.swc.SWCDigest</class>
+                                <class>a.b.c.d.TestModel</class>
                             </includeJavaClasses>
                         </configuration>
 					</execution>
 				</executions>
                 <dependencies>
-                    <!--dependency>
+                    <dependency>
                         <groupId>org.apache.flex</groupId>
                         <artifactId>compiler</artifactId>
                         <version>4.13.0.20140701</version>
                         <type>pom</type>
-                    </dependency-->
-                    <dependency>
+                    </dependency>
+                    <!--dependency>
                         <groupId>org.apache.flex.compiler</groupId>
                         <artifactId>falcon-compiler</artifactId>
                         <version>0.0.3-SNAPSHOT</version>
-                    </dependency>
+                    </dependency-->
                 </dependencies>
             </plugin>
-		</plugins>
+            <plugin>
+                <groupId>org.apache.flex.compiler.falcon.tests</groupId>
+                <artifactId>bytecode-dumper</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>dump</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
 	</build>
 
     <dependencies>
@@ -79,9 +92,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.flex.compiler</groupId>
-            <artifactId>falcon-compiler</artifactId>
-            <version>0.0.3-SNAPSHOT</version>
+            <groupId>org.apache.flex.compiler.falcon.tests</groupId>
+            <artifactId>test-java</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/generated-sources/src/main/flex/TestApplication.mxml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/generated-sources/src/main/flex/TestApplication.mxml b/flexmojos-tests/generated-sources/src/main/flex/TestApplication.mxml
index d75e018..aa51f7e 100644
--- a/flexmojos-tests/generated-sources/src/main/flex/TestApplication.mxml
+++ b/flexmojos-tests/generated-sources/src/main/flex/TestApplication.mxml
@@ -22,9 +22,9 @@
     
     <fx:Script>
         <![CDATA[
-        import org.apache.flex.swc.SWCDigest;
+        import a.b.c.d.TestModel;
 
-        var digest:SWCDigest = new SWCDigest();
+        private var tst:TestModel = new TestModel();
         
         ]]>
     </fx:Script>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/generated-sources/src/main/flex/a/b/c/d/TestModel.as
----------------------------------------------------------------------
diff --git a/flexmojos-tests/generated-sources/src/main/flex/a/b/c/d/TestModel.as b/flexmojos-tests/generated-sources/src/main/flex/a/b/c/d/TestModel.as
new file mode 100644
index 0000000..3223da8
--- /dev/null
+++ b/flexmojos-tests/generated-sources/src/main/flex/a/b/c/d/TestModel.as
@@ -0,0 +1,14 @@
+/**
+ * Generated by Gas3 v2.3.2 (Granite Data Services).
+ *
+ * NOTE: this file is only generated if it does not exist. You may safely put
+ * your custom code here.
+ */
+
+package a.b.c.d {
+
+    [Bindable]
+    [RemoteClass(alias="a.b.c.d.TestModel")]
+    public class TestModel extends TestModelBase {
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/generated-sources/src/main/flex/org/apache/flex/swc/SWCDigest.as
----------------------------------------------------------------------
diff --git a/flexmojos-tests/generated-sources/src/main/flex/org/apache/flex/swc/SWCDigest.as
b/flexmojos-tests/generated-sources/src/main/flex/org/apache/flex/swc/SWCDigest.as
deleted file mode 100644
index 99e2b88..0000000
--- a/flexmojos-tests/generated-sources/src/main/flex/org/apache/flex/swc/SWCDigest.as
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *
- *  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 org.apache.flex.swc {
-
-    [Bindable]
-    [RemoteClass(alias="org.apache.flex.swc.SWCDigest")]
-    public class SWCDigest extends SWCDigestBase {
-    }
-
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/mx-mxml-module/pom.xml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/mx-mxml-module/pom.xml b/flexmojos-tests/mx-mxml-module/pom.xml
index de46f88..e6e620a 100644
--- a/flexmojos-tests/mx-mxml-module/pom.xml
+++ b/flexmojos-tests/mx-mxml-module/pom.xml
@@ -37,7 +37,7 @@
                 <version>7.1.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <sourceFile>test/SparkModule.mxml</sourceFile>
+                    <sourceFile>MxModule.mxml</sourceFile>
                 </configuration>
                 <dependencies>
                     <dependency>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/mx-mxml-module/src/main/flex/MxModule.mxml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/mx-mxml-module/src/main/flex/MxModule.mxml b/flexmojos-tests/mx-mxml-module/src/main/flex/MxModule.mxml
new file mode 100644
index 0000000..a8feb00
--- /dev/null
+++ b/flexmojos-tests/mx-mxml-module/src/main/flex/MxModule.mxml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+
+  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.
+
+-->
+<mx:Module xmlns:mx="library://ns.adobe.com/flex/mx"
+          xmlns:fx="http://ns.adobe.com/mxml/2009" layout="absolute">
+
+    <mx:Label text="MX-Based Module"/>
+
+</mx:Module>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/mx-mxml-module/src/main/flex/test/MxModule.mxml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/mx-mxml-module/src/main/flex/test/MxModule.mxml b/flexmojos-tests/mx-mxml-module/src/main/flex/test/MxModule.mxml
deleted file mode 100644
index a8feb00..0000000
--- a/flexmojos-tests/mx-mxml-module/src/main/flex/test/MxModule.mxml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  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.
-
--->
-<mx:Module xmlns:mx="library://ns.adobe.com/flex/mx"
-          xmlns:fx="http://ns.adobe.com/mxml/2009" layout="absolute">
-
-    <mx:Label text="MX-Based Module"/>
-
-</mx:Module>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/no-embedding-of-resources/pom.xml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/no-embedding-of-resources/pom.xml b/flexmojos-tests/no-embedding-of-resources/pom.xml
index 7f2686d..1b12ca5 100644
--- a/flexmojos-tests/no-embedding-of-resources/pom.xml
+++ b/flexmojos-tests/no-embedding-of-resources/pom.xml
@@ -45,11 +45,6 @@
                     <sourceFile>TestApplication.mxml</sourceFile>
                 </configuration>
                 <dependencies>
-                    <dependency>
-                        <groupId>net.flexmojos.oss</groupId>
-                        <artifactId>flexmojos-threadlocaltoolkit-wrapper</artifactId>
-                        <version>7.1.0-SNAPSHOT</version>
-                    </dependency>
                     <!--dependency>
                         <groupId>org.apache.flex</groupId>
                         <artifactId>compiler</artifactId>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/no-font-embedding/pom.xml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/no-font-embedding/pom.xml b/flexmojos-tests/no-font-embedding/pom.xml
index 9aa73cb..bc9593e 100644
--- a/flexmojos-tests/no-font-embedding/pom.xml
+++ b/flexmojos-tests/no-font-embedding/pom.xml
@@ -40,11 +40,6 @@
                     <sourceFile>TestApplication.mxml</sourceFile>
                 </configuration>
                 <dependencies>
-                    <dependency>
-                        <groupId>net.flexmojos.oss</groupId>
-                        <artifactId>flexmojos-threadlocaltoolkit-wrapper</artifactId>
-                        <version>7.1.0-SNAPSHOT</version>
-                    </dependency>
                     <!--dependency>
                         <groupId>org.apache.flex</groupId>
                         <artifactId>compiler</artifactId>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/pom.xml b/flexmojos-tests/pom.xml
index 7235c03..2459f35 100644
--- a/flexmojos-tests/pom.xml
+++ b/flexmojos-tests/pom.xml
@@ -57,6 +57,7 @@
             - The application compiles, but is ony executable in flashplayer without
               errors, when compiled with the default compiler.
         -->
+        <module>test-java</module>
         <module>generated-sources</module>
 
         <!--
@@ -75,14 +76,14 @@
         <!--
             Problem area: It seems that runtime loaded locales don't work in Falcon
         -->
-        <module>l10n-locales-runtime</module>
+        <!--module>l10n-locales-runtime</module-->
 
         <!--
             Problem area: It seems FontEmbedding is currently completely disabled.
             But still it seems that locating the embedded fonts in a resources directory
             will prevent Falcon from finding it.
         -->
-        <module>no-font-embedding</module>
+        <!--module>no-font-embedding</module-->
 
         <!--
             Problem area: Embeding of images (or other static resrouces)

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/spark-mxml-module/pom.xml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/spark-mxml-module/pom.xml b/flexmojos-tests/spark-mxml-module/pom.xml
index 03efe19..a50f355 100644
--- a/flexmojos-tests/spark-mxml-module/pom.xml
+++ b/flexmojos-tests/spark-mxml-module/pom.xml
@@ -37,7 +37,7 @@
                 <version>7.1.0-SNAPSHOT</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <sourceFile>test/SparkModule.mxml</sourceFile>
+                    <sourceFile>SparkModule.mxml</sourceFile>
                 </configuration>
                 <dependencies>
                     <dependency>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/spark-mxml-module/src/main/flex/SparkModule.mxml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/spark-mxml-module/src/main/flex/SparkModule.mxml b/flexmojos-tests/spark-mxml-module/src/main/flex/SparkModule.mxml
new file mode 100644
index 0000000..dceff54
--- /dev/null
+++ b/flexmojos-tests/spark-mxml-module/src/main/flex/SparkModule.mxml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+
+  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.
+
+-->
+<s:Module xmlns:s="library://ns.adobe.com/flex/spark"
+          xmlns:fx="http://ns.adobe.com/mxml/2009" layout="absolute">
+
+    <s:Label text="Spark-Based Module"/>
+
+</s:Module>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/spark-mxml-module/src/main/flex/test/SparkModule.mxml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/spark-mxml-module/src/main/flex/test/SparkModule.mxml b/flexmojos-tests/spark-mxml-module/src/main/flex/test/SparkModule.mxml
deleted file mode 100644
index dceff54..0000000
--- a/flexmojos-tests/spark-mxml-module/src/main/flex/test/SparkModule.mxml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-  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.
-
--->
-<s:Module xmlns:s="library://ns.adobe.com/flex/spark"
-          xmlns:fx="http://ns.adobe.com/mxml/2009" layout="absolute">
-
-    <s:Label text="Spark-Based Module"/>
-
-</s:Module>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/test-java/pom.xml
----------------------------------------------------------------------
diff --git a/flexmojos-tests/test-java/pom.xml b/flexmojos-tests/test-java/pom.xml
new file mode 100644
index 0000000..c4f9e25
--- /dev/null
+++ b/flexmojos-tests/test-java/pom.xml
@@ -0,0 +1,30 @@
+<?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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.flex.compiler.falcon.tests</groupId>
+    <artifactId>test-java</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9bdaccd/flexmojos-tests/test-java/src/main/java/a/b/c/d/TestModel.java
----------------------------------------------------------------------
diff --git a/flexmojos-tests/test-java/src/main/java/a/b/c/d/TestModel.java b/flexmojos-tests/test-java/src/main/java/a/b/c/d/TestModel.java
new file mode 100644
index 0000000..67958a0
--- /dev/null
+++ b/flexmojos-tests/test-java/src/main/java/a/b/c/d/TestModel.java
@@ -0,0 +1,14 @@
+package a.b.c.d;
+
+/**
+ * Created by christoferdutz on 03.11.14.
+ */
+public class TestModel {
+
+    public String stingProperty;
+
+    public int intProperty;
+
+    public boolean booleanProperty;
+
+}


Mime
View raw message