You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/10/05 03:51:40 UTC
svn commit: r453103 - in /incubator/adffaces/branches/faces-1_2:
plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/
trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/
trinida...
Author: awiner
Date: Wed Oct 4 20:51:39 2006
New Revision: 453103
URL: http://svn.apache.org/viewvc?view=rev&rev=453103
Log:
Fix bugs found when running against Glassfish - Trinidad is now basically working on JSF 1.2. Still a few odds-and-ends to tie up.
Modified:
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Iterator.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Menu.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationLevel.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/MethodExpressionMethodBinding.java
Modified: incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java (original)
+++ incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java Wed Oct 4 20:51:39 2006
@@ -1956,8 +1956,11 @@
if (_is12())
{
+ out.println("if (" + propVar + " != null)");
+ out.indent();
out.println("bean.setProperty(" + componentClass + "." + propKey + ", " +
"new MethodExpressionMethodBinding(" + propVar + "));");
+ out.unindent();
}
else
{
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Chart.xml Wed Oct 4 20:51:39 2006
@@ -39,7 +39,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>true</mfp:required>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Iterator.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Iterator.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Iterator.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Iterator.xml Wed Oct 4 20:51:39 2006
@@ -78,7 +78,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>true</mfp:required>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Menu.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Menu.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Menu.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Menu.xml Wed Oct 4 20:51:39 2006
@@ -30,9 +30,6 @@
<facet>
<description>the popup menu associated with this menu</description>
<facet-name>popupMenu</facet-name>
- <facet-extension>
- <mfp:required>false</mfp:required>
- </facet-extension>
</facet>
<component-extension>
<mfp:component-family>org.apache.myfaces.trinidad.Menu</mfp:component-family>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationLevel.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationLevel.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationLevel.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationLevel.xml Wed Oct 4 20:51:39 2006
@@ -49,7 +49,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>false</mfp:required>
</property-extension>
</property>
<property>
@@ -61,7 +60,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>false</mfp:required>
<mfp:property-editor>UNSIGNED_INTEGER</mfp:property-editor>
</property-extension>
</property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationPath.xml Wed Oct 4 20:51:39 2006
@@ -51,7 +51,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>false</mfp:required>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/NavigationTree.xml Wed Oct 4 20:51:39 2006
@@ -55,7 +55,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>true</mfp:required>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Page.xml Wed Oct 4 20:51:39 2006
@@ -52,7 +52,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>true</mfp:required>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Process.xml Wed Oct 4 20:51:39 2006
@@ -48,7 +48,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>true</mfp:required>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/SelectRange.xml Wed Oct 4 20:51:39 2006
@@ -102,7 +102,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>true</mfp:required>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml Wed Oct 4 20:51:39 2006
@@ -85,7 +85,6 @@
<mfp:property-metadata>
<mfp:preferred>true</mfp:preferred>
</mfp:property-metadata>
- <mfp:required>true</mfp:required>
</property-extension>
</property>
<property>
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/MethodExpressionMethodBinding.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/MethodExpressionMethodBinding.java?view=diff&rev=453103&r1=453102&r2=453103
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/MethodExpressionMethodBinding.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/MethodExpressionMethodBinding.java Wed Oct 4 20:51:39 2006
@@ -28,6 +28,9 @@
{
public MethodExpressionMethodBinding(MethodExpression expression)
{
+ if (expression == null)
+ throw new NullPointerException();
+
_expression = expression;
}