You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/30 19:47:50 UTC
[15/50] git commit: [flex-asjs] [refs/heads/tlf] - - Fixed some
problems in the archetypes
- Fixed some problems in the archetypes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/baa544c2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/baa544c2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/baa544c2
Branch: refs/heads/tlf
Commit: baa544c21715772f4eb3cee74a9ddc0e128fa2f0
Parents: c2eefaf
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Wed May 24 14:11:42 2017 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Wed May 24 14:11:42 2017 +0200
----------------------------------------------------------------------
.../src/main/resources/META-INF/maven/archetype.xml | 1 +
.../src/main/resources/archetype-resources/pom.xml | 3 ---
.../src/main/resources/META-INF/maven/archetype.xml | 1 +
.../src/main/resources/archetype-resources/pom.xml | 11 -----------
.../src/main/resources/META-INF/maven/archetype.xml | 1 +
.../src/main/resources/archetype-resources/pom.xml | 16 +---------------
6 files changed, 4 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
index e765a36..7c92985 100644
--- a/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -22,6 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>flexjs-simple-application-archetype</id>
<resources>
+ <resource>.mvn/extensions.xml</resource>
<resource>src/main/flex/App.mxml</resource>
</resources>
</archetype>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
index 1e69b25..fc47d37 100644
--- a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -29,7 +29,6 @@
<properties>
<compiler.debug>true</compiler.debug>
- <compiler.output-dir>target/javascript/bin/js-debug</compiler.output-dir>
</properties>
<build>
@@ -84,7 +83,6 @@
<artifactId>Language</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
- <classifier>js</classifier>
</dependency>
</dependencies>
@@ -93,7 +91,6 @@
<id>release</id>
<properties>
<compiler.debug>false</compiler.debug>
- <compiler.output-dir>target/javascript/bin/js-release</compiler.output-dir>
</properties>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml
index e765a36..7c92985 100644
--- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -22,6 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>flexjs-simple-application-archetype</id>
<resources>
+ <resource>.mvn/extensions.xml</resource>
<resource>src/main/flex/App.mxml</resource>
</resources>
</archetype>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
index 8715462..c58ee01 100644
--- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
@@ -29,7 +29,6 @@
<properties>
<compiler.debug>true</compiler.debug>
- <compiler.output-dir>target/javascript/bin/js-debug</compiler.output-dir>
</properties>
<build>
@@ -64,15 +63,6 @@
<type>swc</type>
</dependency>
- <!-- Needed for Flash compilation -->
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>${flash.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
-
<!-- Needed for JavaScript compilation -->
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@ -93,7 +83,6 @@
<id>release</id>
<properties>
<compiler.debug>false</compiler.debug>
- <compiler.output-dir>target/javascript/bin/js-release</compiler.output-dir>
</properties>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml
index e765a36..7c92985 100644
--- a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -22,6 +22,7 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
<id>flexjs-simple-application-archetype</id>
<resources>
+ <resource>.mvn/extensions.xml</resource>
<resource>src/main/flex/App.mxml</resource>
</resources>
</archetype>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/baa544c2/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml
index 70fe474..d096bae 100644
--- a/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/flexjs-simple-application-pure-swf-archetype/src/main/resources/archetype-resources/pom.xml
@@ -37,7 +37,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>App.mxml</mainClass>
- <targets>JSFlex</targets>
+ <targets>SWF</targets>
</configuration>
<dependencies>
<dependency>
@@ -66,20 +66,6 @@
<type>swc</type>
<scope>provided</scope>
</dependency>
-
- <!-- Needed for JavaScript compilation -->
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
</dependencies>
</project>
\ No newline at end of file