You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2010/03/09 09:20:47 UTC
svn commit: r920729 - in /myfaces/extensions/scripting/trunk:
core/core/src/main/resources/META-INF/
examples/myfaces12-example/src/main/webapp/WEB-INF/
examples/myfaces12-example/src/main/webapp/WEB-INF/facelets/
examples/myfaces20-example/src/main/we...
Author: werpu
Date: Tue Mar 9 08:20:47 2010
New Revision: 920729
URL: http://svn.apache.org/viewvc?rev=920729&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-88
Removed:
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/facelets/extscripting.taglib.xml
Modified:
myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml
myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java
myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml?rev=920729&r1=920728&r2=920729&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/resources/META-INF/extscripting.taglib.xml Tue Mar 9 08:20:47 2010
@@ -18,6 +18,14 @@
* specific language governing permissions and limitations
* under the License.
-->
+<!--
+According to the spec we normally should divide between facelet 1.0 and facelet 2.0
+but since this seems to be a spec errata in the JSF 2.0 rev 0 spec and both implementations
+now pick up facelet 1.0 files as expected we centralize everything and keep everything on 1.2
+jsf level for now.
+Maybe in the long run we will divide both component classes into one for jsf 1.2 and
+one for jsf 2.0 but for now this approach is fine enough.
+-->
<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
<facelet-taglib>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml?rev=920729&r1=920728&r2=920729&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/src/main/webapp/WEB-INF/web.xml Tue Mar 9 08:20:47 2010
@@ -100,7 +100,7 @@
<param-value>D:/dev/work/ideaprojects/threads/extscript/examples/myfaces12-example/src/main/webapp/WEB-INF/java</param-value>
</context-param>
-->
-
+
<context-param>
<description>State saving method: "client" or "server" (= default)
See JSF Specification 2.5.3
@@ -111,7 +111,7 @@
<context-param>
<param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/facelets/groovy-taglib.xml;/WEB-INF/facelets/extscripting.taglib.xml</param-value>
+ <param-value>/WEB-INF/facelets/groovy-taglib.xml</param-value>
</context-param>
<context-param>
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java?rev=920729&r1=920728&r2=920729&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/JSFUtilJava.java Tue Mar 9 08:20:47 2010
@@ -59,7 +59,7 @@ public class JSFUtilJava {
//we use the introspection calls here to achieve our goal that way
//we can shift the dependency resolution from compile time to runtime
return executeMethod(elResolver, "getValue", elContext, null, beanName);
- // return FacesContext.getCurrentInstance().getELContext().getELResolver().getRendererType(FacesContext.getCurrentInstance().getELContext(), null, beanName);
+ //return FacesContext.getCurrentInstance().getELContext().getELResolver().getRendererType(FacesContext.getCurrentInstance().getELContext(), null, beanName);
}
Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml?rev=920729&r1=920728&r2=920729&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml Tue Mar 9 08:20:47 2010
@@ -118,7 +118,7 @@
<context-param>
<param-name>javax.faces.FACELETS_LIBRARIES</param-name>
<param-value>
- /WEB-INF/facelets/groovy-taglib.xml;/WEB-INF/facelets/extscripting.taglib.xml;/WEB-INF/facelets/tomahawk.taglib.xml
+ /WEB-INF/facelets/groovy-taglib.xml;/WEB-INF/facelets/tomahawk.taglib.xml
</param-value>
</context-param>