Author: rmannibucau Date: Mon Aug 26 12:02:44 2013 New Revision: 1517512 URL: http://svn.apache.org/r1517512 Log: fixing faces-config.xml for jsf 2.2 reading (in not blocking mode and not in working mode)
Removed: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFromAction.java tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigNavigationCase.java tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigNavigationRule.java tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigRedirect.java Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplication.java tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfig.java tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/XmlString.java Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplication.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplication.java?rev=1517512&r1=1517511&r2=1517512&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplication.java (original) +++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplication.java Mon Aug 26 12:02:44 2013 @@ -76,12 +76,12 @@ import javax.xml.bind.annotation.adapter "elResolver", "propertyResolver", "variableResolver", - "resourceHandler", - "systemEventListener", + "resourceHandler", + "systemEventListener", "localeConfig", "resourceBundle", "applicationExtension", - "defaultValidators" + "defaultValidators" }) public class FacesApplication { Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfig.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfig.java?rev=1517512&r1=1517511&r2=1517512&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfig.java (original) +++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfig.java Mon Aug 26 12:02:44 2013 @@ -86,7 +86,9 @@ import javax.xml.bind.annotation.adapter "lifecycle", "validator", "behavior", - "facesConfigExtension" + "facesConfigExtension", + "flowDefinitions", + "protectedViews" }) public class FacesConfig { Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java?rev=1517512&r1=1517511&r2=1517512&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java (original) +++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java Mon Aug 26 12:02:44 2013 @@ -105,7 +105,7 @@ public class FacesConfigFlowDefinition { @XmlElement(name = "flow-return") protected List<FacesConfigFlowDefinitionFlowReturn> flowReturn; @XmlElement(name = "navigation-rule") - protected List<FacesConfigNavigationRule> navigationRule; + protected List<FacesNavigationRule> navigationRule; @XmlElement(name = "flow-call") protected List<FacesConfigFlowDefinitionFlowCall> flowCall; @XmlElement(name = "method-call") @@ -340,9 +340,9 @@ public class FacesConfigFlowDefinition { * * */ - public List<FacesConfigNavigationRule> getNavigationRule() { + public List<FacesNavigationRule> getNavigationRule() { if (navigationRule == null) { - navigationRule = new ArrayList<FacesConfigNavigationRule>(); + navigationRule = new ArrayList<FacesNavigationRule>(); } return this.navigationRule; } Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/XmlString.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/XmlString.java?rev=1517512&r1=1517511&r2=1517512&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/XmlString.java (original) +++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/XmlString.java Mon Aug 26 12:02:44 2013 @@ -55,7 +55,7 @@ import javax.xml.bind.annotation.adapter * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "string", propOrder = { +@XmlType(name = "xml-string", propOrder = { "value" }) public class XmlString {