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 2012/12/02 16:33:28 UTC
svn commit: r1416190 - in /incubator/flex/utilities/trunk/maven-flex-plugin:
./ components/api/
components/api/src/main/java/org/apache/flex/maven/plugins/flex/compiler/
components/compiler/compiler-asdoc/
components/compiler/compiler-asdoc/src/main/ja...
Author: cdutz
Date: Sun Dec 2 15:33:25 2012
New Revision: 1416190
URL: http://svn.apache.org/viewvc?rev=1416190&view=rev
Log:
- Added the remaining mojos to the default maven lifecycle
- Extended the Compiler interface to provide a reference to the MavenProject in the compile method.
Added:
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompilerMojo.java
- copied, changed from r1416186, incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompileMojo.java
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestGeneratorMojo.java
- copied, changed from r1416186, incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompileMojo.java
Removed:
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompileMojo.java
Modified:
incubator/flex/utilities/trunk/maven-flex-plugin/components/api/pom.xml
incubator/flex/utilities/trunk/maven-flex-plugin/components/api/src/main/java/org/apache/flex/maven/plugins/flex/compiler/Compiler.java
incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/pom.xml
incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/asdoc/AsdocCompilerImpl.java
incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/pom.xml
incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/compc/CompcCompilerImpl.java
incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/pom.xml
incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/src/main/java/org/apache/flex/maven/plugins/flex/compiler/falcon/FalconCompilerImpl.java
incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/pom.xml
incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/mxmlc/MxmlcCompilerImpl.java
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/pom.xml
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/java/org/apache/flex/maven/plugins/flex/generator/GeneratorMojo.java
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/optimizer/OptimizerMojo.java
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/packager/PackagerMojo.java
incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestRunnerMojo.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/plugins/maven-mavenizer-plugin/pom.xml
incubator/flex/utilities/trunk/maven-flex-plugin/pom.xml
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/api/pom.xml?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/api/pom.xml (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/api/pom.xml Sun Dec 2 15:33:25 2012
@@ -36,4 +36,11 @@
<name>Maven-Flex-Plugin / Components / API</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/api/src/main/java/org/apache/flex/maven/plugins/flex/compiler/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/api/src/main/java/org/apache/flex/maven/plugins/flex/compiler/Compiler.java?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/api/src/main/java/org/apache/flex/maven/plugins/flex/compiler/Compiler.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/api/src/main/java/org/apache/flex/maven/plugins/flex/compiler/Compiler.java Sun Dec 2 15:33:25 2012
@@ -16,6 +16,8 @@
*/
package org.apache.flex.maven.plugins.flex.compiler;
+import org.apache.maven.project.MavenProject;
+
/**
* Created with IntelliJ IDEA.
* User: cdutz
@@ -24,6 +26,6 @@ package org.apache.flex.maven.plugins.fl
*/
public interface Compiler {
- void compile();
+ void compile(MavenProject project);
}
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/pom.xml?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/pom.xml (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/pom.xml Sun Dec 2 15:33:25 2012
@@ -63,12 +63,10 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/asdoc/AsdocCompilerImpl.java
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/asdoc/AsdocCompilerImpl.java?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/asdoc/AsdocCompilerImpl.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-asdoc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/asdoc/AsdocCompilerImpl.java Sun Dec 2 15:33:25 2012
@@ -17,6 +17,7 @@
package org.apache.flex.maven.plugins.flex.compiler.asdoc;
import org.apache.flex.maven.plugins.flex.compiler.Compiler;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
/**
@@ -28,13 +29,9 @@ import org.codehaus.plexus.component.ann
@Component(role = Compiler.class, hint = "asdoc")
public class AsdocCompilerImpl implements Compiler {
- public AsdocCompilerImpl() {
- System.out.println("Compiler Instance Created: Asdoc");
- }
-
@Override
- public void compile() {
- System.out.println("Executing Compiler: Asdoc");
+ public void compile(MavenProject project) {
+ System.out.println("Executing compile: Asdoc");
}
}
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/pom.xml?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/pom.xml (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/pom.xml Sun Dec 2 15:33:25 2012
@@ -63,12 +63,10 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/compc/CompcCompilerImpl.java
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/compc/CompcCompilerImpl.java?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/compc/CompcCompilerImpl.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-compc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/compc/CompcCompilerImpl.java Sun Dec 2 15:33:25 2012
@@ -17,6 +17,7 @@
package org.apache.flex.maven.plugins.flex.compiler.compc;
import org.apache.flex.maven.plugins.flex.compiler.Compiler;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
/**
@@ -28,13 +29,9 @@ import org.codehaus.plexus.component.ann
@Component(role = Compiler.class, hint = "compc")
public class CompcCompilerImpl implements Compiler {
- public CompcCompilerImpl() {
- System.out.println("Compiler Instance Created: Compc");
- }
-
@Override
- public void compile() {
- System.out.println("Executing Compiler: Compc");
+ public void compile(MavenProject project) {
+ System.out.println("Executing compile: Compc");
}
}
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/pom.xml?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/pom.xml (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/pom.xml Sun Dec 2 15:33:25 2012
@@ -63,12 +63,10 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/src/main/java/org/apache/flex/maven/plugins/flex/compiler/falcon/FalconCompilerImpl.java
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/src/main/java/org/apache/flex/maven/plugins/flex/compiler/falcon/FalconCompilerImpl.java?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/src/main/java/org/apache/flex/maven/plugins/flex/compiler/falcon/FalconCompilerImpl.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-falcon/src/main/java/org/apache/flex/maven/plugins/flex/compiler/falcon/FalconCompilerImpl.java Sun Dec 2 15:33:25 2012
@@ -17,6 +17,7 @@
package org.apache.flex.maven.plugins.flex.compiler.falcon;
import org.apache.flex.maven.plugins.flex.compiler.Compiler;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
/**
@@ -28,13 +29,9 @@ import org.codehaus.plexus.component.ann
@Component(role = Compiler.class, hint = "falcon")
public class FalconCompilerImpl implements Compiler {
- public FalconCompilerImpl() {
- System.out.println("Compiler Instance Created: Falcon");
- }
-
@Override
- public void compile() {
- System.out.println("Executing Compiler: Falcon");
+ public void compile(MavenProject project) {
+ System.out.println("Executing compile: Falcon");
}
}
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/pom.xml?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/pom.xml (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/pom.xml Sun Dec 2 15:33:25 2012
@@ -63,12 +63,10 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/mxmlc/MxmlcCompilerImpl.java
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/mxmlc/MxmlcCompilerImpl.java?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/mxmlc/MxmlcCompilerImpl.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/components/compiler/compiler-mxmlc/src/main/java/org/apache/flex/maven/plugins/flex/compiler/mxmlc/MxmlcCompilerImpl.java Sun Dec 2 15:33:25 2012
@@ -17,6 +17,7 @@
package org.apache.flex.maven.plugins.flex.compiler.mxmlc;
import org.apache.flex.maven.plugins.flex.compiler.Compiler;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Component;
/**
@@ -28,13 +29,9 @@ import org.codehaus.plexus.component.ann
@Component(role = Compiler.class, hint = "mxmlc")
public class MxmlcCompilerImpl implements Compiler {
- public MxmlcCompilerImpl() {
- System.out.println("Compiler Instance Created: MXMLC");
- }
-
@Override
- public void compile() {
- System.out.println("Executing Compiler: MXMLC");
+ public void compile(MavenProject project) {
+ System.out.println("Executing compile: MXMLC");
}
}
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/pom.xml?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/pom.xml (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/pom.xml Sun Dec 2 15:33:25 2012
@@ -64,17 +64,14 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
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=1416190&r1=1416189&r2=1416190&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 15:33:25 2012
@@ -17,12 +17,10 @@
package org.apache.flex.maven.plugins.flex.compiler;
import org.apache.flex.maven.plugins.flex.AbstractFlexMojo;
-import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugins.annotations.*;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
import java.util.Map;
@@ -45,35 +43,26 @@ public class CompilerMojo extends Abstra
protected Map<String, Compiler> compilerMap;
@Component
- protected MavenSession session;
-
- @Component
protected MavenProject project;
@Component
protected MojoExecution mojoEcecution;
- @Component
- protected PluginDescriptor plugin;
-
- @Component
- protected Settings settings;
-
public void execute() {
if(mojoEcecution.getLifecyclePhase().equals(LifecyclePhase.COMPILE.id())) {
if(useLegacyCompiler) {
if(project.getPackaging().equalsIgnoreCase("SWC")) {
- compilerMap.get("compc").compile();
+ compilerMap.get("compc").compile(project);
} else if(project.getPackaging().equalsIgnoreCase("SWF")) {
- compilerMap.get("mxmlc").compile();
+ compilerMap.get("mxmlc").compile(project);
} else {
throw new RuntimeException("Wrong packaging");
}
} else {
- compilerMap.get("falcon").compile();
+ compilerMap.get("falcon").compile(project);
}
} else if(mojoEcecution.getLifecyclePhase().equals(LifecyclePhase.PROCESS_SOURCES.id())) {
- compilerMap.get("asdoc").compile();
+ compilerMap.get("asdoc").compile(project);
}
}
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/generator/GeneratorMojo.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/generator/GeneratorMojo.java?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/generator/GeneratorMojo.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/generator/GeneratorMojo.java Sun Dec 2 15:33:25 2012
@@ -32,7 +32,7 @@ import org.apache.maven.plugins.annotati
public class GeneratorMojo extends AbstractFlexMojo {
public void execute() {
- getLog().debug("Executing generator-mojo");
+ getLog().debug("Executing generate");
}
}
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/optimizer/OptimizerMojo.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/optimizer/OptimizerMojo.java?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/optimizer/OptimizerMojo.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/optimizer/OptimizerMojo.java Sun Dec 2 15:33:25 2012
@@ -32,7 +32,7 @@ import org.apache.maven.plugins.annotati
public class OptimizerMojo extends AbstractFlexMojo {
public void execute() {
- getLog().debug("Executing optimizer-mojo");
+ getLog().debug("Executing optimize");
}
}
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/packager/PackagerMojo.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/packager/PackagerMojo.java?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/packager/PackagerMojo.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/packager/PackagerMojo.java Sun Dec 2 15:33:25 2012
@@ -32,7 +32,7 @@ import org.apache.maven.plugins.annotati
public class PackagerMojo extends AbstractFlexMojo {
public void execute() {
- getLog().debug("Executing packager-mojo");
+ getLog().debug("Executing package");
}
}
Copied: incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompilerMojo.java (from r1416186, incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompileMojo.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/test/TestCompilerMojo.java?p2=incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompilerMojo.java&p1=incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompileMojo.java&r1=1416186&r2=1416190&rev=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompileMojo.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompilerMojo.java Sun Dec 2 15:33:25 2012
@@ -31,19 +31,19 @@ import org.apache.maven.plugins.annotati
defaultPhase = LifecyclePhase.TEST_COMPILE,
requiresDependencyResolution = ResolutionScope.TEST,
threadSafe = true)
-public class TestCompileMojo extends CompilerMojo {
+public class TestCompilerMojo extends CompilerMojo {
public void execute() {
if (useLegacyCompiler) {
if (project.getPackaging().equalsIgnoreCase("SWC")) {
- compilerMap.get("compc").compile();
+ compilerMap.get("compc").compile(project);
} else if (project.getPackaging().equalsIgnoreCase("SWF")) {
- compilerMap.get("mxmlc").compile();
+ compilerMap.get("mxmlc").compile(project);
} else {
throw new RuntimeException("Wrong packaging");
}
} else {
- compilerMap.get("falcon").compile();
+ compilerMap.get("falcon").compile(project);
}
}
Copied: incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestGeneratorMojo.java (from r1416186, incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompileMojo.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/test/TestGeneratorMojo.java?p2=incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestGeneratorMojo.java&p1=incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompileMojo.java&r1=1416186&r2=1416190&rev=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestCompileMojo.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestGeneratorMojo.java Sun Dec 2 15:33:25 2012
@@ -27,24 +27,14 @@ import org.apache.maven.plugins.annotati
* Date: 01.12.12
* Time: 17:48
*/
-@Mojo(name = "test-compile",
- defaultPhase = LifecyclePhase.TEST_COMPILE,
+@Mojo(name = "test-generate",
+ defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES,
requiresDependencyResolution = ResolutionScope.TEST,
threadSafe = true)
-public class TestCompileMojo extends CompilerMojo {
+public class TestGeneratorMojo extends CompilerMojo {
public void execute() {
- if (useLegacyCompiler) {
- if (project.getPackaging().equalsIgnoreCase("SWC")) {
- compilerMap.get("compc").compile();
- } else if (project.getPackaging().equalsIgnoreCase("SWF")) {
- compilerMap.get("mxmlc").compile();
- } else {
- throw new RuntimeException("Wrong packaging");
- }
- } else {
- compilerMap.get("falcon").compile();
- }
+ getLog().debug("Executing test-generate");
}
}
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestRunnerMojo.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/test/TestRunnerMojo.java?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestRunnerMojo.java (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-flex-plugin/src/main/java/org/apache/flex/maven/plugins/flex/test/TestRunnerMojo.java Sun Dec 2 15:33:25 2012
@@ -32,7 +32,7 @@ import org.apache.maven.plugins.annotati
public class TestRunnerMojo extends AbstractFlexMojo {
public void execute() {
- getLog().debug("Executing test-mojo");
+ getLog().debug("Executing test");
}
}
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=1416190&r1=1416189&r2=1416190&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 15:33:25 2012
@@ -13,23 +13,23 @@
<configuration>
<phases>
<!--validate></validate>
- <initialize></initialize>
- <generate-sources></generate-sources-->
+ <initialize></initialize-->
+ <generate-sources>org.apache.maven.plugins:maven-flex-plugin:generate</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>
- <generate-test-sources></generate-test-sources>
- <process-test-sources></process-test-sources>
+ <!--process-classes></process-classes-->
+ <generate-test-sources>org.apache.maven.plugins:maven-flex-plugin:test-generate</generate-test-sources>
+ <!--process-test-sources></process-test-sources>
<generate-test-resources></generate-test-resources>
<process-test-resources></process-test-resources-->
<test-compile>org.apache.maven.plugins:maven-flex-plugin:test-compile</test-compile>
- <!--process-test-classes></process-test-classes>
- <test></test>
- <prepare-package></prepare-package>
- <package></package>
- <pre-integration-test></pre-integration-test>
+ <!--process-test-classes></process-test-classes-->
+ <test>org.apache.maven.plugins:maven-flex-plugin:test</test>
+ <!--prepare-package></prepare-package-->
+ <package>org.apache.maven.plugins:maven-flex-plugin:optimize</package>
+ <!--pre-integration-test></pre-integration-test>
<integration-test></integration-test>
<post-integration-test></post-integration-test>
<verify></verify>
@@ -51,23 +51,23 @@
<configuration>
<phases>
<!--validate></validate>
- <initialize></initialize>
- <generate-sources></generate-sources-->
+ <initialize></initialize-->
+ <generate-sources>org.apache.maven.plugins:maven-flex-plugin:generate</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>
- <generate-test-sources></generate-test-sources>
- <process-test-sources></process-test-sources>
+ <!--process-classes></process-classes-->
+ <generate-test-sources>org.apache.maven.plugins:maven-flex-plugin:test-generate</generate-test-sources>
+ <!--process-test-sources></process-test-sources>
<generate-test-resources></generate-test-resources>
<process-test-resources></process-test-resources-->
<test-compile>org.apache.maven.plugins:maven-flex-plugin:test-compile</test-compile>
- <!--process-test-classes></process-test-classes>
- <test></test>
- <prepare-package></prepare-package>
- <package></package>
- <pre-integration-test></pre-integration-test>
+ <!--process-test-classes></process-test-classes-->
+ <test>org.apache.maven.plugins:maven-flex-plugin:test</test>
+ <!--prepare-package></prepare-package-->
+ <package>org.apache.maven.plugins:maven-flex-plugin:optimize</package>
+ <!--pre-integration-test></pre-integration-test>
<integration-test></integration-test>
<post-integration-test></post-integration-test>
<verify></verify>
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-mavenizer-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-mavenizer-plugin/pom.xml?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-mavenizer-plugin/pom.xml (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/plugins/maven-mavenizer-plugin/pom.xml Sun Dec 2 15:33:25 2012
@@ -64,12 +64,10 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: incubator/flex/utilities/trunk/maven-flex-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/maven-flex-plugin/pom.xml?rev=1416190&r1=1416189&r2=1416190&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/maven-flex-plugin/pom.xml (original)
+++ incubator/flex/utilities/trunk/maven-flex-plugin/pom.xml Sun Dec 2 15:33:25 2012
@@ -71,6 +71,7 @@
<project.encoding>UTF-8</project.encoding>
<project.build.sourceEncoding>${project.encoding}</project.build.sourceEncoding>
<jdk.version>1.6</jdk.version>
+ <maven.version>3.0.4</maven.version>
</properties>
<modules>
@@ -102,4 +103,25 @@
</plugins>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.2</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>
\ No newline at end of file