You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/09/18 00:00:19 UTC
svn commit: r576599 - in
/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces:
AbstractFacesMojo.java GenerateFaceletsTaglibsMojo.java
Author: awiner
Date: Mon Sep 17 15:00:17 2007
New Revision: 576599
URL: http://svn.apache.org/viewvc?rev=576599&view=rev
Log:
TRINIDAD-714: maven-faces-plugin does not generate taglib.xml output for facelets-only environment
- Fix generator so that absence of a tag-class attribute doesn't stop us from generating a Facelets tag
Modified:
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java
myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java?rev=576599&r1=576598&r2=576599&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/AbstractFacesMojo.java Mon Sep 17 15:00:17 2007
@@ -502,7 +502,15 @@
public ComponentTagLibraryFilter(
String namespaceURI)
{
+ this(namespaceURI, true);
+ }
+
+ public ComponentTagLibraryFilter(
+ String namespaceURI,
+ boolean requireTagClass)
+ {
_namespaceURI = namespaceURI;
+ _requireTagClass = requireTagClass;
}
protected boolean accept(
@@ -513,11 +521,13 @@
// accept if tagClass is present
// and if tagName is in the desired namespaceURI
- return (tagClass != null && tagName != null &&
+ return ((!_requireTagClass || (tagClass != null)) &&
+ tagName != null &&
_namespaceURI.equals(tagName.getNamespaceURI()));
}
private final String _namespaceURI;
+ private final boolean _requireTagClass;
}
static final protected class ValidatorTagLibraryFilter extends ValidatorFilter
@@ -525,7 +535,15 @@
public ValidatorTagLibraryFilter(
String namespaceURI)
{
+ this(namespaceURI, true);
+ }
+
+ public ValidatorTagLibraryFilter(
+ String namespaceURI,
+ boolean requireTagClass)
+ {
_namespaceURI = namespaceURI;
+ _requireTagClass = requireTagClass;
}
protected boolean accept(
@@ -536,11 +554,13 @@
// accept if tagClass is present
// and if tagName is in the desired namespaceURI
- return (tagClass != null && tagName != null &&
+ return ((!_requireTagClass || (tagClass != null)) &&
+ tagName != null &&
_namespaceURI.equals(tagName.getNamespaceURI()));
}
private final String _namespaceURI;
+ private final boolean _requireTagClass;
}
static final protected class ConverterTagLibraryFilter extends ConverterFilter
@@ -548,7 +568,15 @@
public ConverterTagLibraryFilter(
String namespaceURI)
{
+ this(namespaceURI, true);
+ }
+
+ public ConverterTagLibraryFilter(
+ String namespaceURI,
+ boolean requireTagClass)
+ {
_namespaceURI = namespaceURI;
+ _requireTagClass = requireTagClass;
}
protected boolean accept(
@@ -559,11 +587,13 @@
// accept if tagClass is present
// and if tagName is in the desired namespaceURI
- return (tagClass != null && tagName != null &&
+ return ((!_requireTagClass || (tagClass != null)) &&
+ tagName != null &&
_namespaceURI.equals(tagName.getNamespaceURI()));
}
private final String _namespaceURI;
+ private final boolean _requireTagClass;
}
static protected class VirtualAttributeFilter extends AttributeFilter
@@ -613,4 +643,4 @@
" * under the License.\n" +
"*/\n";
}
-
\ No newline at end of file
+
Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java?rev=576599&r1=576598&r2=576599&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFaceletsTaglibsMojo.java Mon Sep 17 15:00:17 2007
@@ -92,13 +92,13 @@
FacesConfigBean facesConfig = getFacesConfig();
Iterator components = facesConfig.components();
components = new FilteredIterator(components, new SkipFilter());
- components = new FilteredIterator(components, new ComponentTagLibraryFilter(namespaceURI));
+ components = new FilteredIterator(components, new ComponentTagLibraryFilter(namespaceURI, false));
Iterator validators = facesConfig.validators();
- validators = new FilteredIterator(validators, new ValidatorTagLibraryFilter(namespaceURI));
+ validators = new FilteredIterator(validators, new ValidatorTagLibraryFilter(namespaceURI, false));
Iterator converters = facesConfig.converters();
- converters = new FilteredIterator(converters, new ConverterTagLibraryFilter(namespaceURI));
+ converters = new FilteredIterator(converters, new ConverterTagLibraryFilter(namespaceURI, false));
String targetPath = "META-INF/" + shortName + ".taglib.xml";