TOMEE-1021 fully tolerate faces-config.xml ee namespace even when unknown while we don't upgrade our model
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/849292df Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/849292df Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/849292df Branch: refs/heads/master Commit: 849292df65394762a97cb47e3276715433a3116d Parents: f24db56 Author: Romain Manni-Bucau <rmannibu...@apache.org> Authored: Thu Mar 26 09:23:40 2015 +0100 Committer: Romain Manni-Bucau <rmannibu...@apache.org> Committed: Thu Mar 26 09:23:40 2015 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/jee/FacesConfig$JAXB.java | 2 +- .../src/test/resources/a-faces-config-22.xml | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/849292df/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java ---------------------------------------------------------------------- diff --git a/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java b/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java index e5d1554..3d5c320 100644 --- a/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java +++ b/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java @@ -336,7 +336,7 @@ public class FacesConfig$JAXB } } facesConfigExtension.add(facesConfigExtensionItem); - } else if (("flow-definition" == elementReader.getLocalName()) && ("http://java.sun.com/xml/ns/javaee"; == elementReader.getNamespaceURI())) { + } else if ("http://java.sun.com/xml/ns/javaee"; == elementReader.getNamespaceURI()) { // just here ATM to not prevent users to get JSF 2.2 feature because we can't read it // TODO: read it if we need it (= classes to add to injectable classes, other file to parse to find them etc...) } else { http://git-wip-us.apache.org/repos/asf/tomee/blob/849292df/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml ---------------------------------------------------------------------- diff --git a/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml b/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml index f388a26..1731a63 100644 --- a/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml +++ b/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml @@ -20,7 +20,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd";> - + <factory> + <flash-factory>com.foo.Bar</flash-factory> + <flow-handler-factory>com.foo.Dummy</flow-handler-factory> + </factory> <application> <el-resolver>UnknownButSuperResolver</el-resolver> <resource-library-contracts> @@ -52,4 +55,14 @@ </outbound-parameter> </flow-call> </flow-definition> + <navigation-case> + <from-outcome>myLetters</from-outcome> + <to-view-id>/portal/letter/letterList.xhtml</to-view-id> + <redirect> + <redirect-param> + <name>type</name> + <value>LETTER</value> + </redirect-param> + </redirect> + </navigation-case> </faces-config>
