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/03 18:27:24 UTC
svn commit: r1519749 - in /myfaces/tobago/trunk:
tobago-core/src/main/faces-config/
tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/
tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/
tobago-example/tobago-example-...
Author: lofwyr
Date: Tue Sep 3 16:27:23 2013
New Revision: 1519749
URL: http://svn.apache.org/r1519749
Log:
Setting all version numbers to (at least) 2.0, otherwise Facelets will not work with mojarra
(TOBAGO-1229: Using Facelets 2.0 from JSF 2.0 instead of Facelets 1.1 from Sun)
Modified:
myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml
Modified: myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/faces-config/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,10 +17,11 @@
* limitations under the License.
-->
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
- version="2.0">
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<default-render-kit-id>tobago</default-render-kit-id>
@@ -44,7 +45,7 @@
<component-type>javax.faces.ViewRoot</component-type>
<component-class>org.apache.myfaces.tobago.component.UIViewRoot</component-class>
</component>
-
+
<managed-bean>
<managed-bean-name>tobagoClientProperties</managed-bean-name>
<managed-bean-class>org.apache.myfaces.tobago.context.ClientProperties</managed-bean-class>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook-cdi/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,10 +17,11 @@
* limitations under the License.
-->
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
- version="2.0">
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<locale-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,11 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<locale-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,11 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<locale-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -20,8 +20,8 @@
<faces-config
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
- version="1.2">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<navigation-handler>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,11 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<locale-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-nonfacesrequest/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,11 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<locale-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-portlet/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,11 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<locale-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-sandbox/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,11 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<locale-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-security/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,11 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<application>
<locale-config>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,11 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<managed-bean>
<managed-bean-name>browser</managed-bean-name>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,11 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<factory>
<faces-context-factory>org.apache.myfaces.tobago.fileupload.FileUploadFacesContextFactoryImpl</faces-context-factory>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/faces-config/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -17,11 +17,10 @@
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
-
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
</faces-config>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml?rev=1519749&r1=1519748&r2=1519749&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/faces-config.xml Tue Sep 3 16:27:23 2013
@@ -15,11 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-<faces-config>
+<faces-config
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
<component>
<component-type>org.apache.myfaces.tobago.Command</component-type>