You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/11/06 02:18:04 UTC
svn commit: r1031906 -
/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/
Author: lu4242
Date: Sat Nov 6 01:18:03 2010
New Revision: 1031906
URL: http://svn.apache.org/viewvc?rev=1031906&view=rev
Log:
MYFACES-2963 Set default templates automatically when jsfVersion is 20 or 2.0 with myfaces-builder-plugin
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConverterTagsMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConvertersMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeTagsMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorTagsMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorsMojo.java
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConverterTagsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConverterTagsMojo.java?rev=1031906&r1=1031905&r2=1031906&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConverterTagsMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConverterTagsMojo.java Sat Nov 6 01:18:03 2010
@@ -420,7 +420,7 @@ public class MakeConverterTagsMojo exten
{
if (templateTagName == null)
{
- if (_is12())
+ if (_is12() || _is20())
{
return "tagConverterClass12.vm";
}
@@ -440,4 +440,9 @@ public class MakeConverterTagsMojo exten
return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
}
+ private boolean _is20()
+ {
+ return "2.0".equals(jsfVersion) || "20".equals(jsfVersion);
+ }
+
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConvertersMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConvertersMojo.java?rev=1031906&r1=1031905&r2=1031906&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConvertersMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConvertersMojo.java Sat Nov 6 01:18:03 2010
@@ -416,7 +416,7 @@ public class MakeConvertersMojo extends
{
if (templateConverterName == null)
{
- if (_is12())
+ if (_is12() || _is20())
{
return "converterClass12.vm";
}
@@ -436,4 +436,10 @@ public class MakeConvertersMojo extends
return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
}
+
+ private boolean _is20()
+ {
+ return "2.0".equals(jsfVersion) || "20".equals(jsfVersion);
+ }
+
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeTagsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeTagsMojo.java?rev=1031906&r1=1031905&r2=1031906&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeTagsMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeTagsMojo.java Sat Nov 6 01:18:03 2010
@@ -419,7 +419,7 @@ public class MakeTagsMojo extends Abstra
{
if (templateTagName == null)
{
- if (_is12())
+ if (_is12() || _is20())
{
return "tagClass12.vm";
}
@@ -439,4 +439,8 @@ public class MakeTagsMojo extends Abstra
return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
}
+ private boolean _is20()
+ {
+ return "2.0".equals(jsfVersion) || "20".equals(jsfVersion);
+ }
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorTagsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorTagsMojo.java?rev=1031906&r1=1031905&r2=1031906&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorTagsMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorTagsMojo.java Sat Nov 6 01:18:03 2010
@@ -420,7 +420,7 @@ public class MakeValidatorTagsMojo exten
{
if (templateTagName == null)
{
- if (_is12())
+ if (_is12() || _is20())
{
return "tagValidatorClass12.vm";
}
@@ -440,4 +440,9 @@ public class MakeValidatorTagsMojo exten
return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
}
+ private boolean _is20()
+ {
+ return "2.0".equals(jsfVersion) || "20".equals(jsfVersion);
+ }
+
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorsMojo.java?rev=1031906&r1=1031905&r2=1031906&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorsMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorsMojo.java Sat Nov 6 01:18:03 2010
@@ -413,7 +413,7 @@ public class MakeValidatorsMojo extends
{
if (templateValidatorName == null)
{
- if (_is12())
+ if (_is12() || _is20())
{
return "validatorClass12.vm";
}
@@ -432,5 +432,11 @@ public class MakeValidatorsMojo extends
{
return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
}
+
+
+ private boolean _is20()
+ {
+ return "2.0".equals(jsfVersion) || "20".equals(jsfVersion);
+ }
}