TRINIDAD-1898 - Stop using the TagSupport convenience class
plugin part for Converter/Valikdator EL Tag
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java
index 884b5a9..6961b1f 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java
@@ -38,7 +38,7 @@
if (is12())
{
- imports.add("javax.faces.webapp.ConverterELTag");
+ imports.add("org.apache.myfaces.trinidadinternal.taglib.ConverterELTag");
imports.add("javax.faces.context.FacesContext");
imports.add("javax.faces.application.Application");
}
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
index 04c0d91..6f3b771 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
@@ -38,7 +38,7 @@
if (is12())
{
- imports.add("javax.faces.webapp.ValidatorELTag");
+ imports.add("org.apache.myfaces.trinidadinternal.taglib.ValidatorELTag");
imports.add("javax.faces.context.FacesContext");
imports.add("javax.faces.application.Application");
}
diff --git a/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/ReduceJavascriptMojo.java b/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/ReduceJavascriptMojo.java
index 8cbe440..35e194d 100644
--- a/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/ReduceJavascriptMojo.java
+++ b/maven-javascript-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/javascript/ReduceJavascriptMojo.java
@@ -55,7 +55,10 @@
{
Resource resource = new Resource();
resource.setDirectory(targetDirectory.getCanonicalPath());
- project.addResource(resource);
+ if (!this.addResource)
+ {
+ project.addResource(resource);
+ }
// TODO: switch Optimized, not Debug, to be the special-case
// so that Debug can be processed as ordinary resource copy
@@ -162,4 +165,8 @@
*/
private String optimizeTargetPath;
+ /**
+ * @parameter
+ */
+ private boolean addResource;
}
