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/06/07 12:16:00 UTC
git commit: [flex-falcon] [refs/heads/develop] - - Updated the maven
plugin to allow to configure which types of builds a namespace is used in (as,
js or debault (both))
Repository: flex-falcon
Updated Branches:
refs/heads/develop 18fc1fe6f -> c790ef83a
- Updated the maven plugin to allow to configure which types of builds a namespace is used in (as, js or debault (both))
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c790ef83
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c790ef83
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c790ef83
Branch: refs/heads/develop
Commit: c790ef83a4793f7b14fa437ce9af11fbae70ad79
Parents: 18fc1fe
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Tue Jun 7 14:15:54 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Tue Jun 7 14:15:54 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/flex/maven/flexjs/BaseMojo.java | 8 ++++++--
.../org/apache/flex/maven/flexjs/CompileASMojo.java | 12 ++++++++++++
.../apache/flex/maven/flexjs/CompileExternMojo.java | 12 ++++++++++++
.../org/apache/flex/maven/flexjs/CompileJSMojo.java | 11 +++++++++++
.../java/org/apache/flex/maven/flexjs/Namespace.java | 13 +++++++++++++
5 files changed, 54 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c790ef83/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
index 63e78ab..68178a1 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/BaseMojo.java
@@ -94,13 +94,17 @@ public abstract class BaseMojo
protected abstract String getFlexTool();
- protected Namespace[] getNamespaces() {
+ protected List<Namespace> getNamespaces() {
+ List<Namespace> namespaces = new LinkedList<Namespace>();
+ for(Namespace namespace : this.namespaces) {
+ namespaces.add(namespace);
+ }
return namespaces;
}
protected Set<String> getNamespaceUris() {
Set<String> namespaceUris = new HashSet<String>();
- for(Namespace namespace : namespaces) {
+ for(Namespace namespace : getNamespaces()) {
namespaceUris.add(namespace.getUri());
}
return namespaceUris;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c790ef83/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java
index e1d242e..17f453f 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileASMojo.java
@@ -24,6 +24,7 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import java.io.File;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -84,6 +85,17 @@ public class CompileASMojo
}
@Override
+ protected List<Namespace> getNamespaces() {
+ List<Namespace> namespaces = new LinkedList<Namespace>();
+ for(Namespace namespace : super.getNamespaces()) {
+ if(namespace.getType().equals(Namespace.TYPE_DEFAULT) || namespace.getType().equals(Namespace.TYPE_AS)) {
+ namespaces.add(namespace);
+ }
+ }
+ return namespaces;
+ }
+
+ @Override
protected boolean includeLibrary(Artifact library) {
return !"extern".equalsIgnoreCase(library.getClassifier());
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c790ef83/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java
index 0126593..393274c 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileExternMojo.java
@@ -26,6 +26,7 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProjectHelper;
import java.io.File;
+import java.util.LinkedList;
import java.util.List;
/**
@@ -89,6 +90,17 @@ public class CompileExternMojo
}
@Override
+ protected List<Namespace> getNamespaces() {
+ List<Namespace> namespaces = new LinkedList<Namespace>();
+ for(Namespace namespace : super.getNamespaces()) {
+ if(namespace.getType().equals(Namespace.TYPE_DEFAULT) || namespace.getType().equals(Namespace.TYPE_JS)) {
+ namespaces.add(namespace);
+ }
+ }
+ return namespaces;
+ }
+
+ @Override
protected boolean includeLibrary(Artifact library) {
return "extern".equalsIgnoreCase(library.getClassifier());
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c790ef83/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
index 371ff05..c1298c0 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
@@ -87,6 +87,17 @@ public class CompileJSMojo
}
@Override
+ protected List<Namespace> getNamespaces() {
+ List<Namespace> namespaces = new LinkedList<Namespace>();
+ for(Namespace namespace : super.getNamespaces()) {
+ if(namespace.getType().equals(Namespace.TYPE_DEFAULT) || namespace.getType().equals(Namespace.TYPE_JS)) {
+ namespaces.add(namespace);
+ }
+ }
+ return namespaces;
+ }
+
+ @Override
protected boolean includeLibrary(Artifact library) {
return "extern".equalsIgnoreCase(library.getClassifier());
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c790ef83/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/Namespace.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/Namespace.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/Namespace.java
index e748863..a8e2bc5 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/Namespace.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/Namespace.java
@@ -5,9 +5,22 @@ package org.apache.flex.maven.flexjs;
*/
public class Namespace {
+ public static final String TYPE_DEFAULT = "default";
+ public static final String TYPE_AS = "as";
+ public static final String TYPE_JS = "js";
+
+ private String type = "default";
private String uri;
private String manifest;
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
public String getUri() {
return uri;
}