From adffaces-commits-return-923-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Thu Oct 05 03:51:45 2006 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 6867 invoked from network); 5 Oct 2006 03:51:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Oct 2006 03:51:45 -0000 Received: (qmail 44493 invoked by uid 500); 5 Oct 2006 03:51:45 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 44477 invoked by uid 500); 5 Oct 2006 03:51:45 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 44468 invoked by uid 99); 5 Oct 2006 03:51:45 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Oct 2006 20:51:45 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:52133] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 09/CB-20288-F4184254 for ; Wed, 04 Oct 2006 20:51:43 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id F27A71A981A; Wed, 4 Oct 2006 20:51:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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... Date: Thu, 05 Oct 2006 03:51:40 -0000 To: adffaces-commits@incubator.apache.org From: awiner@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061005035140.F27A71A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ true - true 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 @@ true - true 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 @@ the popup menu associated with this menu popupMenu - - false - org.apache.myfaces.trinidad.Menu 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 @@ true - false @@ -61,7 +60,6 @@ true - false UNSIGNED_INTEGER 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 @@ true - false 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 @@ true - true 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 @@ true - true 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 @@ true - true 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 @@ true - true 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 @@ true - true 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; }