You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/09/06 17:22:14 UTC
svn commit: r1520594 - in /myfaces/tobago/trunk: src/site/apt/ src/site/fml/
tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/
tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/
tobago-example/tobago-example-addressbook/...
Author: lofwyr
Date: Fri Sep 6 15:22:13 2013
New Revision: 1520594
URL: http://svn.apache.org/r1520594
Log:
Using the new config parameter names
(TOBAGO-1229: Using Facelets 2.0 from JSF 2.0 instead of Facelets 1.1 from Sun)
Modified:
myfaces/tobago/trunk/src/site/apt/migration-2.0.apt
myfaces/tobago/trunk/src/site/fml/faq.fml
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/tobago/trunk/src/site/apt/migration-2.0.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/migration-2.0.apt?rev=1520594&r1=1520593&r2=1520594&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/migration-2.0.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/migration-2.0.apt Fri Sep 6 15:22:13 2013
@@ -79,6 +79,8 @@ Facelets
* Rename all JSTL deklarations from <<<xmlns:c="http://java.sun.com/jstl/core">>> to <<<xmlns:c="http://java.sun.com/jsp/jstl/core">>> in the Facelets.
+ * Ensure the version of the faces-config tag in the faces-config.xml is at least 2.0.
+
[]
Deprecated
Modified: myfaces/tobago/trunk/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/fml/faq.fml?rev=1520594&r1=1520593&r2=1520594&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/fml/faq.fml (original)
+++ myfaces/tobago/trunk/src/site/fml/faq.fml Fri Sep 6 15:22:13 2013
@@ -70,6 +70,15 @@
<faq id="tobago/facelets">
<question>Does Tobago supports Facelets?</question>
<answer>
+ <p>Tobago 2.0.x:</p>
+ <p>Tobago supports the JSF 2.0 Facelets.
+ Note: Please add following context param in your web.xml</p>
+ <source>
+<context-param>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
+ <param-value>true</param-value>
+</context-param></source>
+ <p>Tobago 1.0.x and 1.5.x:</p>
<p>Tobago supports Facelets with the tobago-facelets.jar.
Note: Please add following context param in your web.xml</p>
<source>
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java?rev=1520594&r1=1520593&r2=1520594&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java Fri Sep 6 15:22:13 2013
@@ -31,7 +31,7 @@ import java.net.URL;
* To configure this ResourceResolver put this code into the web.xml file:
* <pre>
* <context-param>
- * <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ * <param-name>javax.faces.FACELETS_RESOURCE_RESOLVER</param-name>
* <param-value>
* org.apache.myfaces.tobago.facelets.MetaInfResourcesClasspathResourceResolver
* </param-value>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml?rev=1520594&r1=1520593&r2=1520594&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/web.xml Fri Sep 6 15:22:13 2013
@@ -30,17 +30,12 @@
</context-param>
<context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<param-value>true</param-value>
</context-param>
<context-param>
- <param-name>facelets.SKIP_COMMENTS</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ <param-name>javax.faces.FACELETS_RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.tobago.facelets.MetaInfResourcesClasspathResourceResolver</param-value>
</context-param>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml?rev=1520594&r1=1520593&r2=1520594&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/web.xml Fri Sep 6 15:22:13 2013
@@ -33,17 +33,12 @@
</context-param>
<context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<param-value>true</param-value>
</context-param>
<context-param>
- <param-name>facelets.SKIP_COMMENTS</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ <param-name>javax.faces.FACELETS_RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.tobago.facelets.MetaInfResourcesClasspathResourceResolver</param-value>
</context-param>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml?rev=1520594&r1=1520593&r2=1520594&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml Fri Sep 6 15:22:13 2013
@@ -44,22 +44,17 @@
</context-param>
<context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<param-value>true</param-value>
</context-param>
<context-param>
- <param-name>facelets.SKIP_COMMENTS</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-name>javax.faces.FACELETS_VIEW_MAPPINGS</param-name>
<param-value>*.xhtml</param-value>
</context-param>
<context-param>
- <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ <param-name>javax.faces.FACELETS_RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.tobago.facelets.MetaInfResourcesClasspathResourceResolver</param-value>
</context-param>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=1520594&r1=1520593&r2=1520594&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml Fri Sep 6 15:22:13 2013
@@ -377,7 +377,7 @@
You have to define a context parameter in the web.xml:
<context-param>
- <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ <param-name>javax.faces.FACELETS_RESOURCE_RESOLVER</param-name>
<param-value>org.apache.myfaces.tobago.facelets.MetaInfResourcesClasspathResourceResolver</param-value>
</context-param></entry>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/web.xml?rev=1520594&r1=1520593&r2=1520594&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/web.xml Fri Sep 6 15:22:13 2013
@@ -30,17 +30,12 @@
</context-param>
<context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<param-value>true</param-value>
</context-param>
<context-param>
- <param-name>facelets.SKIP_COMMENTS</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-name>javax.faces.FACELETS_VIEW_MAPPINGS</param-name>
<param-value>*.xml</param-value>
</context-param>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml?rev=1520594&r1=1520593&r2=1520594&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/web.xml Fri Sep 6 15:22:13 2013
@@ -39,17 +39,12 @@
</context-param>
<context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<param-value>true</param-value>
</context-param>
<context-param>
- <param-name>facelets.SKIP_COMMENTS</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-name>javax.faces.FACELETS_VIEW_MAPPINGS</param-name>
<param-value>*.xhtml</param-value>
</context-param>