You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/11/08 15:11:27 UTC
[01/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - - Added the dummy jars
FlashBuilder seems to need - Finetuned the distribution to omit the versions
on jars in the lib directory
Repository: flex-asjs
Updated Branches:
refs/heads/feature-autobuild/example-maven-dirs a07e0a2e3 -> 52d4f35c1
- Added the dummy jars FlashBuilder seems to need
- Finetuned the distribution to omit the versions on jars in the lib directory
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cf35d184
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cf35d184
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cf35d184
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: cf35d184124dd778ac0c2d51f926735521475181
Parents: 666b761
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Nov 5 16:55:46 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Nov 5 16:55:46 2016 +0100
----------------------------------------------------------------------
distribution/jars/compc/pom.xml | 60 +++++++++++++++++++++
distribution/jars/falcon-asc/pom.xml | 60 +++++++++++++++++++++
distribution/jars/falcon-compc/pom.xml | 60 +++++++++++++++++++++
distribution/jars/falcon-mxmlc/pom.xml | 60 +++++++++++++++++++++
distribution/jars/falcon-optimizer/pom.xml | 60 +++++++++++++++++++++
distribution/jars/falcon-swfdump/pom.xml | 65 +++++++++++++++++++++++
distribution/jars/mxmlc/pom.xml | 60 +++++++++++++++++++++
distribution/pom.xml | 49 ++++++++++++++++-
distribution/src/main/assembly/component.xml | 1 +
9 files changed, 474 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/compc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/jars/compc/pom.xml b/distribution/jars/compc/pom.xml
new file mode 100644
index 0000000..1b3cfaa
--- /dev/null
+++ b/distribution/jars/compc/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>flexjs-framework-parent</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>compc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+ <mainClass>flex2.tools.Compc</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>flex-compiler-oem</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-asc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/jars/falcon-asc/pom.xml b/distribution/jars/falcon-asc/pom.xml
new file mode 100644
index 0000000..e1b4ae1
--- /dev/null
+++ b/distribution/jars/falcon-asc/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>flexjs-framework-parent</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-asc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+ <mainClass>org.apache.flex.compiler.clients.ASC</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-compc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/jars/falcon-compc/pom.xml b/distribution/jars/falcon-compc/pom.xml
new file mode 100644
index 0000000..c332371
--- /dev/null
+++ b/distribution/jars/falcon-compc/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>flexjs-framework-parent</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-compc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+ <mainClass>org.apache.flex.compiler.clients.COMPC</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-mxmlc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/jars/falcon-mxmlc/pom.xml b/distribution/jars/falcon-mxmlc/pom.xml
new file mode 100644
index 0000000..d0bf1b9
--- /dev/null
+++ b/distribution/jars/falcon-mxmlc/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>flexjs-framework-parent</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-mxmlc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+ <mainClass>org.apache.flex.compiler.clients.MXMLC</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-optimizer/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/jars/falcon-optimizer/pom.xml b/distribution/jars/falcon-optimizer/pom.xml
new file mode 100644
index 0000000..eec988e
--- /dev/null
+++ b/distribution/jars/falcon-optimizer/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>flexjs-framework-parent</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-optimizer</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+ <mainClass>org.apache.flex.compiler.clients.Optimizer</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/falcon-swfdump/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/jars/falcon-swfdump/pom.xml b/distribution/jars/falcon-swfdump/pom.xml
new file mode 100644
index 0000000..86f1ef8
--- /dev/null
+++ b/distribution/jars/falcon-swfdump/pom.xml
@@ -0,0 +1,65 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>flexjs-framework-parent</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-swfdump</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+ <mainClass>org.apache.flex.swf.io.SWFDump</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/jars/mxmlc/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/jars/mxmlc/pom.xml b/distribution/jars/mxmlc/pom.xml
new file mode 100644
index 0000000..ff99ffa
--- /dev/null
+++ b/distribution/jars/mxmlc/pom.xml
@@ -0,0 +1,60 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>flexjs-framework-parent</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>mxmlc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
+ <mainClass>org.apache.flex.compiler.clients.MXMLC</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 4db74fb..b2dac5e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -39,6 +39,16 @@
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
</properties>
+ <modules>
+ <module>jars/compc</module>
+ <module>jars/falcon-asc</module>
+ <module>jars/falcon-compc</module>
+ <module>jars/falcon-mxmlc</module>
+ <module>jars/falcon-optimizer</module>
+ <module>jars/falcon-swfdump</module>
+ <module>jars/mxmlc</module>
+ </modules>
+
<dependencies>
<!-- Add the compiler module -->
<dependency>
@@ -409,6 +419,43 @@
<artifactId>swfobject</artifactId>
<version>2.2</version>
</dependency>
+
+ <!-- Add the dummy jars -->
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>compc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>mxmlc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-asc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-compc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-mxmlc</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-optimizer</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework.distribution</groupId>
+ <artifactId>falcon-swfdump</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
@@ -430,7 +477,7 @@
<executions>
<execution>
<id>unpack-swfobject</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf35d184/distribution/src/main/assembly/component.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml
index 3293692..3b5621c 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component.xml
@@ -31,6 +31,7 @@ under the License.
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.flex.flexjs.compiler:*:jar</include>
+ <include>org.apache.flex.flexjs.framework.distribution:*:jar</include>
</includes>
<excludes>
<exclude>org.apache.flex.flexjs.compiler:compiler-jx:jar</exclude>
[08/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - fix MapSearch for Maven
Posted by cd...@apache.org.
fix MapSearch for Maven
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fa4df42d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fa4df42d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fa4df42d
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: fa4df42dce4c27e56ce3f74cec5b858cc3fb072c
Parents: d99854c
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 7 15:08:27 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Nov 7 15:08:27 2016 -0800
----------------------------------------------------------------------
examples/flexjs/MapSearch/pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fa4df42d/examples/flexjs/MapSearch/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/pom.xml b/examples/flexjs/MapSearch/pom.xml
index a191d3e..bad5543 100644
--- a/examples/flexjs/MapSearch/pom.xml
+++ b/examples/flexjs/MapSearch/pom.xml
@@ -81,6 +81,15 @@
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.flex.flexjs.typedefs</groupId>
+ <artifactId>flexjs-typedefs-googlemaps</artifactId>
+ <version>${flexjs.typedefs.version}</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
[07/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Posted by cd...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d99854c2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d99854c2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d99854c2
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: d99854c2f7e883aa6db10a061d879e08d57f5250
Parents: 2a06fe6 cf4fd2d
Author: yishayw <yi...@hotmail.com>
Authored: Mon Nov 7 13:04:58 2016 +0200
Committer: yishayw <yi...@hotmail.com>
Committed: Mon Nov 7 13:04:58 2016 +0200
----------------------------------------------------------------------
examples/flexjs/StyleExample/pom.xml | 2 +-
examples/flexjs/TeamPage/pom.xml | 31 +++++++++----------------------
2 files changed, 10 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[11/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - - Merged stuff that seems
to have been lost in previous merges - Removed the clearing of the debug-js
and release-js directories - Fixed issues with the cordova build
Posted by cd...@apache.org.
- Merged stuff that seems to have been lost in previous merges
- Removed the clearing of the debug-js and release-js directories
- Fixed issues with the cordova build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/52d4f35c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/52d4f35c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/52d4f35c
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: 52d4f35c1dcf22a9a41f18c9435bed4673a82b54
Parents: 4bac096
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Nov 8 16:10:44 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Nov 8 16:10:44 2016 +0100
----------------------------------------------------------------------
.../flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as | 2 +-
examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as | 2 +-
examples/flexjs/TeamPage/src/main/flex/models/MemberList.as | 2 +-
examples/flexjs/TeamPage/src/main/flex/models/Person.as | 2 +-
examples/pom.xml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as b/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as
index 6f1e77b..cafb4a9 100644
--- a/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as
+++ b/examples/flexjs/TeamPage/src/main/flex/MemberDataJSONItemConverter.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package main.flex
+package
{
import models.Person;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as b/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as
index 380668d..0a8af0a 100644
--- a/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as
+++ b/examples/flexjs/TeamPage/src/main/flex/NoSelectionController.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package main.flex
+package
{
import org.apache.flex.core.IBeadController;
import org.apache.flex.core.IStrand;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as b/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as
index 8fa77dc..1b5c3e7 100644
--- a/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as
+++ b/examples/flexjs/TeamPage/src/main/flex/models/MemberList.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package main.flex.models
+package models
{
import org.apache.flex.collections.LazyCollection;
import org.apache.flex.core.Application;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/flexjs/TeamPage/src/main/flex/models/Person.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/TeamPage/src/main/flex/models/Person.as b/examples/flexjs/TeamPage/src/main/flex/models/Person.as
index c513157..36ed24a 100644
--- a/examples/flexjs/TeamPage/src/main/flex/models/Person.as
+++ b/examples/flexjs/TeamPage/src/main/flex/models/Person.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package main.flex.models
+package models
{
import org.apache.flex.events.Event;
import org.apache.flex.events.EventDispatcher;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d4f35c/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index ea865fa..3c5398a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -97,11 +97,11 @@
</execution>
</executions>
<configuration>
- <warSourceDirectory>${compiler.output-dir}</warSourceDirectory>
+ <warSourceDirectory>${basedir}/target/javascript/bin/js-debug</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
<webResources>
<resource>
- <directory>${build.outputDirectory}</directory>
+ <directory>${compiler.output-dir}</directory>
</resource>
</webResources>
</configuration>
[05/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - - Adjusted the version of
the StyleExample - Made sure the war for the TeamPage example is created
Posted by cd...@apache.org.
- Adjusted the version of the StyleExample
- Made sure the war for the TeamPage example is created
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cf4fd2d8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cf4fd2d8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cf4fd2d8
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: cf4fd2d819815f17e08204ccf660887bd6db2779
Parents: ec60f6a
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Nov 7 10:43:08 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Nov 7 10:43:08 2016 +0100
----------------------------------------------------------------------
examples/flexjs/StyleExample/pom.xml | 2 +-
examples/flexjs/TeamPage/pom.xml | 31 +++++++++----------------------
2 files changed, 10 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf4fd2d8/examples/flexjs/StyleExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StyleExample/pom.xml b/examples/flexjs/StyleExample/pom.xml
index eddd944..5a76f9b 100644
--- a/examples/flexjs/StyleExample/pom.xml
+++ b/examples/flexjs/StyleExample/pom.xml
@@ -40,7 +40,7 @@
</parent>
<artifactId>StyleExample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
<packaging>swf</packaging>
<name>Apache Flex - FlexJS: Examples: FlexJS: StyleExample</name>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf4fd2d8/examples/flexjs/TeamPage/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/TeamPage/pom.xml b/examples/flexjs/TeamPage/pom.xml
index b407b02..709f291 100644
--- a/examples/flexjs/TeamPage/pom.xml
+++ b/examples/flexjs/TeamPage/pom.xml
@@ -35,7 +35,6 @@
<name>Apache Flex - FlexJS: Examples: FlexJS: TeamPage</name>
<build>
- <sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.flex.flexjs.compiler</groupId>
@@ -43,30 +42,18 @@
<extensions>true</extensions>
<configuration>
<mainClass>TeamPage.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
<!-- Not a config option of flexjs-maven-plugin -->
<!--flashVersion>20.0</flashVersion-->
</configuration>
- <executions>
- <!-- Add a second execution with output set to JavaScript (Flash is the default) -->
- <execution>
- <id>compile-javascript</id>
- <phase>compile</phase>
- <goals>
- <goal>compile-app</goal>
- </goals>
- <configuration>
- <outputJavaScript>true</outputJavaScript>
- <removeCirculars>true</removeCirculars>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-jx</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
[02/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - fix DesktopMap build for
Maven
Posted by cd...@apache.org.
fix DesktopMap build for Maven
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d47d3d92
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d47d3d92
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d47d3d92
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: d47d3d92eac1be58967d777e5fa6592d0c2085ce
Parents: cf35d18
Author: Alex Harui <ah...@apache.org>
Authored: Sat Nov 5 23:44:38 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Nov 5 23:44:46 2016 -0700
----------------------------------------------------------------------
examples/flexjs/DesktopMap/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d47d3d92/examples/flexjs/DesktopMap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/pom.xml b/examples/flexjs/DesktopMap/pom.xml
index effa50e..b28d9de 100644
--- a/examples/flexjs/DesktopMap/pom.xml
+++ b/examples/flexjs/DesktopMap/pom.xml
@@ -77,6 +77,16 @@
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.flex.flexjs.typedefs</groupId>
+ <artifactId>flexjs-typedefs-googlemaps</artifactId>
+ <version>${flexjs.typedefs.version}</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
</project>
[06/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - Fix scrolling runtime
error on combobox.
Posted by cd...@apache.org.
Fix scrolling runtime error on combobox.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2a06fe6e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2a06fe6e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2a06fe6e
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: 2a06fe6ef55a9749a609bc449b9fb53c1b9414b3
Parents: ec60f6a
Author: yishayw <yi...@hotmail.com>
Authored: Mon Nov 7 13:02:11 2016 +0200
Committer: yishayw <yi...@hotmail.com>
Committed: Mon Nov 7 13:02:11 2016 +0200
----------------------------------------------------------------------
.../flex/org/apache/flex/core/CSSTextField.as | 19 +++++++++++++------
.../flex/org/apache/flex/utils/PointUtils.as | 5 +++++
.../controllers/ScrollBarMouseControllerBase.as | 6 +++---
.../html/supportClasses/TextFieldItemRenderer.as | 6 ------
4 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2a06fe6e/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as
index 6ec8158..68a8bf3 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/CSSTextField.as
@@ -20,10 +20,11 @@ package org.apache.flex.core
{
COMPILE::SWF {
import flash.display.DisplayObject;
- import flash.text.TextField;
- import flash.text.TextFieldAutoSize;
- import flash.text.TextFormat;
- import org.apache.flex.events.Event;
+ import flash.text.TextField;
+ import flash.text.TextFieldAutoSize;
+ import flash.text.TextFormat;
+
+ import org.apache.flex.events.Event;
import org.apache.flex.events.EventDispatcher;
}
@@ -41,7 +42,7 @@ package org.apache.flex.core
* @productversion FlexJS 0.0
*/
COMPILE::SWF
- public class CSSTextField extends TextField
+ public class CSSTextField extends TextField implements IRenderedObject
{
/**
* Constructor.
@@ -157,7 +158,13 @@ package org.apache.flex.core
// force styles to be re-calculated
this.text = text;
}
-
+
+ COMPILE::SWF
+ public function get $displayObject():DisplayObject
+ {
+ return this;
+ }
+
}
COMPILE::JS
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2a06fe6e/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as
index c00bfa7..8b7b9e2 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as
@@ -26,6 +26,7 @@ package org.apache.flex.utils
import org.apache.flex.core.IUIBase;
import org.apache.flex.geom.Point;
+ import flash.display.Stage;
/**
* The PointUtils class is a collection of static functions that convert
@@ -103,6 +104,10 @@ package org.apache.flex.utils
{
COMPILE::SWF
{
+ if (local is Stage)
+ {
+ return pt;
+ }
var fpt:flash.geom.Point = DisplayObject(local.$displayObject).localToGlobal(new flash.geom.Point(pt.x,pt.y));
return new org.apache.flex.geom.Point(fpt.x, fpt.y);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2a06fe6e/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
index 8d9d27b..eea9234 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ScrollBarMouseControllerBase.as
@@ -23,7 +23,7 @@ package org.apache.flex.html.beads.controllers
import org.apache.flex.core.IStrand;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.events.MouseEvent;
+ import org.apache.flex.events.MouseEvent;
import org.apache.flex.html.beads.IScrollBarView;
/**
@@ -135,7 +135,7 @@ package org.apache.flex.html.beads.controllers
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- protected function decrementClickHandler(event:Event):void
+ protected function decrementClickHandler(event:Object):void
{
sbModel.value = snap(Math.max(sbModel.minimum, sbModel.value - sbModel.stepSize));
IEventDispatcher(_strand).dispatchEvent(new Event("scroll"));
@@ -149,7 +149,7 @@ package org.apache.flex.html.beads.controllers
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- protected function incrementClickHandler(event:Event):void
+ protected function incrementClickHandler(event:Object):void
{
sbModel.value = snap(Math.min(sbModel.maximum - sbModel.pageSize, sbModel.value + sbModel.stepSize));
IEventDispatcher(_strand).dispatchEvent(new Event("scroll"));
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2a06fe6e/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
index 1b2bb6f..5965a17 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
@@ -550,12 +550,6 @@ package org.apache.flex.html.supportClasses
return null;
return IUIBase(parent).topMostEventDispatcher;
}
-
- COMPILE::SWF
- public function get $displayObject():DisplayObject
- {
- return this;
- }
}
}
[09/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - fix pom for MobileMap
Posted by cd...@apache.org.
fix pom for MobileMap
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f4caf2c4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f4caf2c4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f4caf2c4
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: f4caf2c4931cbcaa0746d0bdbb231c516e15dbe2
Parents: fa4df42
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 7 15:21:19 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Nov 7 15:21:19 2016 -0800
----------------------------------------------------------------------
examples/flexjs/MobileMap/pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f4caf2c4/examples/flexjs/MobileMap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileMap/pom.xml b/examples/flexjs/MobileMap/pom.xml
index e5570c6..a58585c 100644
--- a/examples/flexjs/MobileMap/pom.xml
+++ b/examples/flexjs/MobileMap/pom.xml
@@ -85,6 +85,15 @@
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.typedefs</groupId>
+ <artifactId>flexjs-typedefs-googlemaps</artifactId>
+ <version>${flexjs.typedefs.version}</version>
+ <type>swc</type>
+ <classifier>typedefs</classifier>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
</project>
[10/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - Merge branches 'develop'
and 'feature-autobuild/example-maven-dirs' of
https://git-wip-us.apache.org/repos/asf/flex-asjs into
feature-autobuild/example-maven-dirs
Posted by cd...@apache.org.
Merge branches 'develop' and 'feature-autobuild/example-maven-dirs' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature-autobuild/example-maven-dirs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4bac096e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4bac096e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4bac096e
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: 4bac096e4a59fa4715993c174314b8b77842b443
Parents: a07e0a2 f4caf2c
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Nov 8 15:31:23 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Nov 8 15:31:23 2016 +0100
----------------------------------------------------------------------
distribution/jars/compc/pom.xml | 60 ++++++++++++++++++
distribution/jars/falcon-asc/pom.xml | 60 ++++++++++++++++++
distribution/jars/falcon-compc/pom.xml | 60 ++++++++++++++++++
distribution/jars/falcon-mxmlc/pom.xml | 60 ++++++++++++++++++
distribution/jars/falcon-optimizer/pom.xml | 60 ++++++++++++++++++
distribution/jars/falcon-swfdump/pom.xml | 65 ++++++++++++++++++++
distribution/jars/mxmlc/pom.xml | 60 ++++++++++++++++++
distribution/pom.xml | 49 ++++++++++++++-
distribution/src/main/assembly/component.xml | 1 +
examples/flexjs/DesktopMap/pom.xml | 10 +++
examples/flexjs/MapSearch/pom.xml | 9 +++
examples/flexjs/MobileMap/pom.xml | 9 +++
examples/flexjs/StyleExample/pom.xml | 2 +-
examples/flexjs/TeamPage/pom.xml | 30 +++------
.../flex/org/apache/flex/core/CSSTextField.as | 19 ++++--
.../flex/org/apache/flex/utils/PointUtils.as | 5 ++
.../flex/org/apache/flex/core/Application.as | 53 ++++++++++------
.../controllers/ScrollBarMouseControllerBase.as | 6 +-
.../supportClasses/TextFieldItemRenderer.as | 22 +++----
19 files changed, 578 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
[03/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - Make application
implement IInitialViewApplication
Posted by cd...@apache.org.
Make application implement IInitialViewApplication
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3c703fed
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3c703fed
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3c703fed
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: 3c703fede373946f90eea7e8561eaa4d56fa5ab6
Parents: d47d3d9
Author: yishayw <yi...@hotmail.com>
Authored: Mon Nov 7 09:23:48 2016 +0200
Committer: yishayw <yi...@hotmail.com>
Committed: Mon Nov 7 09:23:48 2016 +0200
----------------------------------------------------------------------
.../flex/org/apache/flex/core/Application.as | 53 +++++++++++++-------
1 file changed, 35 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3c703fed/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as
index 2277802..bef9f3d 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as
@@ -18,19 +18,19 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
+
+
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.events.MouseEvent;
import org.apache.flex.utils.MXMLDataInterpreter;
import org.apache.flex.utils.Timer;
COMPILE::SWF {
+ import flash.display.Stage;
import flash.display.DisplayObject;
import flash.display.Graphics;
import flash.display.Sprite;
import flash.events.Event;
- import flash.system.ApplicationDomain;
- import flash.utils.getQualifiedClassName;
import org.apache.flex.events.utils.MouseEventConverter;
}
@@ -109,11 +109,11 @@ package org.apache.flex.core
*
* @see ViewBase
* @langversion 3.0
- * @playerversion Flash 10.2
+ * @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class Application extends ApplicationBase implements IStrand, IParent, IEventDispatcher, ISWFApplication, IPopUpHost, IRenderedObject
+ public class Application extends ApplicationBase implements IInitialViewApplication, IStrand, IParent, IEventDispatcher, ISWFApplication, IPopUpHost, IRenderedObject
{
/**
* Constructor.
@@ -257,18 +257,7 @@ package org.apache.flex.core
ValuesManager.valuesImpl.init(this);
}
- /**
- * The initial view.
- *
- * @see org.apache.flex.core.ViewBase
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- [Bindable("__NoChangeEvent__")]
- public var initialView:IApplicationView;
+ private var _initialView:IApplicationView;
/**
* The controller. The controller typically watches
@@ -556,5 +545,33 @@ package org.apache.flex.core
}
}
- }
+ /**
+ * The initial view.
+ *
+ * @see org.apache.flex.core.ViewBase
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Bindable("__NoChangeEvent__")]
+ public function get initialView():IApplicationView
+ {
+ return _initialView;
+ }
+
+ public function set initialView(value:IApplicationView):void
+ {
+ _initialView = value;
+ dispatchEvent(new org.apache.flex.events.Event("__NoChangeEvent__");
+ }
+
+ COMPILE::SWF
+ public function get stage():Stage
+ {
+ return $displayObject.stage;
+ }
+
+ }
}
[04/11] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - Had to remove IUIBase
interface because of get parent() inconsistencies.
Posted by cd...@apache.org.
Had to remove IUIBase interface because of get parent() inconsistencies.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ec60f6a3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ec60f6a3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ec60f6a3
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: ec60f6a3cb281c53d0b1450989e8a8ac9914a99f
Parents: 3c703fe
Author: yishayw <yi...@hotmail.com>
Authored: Mon Nov 7 10:41:50 2016 +0200
Committer: yishayw <yi...@hotmail.com>
Committed: Mon Nov 7 10:41:50 2016 +0200
----------------------------------------------------------------------
.../html/supportClasses/TextFieldItemRenderer.as | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec60f6a3/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
index 05f93cb..1b2bb6f 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
@@ -18,23 +18,24 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.supportClasses
{
- import flash.text.TextFieldType;
+ COMPILE::SWF
+ {
+ import flash.display.DisplayObject;
+ import flash.text.TextFieldType;
+ }
import org.apache.flex.core.CSSTextField;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadController;
- import org.apache.flex.core.IFlexJSElement;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
- import org.apache.flex.core.UIBase;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.events.MouseEvent;
import org.apache.flex.events.utils.MouseEventConverter;
import org.apache.flex.geom.Rectangle;
import org.apache.flex.html.beads.ITextItemRenderer;
- import org.apache.flex.utils.CSSContainerUtils;
+ import org.apache.flex.utils.CSSContainerUtils;
/**
* The TextFieldItemRenderer class provides a org.apache.flex.html.TextField as an itemRenderer.
@@ -44,7 +45,7 @@ package org.apache.flex.html.supportClasses
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class TextFieldItemRenderer extends CSSTextField implements ITextItemRenderer, IStrand, IUIBase
+ public class TextFieldItemRenderer extends CSSTextField implements /*ITextItemRenderer, */IStrand/*, IUIBase*/
{
/**
* constructor.
@@ -57,7 +58,9 @@ package org.apache.flex.html.supportClasses
public function TextFieldItemRenderer()
{
super();
- type = TextFieldType.DYNAMIC;
+ COMPILE::SWF {
+ type = TextFieldType.DYNAMIC;
+ }
selectable = false;
MouseEventConverter.setupInstanceConverters(this);
@@ -548,6 +551,7 @@ package org.apache.flex.html.supportClasses
return IUIBase(parent).topMostEventDispatcher;
}
+ COMPILE::SWF
public function get $displayObject():DisplayObject
{
return this;