Author: cdutz
Date: Sun Dec 2 13:15:38 2012
New Revision: 1416171
URL: http://svn.apache.org/viewvc?rev=1416171&view=rev
Log:
- Included the AsDoc generation into the permanent lifecycle (Just for testing
... will be removed again later on)
Modified:
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/compiler/CompilerMojo.java
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swc/pom.xml
incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swf/pom.xml
Modified:
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/compiler/CompilerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/compiler/CompilerMojo.java?rev=1416171&r1=1416170&r2=1416171&view=diff
==============================================================================
---
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/compiler/CompilerMojo.java
(original)
+++
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/compiler/CompilerMojo.java
Sun Dec 2 13:15:38 2012
@@ -17,7 +17,6 @@
package org.apache.flex.maven.plugins.flex.compiler;
import org.apache.flex.maven.plugins.flex.AbstractFlexMojo;
-import org.apache.maven.MavenExecutionException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
@@ -63,7 +62,7 @@ public class CompilerMojo extends Abstra
private Settings settings;
public void execute() {
-
if(mojoEcecution.getLifecyclePhase().equalsIgnoreCase(LifecyclePhase.COMPILE.toString()))
{
+
if(mojoEcecution.getLifecyclePhase().equals(LifecyclePhase.COMPILE.id())) {
if(useLegacyCompiler) {
if(project.getPackaging().equalsIgnoreCase("SWC")) {
compilerMap.get("compc").compile();
@@ -75,7 +74,7 @@ public class CompilerMojo extends Abstra
} else {
compilerMap.get("falcon").compile();
}
- } else
if(mojoEcecution.getLifecyclePhase().equalsIgnoreCase(LifecyclePhase.PROCESS_SOURCES.toString()))
{
+ } else
if(mojoEcecution.getLifecyclePhase().equals(LifecyclePhase.PROCESS_SOURCES.id()))
{
compilerMap.get("asdoc").compile();
}
}
Modified:
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1416171&r1=1416170&r2=1416171&view=diff
==============================================================================
---
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/resources/META-INF/plexus/components.xml
Sun Dec 2 13:15:38 2012
@@ -14,9 +14,9 @@
<phases>
<!--validate></validate>
<initialize></initialize>
- <generate-sources></generate-sources>
- <process-sources></process-sources>
- <generate-resources></generate-resources>
+ <generate-sources></generate-sources-->
+
<process-sources>org.apache.maven.plugins:maven-flex-plugin:compile</process-sources>
+ <!--generate-resources></generate-resources>
<process-resources></process-resources-->
<compile>org.apache.maven.plugins:maven-flex-plugin:compile</compile>
<!--process-classes></process-classes>
@@ -52,9 +52,9 @@
<phases>
<!--validate></validate>
<initialize></initialize>
- <generate-sources></generate-sources>
- <process-sources></process-sources>
- <generate-resources></generate-resources>
+ <generate-sources></generate-sources-->
+
<process-sources>org.apache.maven.plugins:maven-flex-plugin:compile</process-sources>
+ <!--generate-resources></generate-resources>
<process-resources></process-resources-->
<compile>org.apache.maven.plugins:maven-flex-plugin:compile</compile>
<!--process-classes></process-classes>
Modified:
incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swc/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swc/pom.xml?rev=1416171&r1=1416170&r2=1416171&view=diff
==============================================================================
---
incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swc/pom.xml
(original)
+++
incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swc/pom.xml
Sun Dec 2 13:15:38 2012
@@ -36,7 +36,7 @@
<version>1.0.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <useLegacyCompiler>true</useLegacyCompiler>
+ <useLegacyCompiler>false</useLegacyCompiler>
</configuration>
</plugin>
</plugins>
Modified:
incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swf/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swf/pom.xml?rev=1416171&r1=1416170&r2=1416171&view=diff
==============================================================================
---
incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swf/pom.xml
(original)
+++
incubator/flex/utilities/trunk/maven-flex-plugin/testsuite/projects/concepts/flex/general/simple-swf/pom.xml
Sun Dec 2 13:15:38 2012
@@ -36,7 +36,7 @@
<version>1.0.0-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
- <useLegacyCompiler>true</useLegacyCompiler>
+ <useLegacyCompiler>false</useLegacyCompiler>
</configuration>
</plugin>
</plugins>
