simple simple JSF2.0/1.2 generation change. We basically treat JSF 2.0 now as JSF 1.2 ...
(this is only the beginning).....
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java
index eaa6732..5e91e97 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateComponentsMojo.java
@@ -119,13 +119,17 @@
String fullClassName = component.getComponentClass();
+ // TODO: This must be changed in the future...
+ JsfVersion version = JsfVersion.getVersion(jsfVersion);
+ boolean isVersionGreaterThan11 = version != JsfVersion.JSF_1_1;
+
if (component.isTrinidadComponent())
{
- generator = new TrinidadComponentGenerator(getLog(), _is12());
+ generator = new TrinidadComponentGenerator(getLog(), isVersionGreaterThan11);
}
else
{
- generator = new MyFacesComponentGenerator(getLog(),_is12() );
+ generator = new MyFacesComponentGenerator(getLog(), isVersionGreaterThan11);
}
try
@@ -275,12 +279,6 @@
}
}
- private boolean _is12()
- {
- return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
- }
-
-
/**
* @parameter expression="${project}"
* @readonly
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
index 39e7bde..c701fad 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateFacesConfigMojo.java
@@ -160,7 +160,7 @@
Result mergedResult = new StreamResult(resultStream);
URL xslURL;
- JsfVersion usedVersion = _getJsfVersion();
+ JsfVersion usedVersion = JsfVersion.getVersion(jsfVersion);
if (usedVersion == JsfVersion.JSF_1_2)
{
xslURL = getClass().getResource("resources/transform12.xsl");
@@ -236,22 +236,6 @@
}
}
- private JsfVersion _getJsfVersion()
- {
- if("1.2".equals(jsfVersion) || "12".equals(jsfVersion))
- {
- return JsfVersion.JSF_1_2;
- }
- else if ("2.0".equals(jsfVersion) || "20".equals(jsfVersion))
- {
- return JsfVersion.JSF_2_0;
- }
- else
- {
- return JsfVersion.JSF_1_1;
- }
- }
-
private String getParameter(String paramName, String defaultValue)
{
String param;
@@ -268,17 +252,6 @@
}
/**
- * Private internal enum to
- * reflect the underlying JSF version.
- */
- private enum JsfVersion
- {
- JSF_1_1,
- JSF_1_2,
- JSF_2_0
- }
-
- /**
* @parameter expression="${project}"
* @readonly
*/
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
index 3fbecae..56fb9b8 100644
--- a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
@@ -236,7 +236,7 @@
TransformerFactory transFactory = TransformerFactory.newInstance();
Transformer identity = transFactory.newTransformer();
- if (!_is12())
+ if (JsfVersion.isJSF11(jsfVersion))
{
identity.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC,
_JSP_TAG_LIBRARY_DOCTYPE_PUBLIC);
@@ -255,7 +255,7 @@
XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
XMLStreamWriter stream = outputFactory.createXMLStreamWriter(out);
- _writeStartTagLibrary(stream, _is12() ? "2.1" : "1.2", shortName, namespaceURI);
+ _writeStartTagLibrary(stream, !JsfVersion.isJSF11(jsfVersion) ? "2.1" : "1.2", shortName, namespaceURI);
while (components.hasNext())
{
ComponentBean component = (ComponentBean)components.next();
@@ -315,12 +315,12 @@
{
stream.writeStartDocument("1.0");
stream.writeCharacters("\n");
- if (!_is12())
+ if (JsfVersion.isJSF11(jsfVersion))
stream.writeDTD(dtd);
stream.writeCharacters("\n");
stream.writeStartElement("taglib");
- if (_is12())
+ if (!JsfVersion.isJSF11(jsfVersion))
{
stream.writeNamespace("", "http://java.sun.com/xml/ns/javaee");
stream.writeNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
@@ -356,7 +356,7 @@
stream.writeCharacters(tlibVersion);
stream.writeEndElement();
- if (!_is12())
+ if (JsfVersion.isJSF11(jsfVersion))
{
stream.writeCharacters("\n ");
stream.writeStartElement("jsp-version");
@@ -394,7 +394,7 @@
stream.writeCharacters("\n ");
// In JSP 2.1, description goes up top
- if (_is12() && component.getDescription() != null)
+ if (!JsfVersion.isJSF11(jsfVersion) && component.getDescription() != null)
{
stream.writeCharacters("\n ");
stream.writeStartElement("description");
@@ -411,7 +411,7 @@
stream.writeEndElement();
// In JSP 2.1, body-content is not optional
- if (_is12())
+ if (!JsfVersion.isJSF11(jsfVersion))
{
stream.writeCharacters("\n ");
stream.writeStartElement("body-content");
@@ -422,7 +422,7 @@
GenerateJspTaglibsMojo.this.writeCustomComponentTagDescriptorContent(stream, component);
// In JSP 2.0, description goes just before the attributes
- if (!_is12() && component.getDescription() != null)
+ if (JsfVersion.isJSF11(jsfVersion) && component.getDescription() != null)
{
stream.writeCharacters("\n ");
stream.writeStartElement("description");
@@ -456,7 +456,7 @@
stream.writeCharacters("\n ");
stream.writeStartElement("tag");
stream.writeCharacters("\n ");
- if (_is12() && converter.getDescription() != null)
+ if (!JsfVersion.isJSF11(jsfVersion) && converter.getDescription() != null)
{
stream.writeCharacters("\n ");
stream.writeStartElement("description");
@@ -473,7 +473,7 @@
stream.writeEndElement();
// In JSP 2.1, body-content is not optional
- if (_is12())
+ if (!JsfVersion.isJSF11(jsfVersion))
{
stream.writeCharacters("\n ");
stream.writeStartElement("body-content");
@@ -481,7 +481,7 @@
stream.writeEndElement();
}
- if (!_is12() && converter.getDescription() != null)
+ if (JsfVersion.isJSF11(jsfVersion) && converter.getDescription() != null)
{
stream.writeCharacters("\n ");
stream.writeStartElement("description");
@@ -551,7 +551,7 @@
stream.writeStartElement("attribute");
// In JSP 2.1, the description goes at the beginning
- if (_is12())
+ if (!JsfVersion.isJSF11(jsfVersion))
_writeTagAttributeDescription(stream, description, unsupportedAgents);
stream.writeCharacters("\n ");
@@ -564,7 +564,7 @@
stream.writeEndElement();
- if (!_is12())
+ if (JsfVersion.isJSF11(jsfVersion))
{
stream.writeCharacters("\n ");
stream.writeStartElement("rtexprvalue");
@@ -667,7 +667,7 @@
stream.writeCharacters("\n ");
stream.writeStartElement("tag");
- if (_is12() && validator.getDescription() != null)
+ if (!JsfVersion.isJSF11(jsfVersion) && validator.getDescription() != null)
{
stream.writeCharacters("\n ");
stream.writeStartElement("description");
@@ -685,7 +685,7 @@
stream.writeEndElement();
// In JSP 2.1, body-content is not optional
- if (_is12())
+ if (!JsfVersion.isJSF11(jsfVersion))
{
stream.writeCharacters("\n ");
stream.writeStartElement("body-content");
@@ -693,7 +693,7 @@
stream.writeEndElement();
}
- if (!_is12() && validator.getDescription() != null)
+ if (JsfVersion.isJSF11(jsfVersion) && validator.getDescription() != null)
{
stream.writeCharacters("\n ");
stream.writeStartElement("description");
@@ -767,13 +767,13 @@
AbstractValidatorTagGenerator validatorGen = null;
if (type == null || "trinidad".equals(type))
{
- converterGen = new TrinidadConverterTagGenerator(is12(), getLicenseHeader(), getLog());
- validatorGen = new TrinidadValidatorTagGenerator(is12(), getLicenseHeader(), getLog());
+ converterGen = new TrinidadConverterTagGenerator(!JsfVersion.isJSF11(jsfVersion), getLicenseHeader(), getLog());
+ validatorGen = new TrinidadValidatorTagGenerator(!JsfVersion.isJSF11(jsfVersion), getLicenseHeader(), getLog());
}
else
{
- converterGen = new MyFacesConverterTagGenerator(is12(), getLicenseHeader(), getLog());
- validatorGen = new MyFacesValidatorTagGenerator(is12(), getLicenseHeader(), getLog());
+ converterGen = new MyFacesConverterTagGenerator(!JsfVersion.isJSF11(jsfVersion), getLicenseHeader(), getLog());
+ validatorGen = new MyFacesValidatorTagGenerator(!JsfVersion.isJSF11(jsfVersion), getLicenseHeader(), getLog());
}
int count = 0;
while (components.hasNext())
@@ -846,11 +846,11 @@
if (component.isTrinidadComponent())
{
- generator = new TrinidadComponentTagGenerator(_is12());
+ generator = new TrinidadComponentTagGenerator(!JsfVersion.isJSF11(jsfVersion));
}
else
{
- generator = new MyFacesComponentTagGenerator(_is12());
+ generator = new MyFacesComponentTagGenerator(!JsfVersion.isJSF11(jsfVersion));
}
getLog().debug("Generating " + fullClassName+", with generator: "+generator.getClass().getName());
@@ -914,16 +914,6 @@
}
}
- protected boolean is12()
- {
- return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
- }
-
- private boolean _is12()
- {
- return is12();
- }
-
private class IfComponentModifiedFilter extends ComponentFilter
{
protected boolean accept(
diff --git a/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/JsfVersion.java b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/JsfVersion.java
new file mode 100644
index 0000000..78573e5
--- /dev/null
+++ b/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/JsfVersion.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.trinidadbuild.plugin.faces;
+
+/**
+ * Private internal enum to
+ * reflect the underlying JSF version.
+ */
+enum JsfVersion
+{
+ JSF_1_1,
+ JSF_1_2,
+ JSF_2_0;
+
+ /**
+ * Helper function to extract the used JSF version.
+ */
+ static JsfVersion getVersion(String jsfVersion)
+ {
+ if(isJSF12(jsfVersion))
+ {
+ return JsfVersion.JSF_1_2;
+ }
+ else if (isJSF20(jsfVersion))
+ {
+ return JsfVersion.JSF_2_0;
+ }
+ else
+ {
+ return JsfVersion.JSF_1_1;
+ }
+ }
+
+ static boolean isJSF11(String jsfVersion)
+ {
+ return ("1.1".equals(jsfVersion) || "11".equals(jsfVersion));
+ }
+ static boolean isJSF12(String jsfVersion)
+ {
+ return ("1.2".equals(jsfVersion) || "12".equals(jsfVersion));
+ }
+ static boolean isJSF20(String jsfVersion)
+ {
+ return ("2.0".equals(jsfVersion) || "20".equals(jsfVersion));
+ }
+}
\ No newline at end of file
