tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1517461 [1/3] - in /tomee/tomee/trunk/container: openejb-jee-accessors/src/main/java/org/apache/openejb/jee/ openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/ openejb-jee-accessors/src/test/resources/ openejb-jee/src/main/java/or...
Date Mon, 26 Aug 2013 08:43:14 GMT
Author: rmannibucau
Date: Mon Aug 26 08:43:12 2013
New Revision: 1517461

URL: http://svn.apache.org/r1517461
Log:
TOMEE-1021 skipping unknown jsf 2.2 tags - notes: 1) we support new javaee namespace forcing to use the old one, 2) flow-definition is skipped ATM since we will not do anything of it in openejb, 3) flow-definition skip is done directly in sxc generated classes which would need to be regenerated to support it

Added:
    tomee/tomee/trunk/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/FacesConfig22Test.java
    tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/Description.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/DisplayName.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/FacesConfigFlowDefinitionFacesMethodCall.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCallMethod.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFinalizer.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCall.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallFlowReference.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallOutboundParameter.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallParameter.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowReturn.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionInboundParameter.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionInitializer.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionParameterValue.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitch.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionSwitchCase.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionView.java
    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/FacesConfigFromViewId.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigIf.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/FacesConfigNavigationRuleExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigProtectedViews.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigRedirect.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigRedirectRedirectParam.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/JavaIdentifier.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/UrlPattern.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/XmlString.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/XsdString.java
Modified:
    tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java
    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/FacesApplicationExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttributeExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponentExtension.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/FacesConverter.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConverterExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesDefaultLocale.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesELExpression.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacet.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFacetExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactory.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFactoryExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesFromAction.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycle.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLifecycleExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesListEntries.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLocale.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesLocaleConfig.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBean.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedBeanExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesManagedProperty.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesMapEntries.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesMapEntry.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationCase.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRule.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNavigationRuleExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesNullValue.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesProperty.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesPropertyExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRedirect.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesReferencedBean.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKit.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderKitExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRenderer.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesRendererExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesSupportedLocale.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidator.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesValidatorExtension.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/fragment/PersistenceFragment.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/TransactionType.java
    tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/package-info.java

Modified: tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig%24JAXB.java?rev=1517461&r1=1517460&r2=1517461&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java (original)
+++ tomee/tomee/trunk/container/openejb-jee-accessors/src/main/java/org/apache/openejb/jee/FacesConfig$JAXB.java Mon Aug 26 08:43:12 2013
@@ -336,6 +336,9 @@ public class FacesConfig$JAXB
                     }
                 }
                 facesConfigExtension.add(facesConfigExtensionItem);
+            } else if (("flow-definition" == elementReader.getLocalName()) && ("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 {
                 context.unexpectedElement(elementReader, new QName("http://java.sun.com/xml/ns/javaee", "application"), new QName("http://java.sun.com/xml/ns/javaee", "ordering"), new QName("http://java.sun.com/xml/ns/javaee", "absolute-ordering"), new QName("http://java.sun.com/xml/ns/javaee", "factory"), new QName("http://java.sun.com/xml/ns/javaee", "component"), new QName("http://java.sun.com/xml/ns/javaee", "converter"), new QName("http://java.sun.com/xml/ns/javaee", "managed-bean"), new QName("http://java.sun.com/xml/ns/javaee", "name"), new QName("http://java.sun.com/xml/ns/javaee", "navigation-rule"), new QName("http://java.sun.com/xml/ns/javaee", "referenced-bean"), new QName("http://java.sun.com/xml/ns/javaee", "render-kit"), new QName("http://java.sun.com/xml/ns/javaee", "lifecycle"), new QName("http://java.sun.com/xml/ns/javaee", "validator"), new QName("http://java.sun.com/xml/ns/javaee", "behavior"), new QName("http://java.sun.com/xml/ns/javaee", "faces-config-extensio
 n"));
             }

Added: tomee/tomee/trunk/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/FacesConfig22Test.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/FacesConfig22Test.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/FacesConfig22Test.java (added)
+++ tomee/tomee/trunk/container/openejb-jee-accessors/src/test/java/org/apache/openejb/sxc/FacesConfig22Test.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+    * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.sxc;
+
+import org.apache.openejb.jee.FacesConfig;
+import org.junit.Test;
+
+import java.net.URL;
+
+import static org.junit.Assert.assertNotNull;
+
+public class FacesConfig22Test {
+    @Test
+    public void unmarshallFacesConfig22() throws Exception {
+        final URL url = getClass().getClassLoader().getResource("a-faces-config-22.xml");
+        final FacesConfig facesConfig = FacesConfigXml.unmarshal(url);
+        assertNotNull(facesConfig);
+    }
+}

Added: tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml (added)
+++ tomee/tomee/trunk/container/openejb-jee-accessors/src/test/resources/a-faces-config-22.xml Mon Aug 26 08:43:12 2013
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<faces-config version="2.2" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+              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">
+
+  <flow-definition id="flow">
+    <flow-return id="return">
+      <from-outcome>#{bean.out}</from-outcome>
+    </flow-return>
+    <inbound-parameter>
+      <name>name</name>
+      <value>#{flowScope.value}</value>
+    </inbound-parameter>
+    <inbound-parameter>
+      <name>anotherName</name>
+      <value>#{flowScope.value2}</value>
+    </inbound-parameter>
+    <flow-call id="call">
+      <flow-reference>
+        <flow-id>id</flow-id>
+      </flow-reference>
+      <outbound-parameter>
+        <name>out</name>
+        <value>outV</value>
+      </outbound-parameter>
+    </flow-call>
+  </flow-definition>
+</faces-config>

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/Description.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/Description.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/Description.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/Description.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,92 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 
+ *         The description type is used by a description element to
+ *         provide text describing the parent element.  The elements
+ *         that use this type should include any information that the
+ *         Deployment Component's Deployment File file producer wants
+ *         to provide to the consumer of the Deployment Component's
+ *         Deployment File (i.e., to the Deployer). Typically, the
+ *         tools used by such a Deployment File consumer will display
+ *         the description when processing the parent element that
+ *         contains the description.
+ * 
+ *         The lang attribute defines the language that the
+ *         description is provided in. The default value is "en" (English).
+ * 
+ *       
+ * 
+ * <p>Java class for descriptionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="descriptionType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://xmlns.jcp.org/xml/ns/javaee>xsdStringType">
+ *       &lt;attribute ref="{http://www.w3.org/XML/1998/namespace}lang"/>
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "descriptionType")
+public class Description
+    extends XsdString
+{
+
+    @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace")
+    protected java.lang.String lang;
+
+    /**
+     * Gets the value of the lang property.
+     *
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *
+     */
+    public java.lang.String getLang() {
+        return lang;
+    }
+
+    /**
+     * Sets the value of the lang property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *
+     */
+    public void setLang(java.lang.String value) {
+        this.lang = value;
+    }
+
+}

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/DisplayName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/DisplayName.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/DisplayName.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/DisplayName.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ *         [
+ *         The display-name type contains a short name that is intended
+ *         to be displayed by tools. It is used by display-name
+ *         elements.  The display name need not be unique.
+ * 
+ *         Example:
+ * 
+ *         ...
+ *         <display-name xml:lang="en">
+ *         Employee Self Service
+ *         </display-name>
+ * 
+ *         The value of the xml:lang attribute is "en" (English) by default.
+ * 
+ *         
+ *       
+ * 
+ * <p>Java class for display-nameType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="display-nameType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://xmlns.jcp.org/xml/ns/javaee>string">
+ *       &lt;attribute ref="{http://www.w3.org/XML/1998/namespace}lang"/>
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "display-nameType")
+public class DisplayName extends XmlString {
+
+    @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace")
+    protected java.lang.String lang;
+
+    /**
+     * Gets the value of the lang property.
+     *
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *
+     */
+    public java.lang.String getLang() {
+        return lang;
+    }
+
+    /**
+     * Sets the value of the lang property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *
+     */
+    public void setLang(java.lang.String value) {
+        this.lang = value;
+    }
+
+}

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=1517461&r1=1517460&r2=1517461&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 08:43:12 2013
@@ -14,14 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.07.13 at 11:14:43 PM EDT 
-//
-
-
 package org.apache.openejb.jee;
 
 import java.util.ArrayList;

Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationExtension.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationExtension.java?rev=1517461&r1=1517460&r2=1517461&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationExtension.java (original)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationExtension.java Mon Aug 26 08:43:12 2013
@@ -14,14 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.07.13 at 11:14:43 PM EDT 
-//
-
-
 package org.apache.openejb.jee;
 
 import java.util.ArrayList;

Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java?rev=1517461&r1=1517460&r2=1517461&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java (original)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesApplicationResourceBundle.java Mon Aug 26 08:43:12 2013
@@ -14,14 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.07.13 at 11:14:43 PM EDT 
-//
-
-
 package org.apache.openejb.jee;
 
 import java.util.ArrayList;

Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java?rev=1517461&r1=1517460&r2=1517461&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java (original)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttribute.java Mon Aug 26 08:43:12 2013
@@ -14,14 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.07.13 at 11:14:43 PM EDT 
-//
-
-
 package org.apache.openejb.jee;
 
 import java.util.ArrayList;

Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttributeExtension.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttributeExtension.java?rev=1517461&r1=1517460&r2=1517461&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttributeExtension.java (original)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesAttributeExtension.java Mon Aug 26 08:43:12 2013
@@ -14,14 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.07.13 at 11:14:43 PM EDT 
-//
-
-
 package org.apache.openejb.jee;
 
 import java.util.ArrayList;

Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java?rev=1517461&r1=1517460&r2=1517461&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java (original)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponent.java Mon Aug 26 08:43:12 2013
@@ -14,14 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.07.13 at 11:14:43 PM EDT 
-//
-
-
 package org.apache.openejb.jee;
 
 import java.util.ArrayList;

Modified: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponentExtension.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponentExtension.java?rev=1517461&r1=1517460&r2=1517461&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponentExtension.java (original)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesComponentExtension.java Mon Aug 26 08:43:12 2013
@@ -14,14 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.07.13 at 11:14:43 PM EDT 
-//
-
-
 package org.apache.openejb.jee;
 
 import java.util.ArrayList;

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=1517461&r1=1517460&r2=1517461&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 08:43:12 2013
@@ -14,14 +14,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2008.07.13 at 11:14:43 PM EDT
-//
-
-
 package org.apache.openejb.jee;
 
 import java.util.ArrayList;
@@ -81,19 +73,19 @@ import javax.xml.bind.annotation.adapter
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "faces-configType", propOrder = {
     "application",
-        "ordering",
-        "absoluteOrdering",
+    "ordering",
+    "absoluteOrdering",
     "factory",
     "component",
     "converter",
     "managedBean",
-        "name",
+    "name",
     "navigationRule",
     "referencedBean",
     "renderKit",
     "lifecycle",
     "validator",
-        "behavior",
+    "behavior",
     "facesConfigExtension"
 })
 public class FacesConfig {
@@ -119,6 +111,10 @@ public class FacesConfig {
     protected List<FacesBehavior> behavior;
     @XmlElement(name = "faces-config-extension")
     protected List<FacesExtension> facesConfigExtension;
+    @XmlElement(name = "flow-definition")
+    protected List<FacesConfigFlowDefinition> flowDefinitions;
+    @XmlElement(name = "protected-views")
+    protected List<FacesConfigProtectedViews> protectedViews;
     @XmlAttribute
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlID
@@ -158,6 +154,20 @@ public class FacesConfig {
         return this.application;
     }
 
+    public List<FacesConfigFlowDefinition> getFlowDefinitions() {
+        if (flowDefinitions == null) {
+            flowDefinitions = new ArrayList<FacesConfigFlowDefinition>();
+        }
+        return flowDefinitions;
+    }
+
+    public List<FacesConfigProtectedViews> getProtectedViews() {
+        if (protectedViews == null) {
+            protectedViews = new ArrayList<FacesConfigProtectedViews>();
+        }
+        return protectedViews;
+    }
+
     public List<FacesOrdering> getOrdering() {
         if (ordering == null) {
             ordering = new ArrayList<FacesOrdering>();

Added: 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=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinition.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,509 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * 
+ * 
+ * 
+ *         <p class="changed_added_2_2">Top level element for a flow
+ *         definition.</p>
+ * 
+ * <div class="changed_added_2_2">
+ * 
+ * <p>If there is no <code>&lt;start-node&gt;</code> element declared, it
+ * is assumed to be <code>&lt;flowName&gt;.xhtml</code>.</p>
+ * 
+ * </div>
+ * 
+ * 
+ * 
+ * 
+ * <p>Java class for faces-config-flow-definitionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="faces-config-flow-definitionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;group ref="{http://xmlns.jcp.org/xml/ns/javaee}descriptionGroup"/>
+ *         &lt;element name="start-node" type="{http://xmlns.jcp.org/xml/ns/javaee}java-identifierType" minOccurs="0"/>
+ *         &lt;element name="view" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-viewType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="switch" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-switchType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="flow-return" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-flow-returnType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="navigation-rule" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-navigation-ruleType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="flow-call" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-flow-callType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="method-call" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-faces-method-callType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="initializer" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-initializerType" minOccurs="0"/>
+ *         &lt;element name="finalizer" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-finalizerType" minOccurs="0"/>
+ *         &lt;element name="inbound-parameter" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-inbound-parameterType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "faces-config-flow-definitionType", propOrder = {
+    "description",
+    "displayName",
+    "icon",
+    "startNode",
+    "view",
+    "_switch",
+    "flowReturn",
+    "navigationRule",
+    "flowCall",
+    "methodCall",
+    "initializer",
+    "finalizer",
+    "inboundParameter"
+})
+public class FacesConfigFlowDefinition {
+
+    protected List<Description> description;
+    @XmlElement(name = "display-name")
+    protected List<DisplayName> displayName;
+    protected List<Icon> icon;
+    @XmlElement(name = "start-node")
+    protected JavaIdentifier startNode;
+    protected List<FacesConfigFlowDefinitionView> view;
+    @XmlElement(name = "switch")
+    protected List<FacesConfigFlowDefinitionSwitch> _switch;
+    @XmlElement(name = "flow-return")
+    protected List<FacesConfigFlowDefinitionFlowReturn> flowReturn;
+    @XmlElement(name = "navigation-rule")
+    protected List<FacesConfigNavigationRule> navigationRule;
+    @XmlElement(name = "flow-call")
+    protected List<FacesConfigFlowDefinitionFlowCall> flowCall;
+    @XmlElement(name = "method-call")
+    protected List<FacesConfigFlowDefinitionFacesMethodCall> methodCall;
+    protected FacesConfigFlowDefinitionInitializer initializer;
+    protected FacesConfigFlowDefinitionFinalizer finalizer;
+    @XmlElement(name = "inbound-parameter")
+    protected List<FacesConfigFlowDefinitionInboundParameter> inboundParameter;
+    @XmlAttribute(name = "id", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected java.lang.String id;
+
+    /**
+     * Gets the value of the description property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the description property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getDescription().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Description }
+     * 
+     * 
+     */
+    public List<Description> getDescription() {
+        if (description == null) {
+            description = new ArrayList<Description>();
+        }
+        return this.description;
+    }
+
+    /**
+     * Gets the value of the displayName property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the displayName property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getDisplayName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link DisplayName }
+     * 
+     * 
+     */
+    public List<DisplayName> getDisplayName() {
+        if (displayName == null) {
+            displayName = new ArrayList<DisplayName>();
+        }
+        return this.displayName;
+    }
+
+    /**
+     * Gets the value of the icon property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the icon property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getIcon().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Icon }
+     * 
+     * 
+     */
+    public List<Icon> getIcon() {
+        if (icon == null) {
+            icon = new ArrayList<Icon>();
+        }
+        return this.icon;
+    }
+
+    /**
+     * Gets the value of the startNode property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JavaIdentifier }
+     *     
+     */
+    public JavaIdentifier getStartNode() {
+        return startNode;
+    }
+
+    /**
+     * Sets the value of the startNode property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JavaIdentifier }
+     *     
+     */
+    public void setStartNode(JavaIdentifier value) {
+        this.startNode = value;
+    }
+
+    /**
+     * Gets the value of the view property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the view property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getView().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FacesConfigFlowDefinitionView }
+     * 
+     * 
+     */
+    public List<FacesConfigFlowDefinitionView> getView() {
+        if (view == null) {
+            view = new ArrayList<FacesConfigFlowDefinitionView>();
+        }
+        return this.view;
+    }
+
+    /**
+     * Gets the value of the switch property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the switch property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getSwitch().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FacesConfigFlowDefinitionSwitch }
+     * 
+     * 
+     */
+    public List<FacesConfigFlowDefinitionSwitch> getSwitch() {
+        if (_switch == null) {
+            _switch = new ArrayList<FacesConfigFlowDefinitionSwitch>();
+        }
+        return this._switch;
+    }
+
+    /**
+     * Gets the value of the flowReturn property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the flowReturn property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getFlowReturn().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FacesConfigFlowDefinitionFlowReturn }
+     * 
+     * 
+     */
+    public List<FacesConfigFlowDefinitionFlowReturn> getFlowReturn() {
+        if (flowReturn == null) {
+            flowReturn = new ArrayList<FacesConfigFlowDefinitionFlowReturn>();
+        }
+        return this.flowReturn;
+    }
+
+    /**
+     * Gets the value of the navigationRule property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the navigationRule property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getNavigationRule().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FacesConfigNavigationRule }
+     * 
+     * 
+     */
+    public List<FacesConfigNavigationRule> getNavigationRule() {
+        if (navigationRule == null) {
+            navigationRule = new ArrayList<FacesConfigNavigationRule>();
+        }
+        return this.navigationRule;
+    }
+
+    /**
+     * Gets the value of the flowCall property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the flowCall property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getFlowCall().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FacesConfigFlowDefinitionFlowCall }
+     * 
+     * 
+     */
+    public List<FacesConfigFlowDefinitionFlowCall> getFlowCall() {
+        if (flowCall == null) {
+            flowCall = new ArrayList<FacesConfigFlowDefinitionFlowCall>();
+        }
+        return this.flowCall;
+    }
+
+    /**
+     * Gets the value of the methodCall property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the methodCall property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getMethodCall().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FacesConfigFlowDefinitionFacesMethodCall }
+     * 
+     * 
+     */
+    public List<FacesConfigFlowDefinitionFacesMethodCall> getMethodCall() {
+        if (methodCall == null) {
+            methodCall = new ArrayList<FacesConfigFlowDefinitionFacesMethodCall>();
+        }
+        return this.methodCall;
+    }
+
+    /**
+     * Gets the value of the initializer property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link FacesConfigFlowDefinitionInitializer }
+     *     
+     */
+    public FacesConfigFlowDefinitionInitializer getInitializer() {
+        return initializer;
+    }
+
+    /**
+     * Sets the value of the initializer property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link FacesConfigFlowDefinitionInitializer }
+     *     
+     */
+    public void setInitializer(FacesConfigFlowDefinitionInitializer value) {
+        this.initializer = value;
+    }
+
+    /**
+     * Gets the value of the finalizer property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link FacesConfigFlowDefinitionFinalizer }
+     *     
+     */
+    public FacesConfigFlowDefinitionFinalizer getFinalizer() {
+        return finalizer;
+    }
+
+    /**
+     * Sets the value of the finalizer property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link FacesConfigFlowDefinitionFinalizer }
+     *     
+     */
+    public void setFinalizer(FacesConfigFlowDefinitionFinalizer value) {
+        this.finalizer = value;
+    }
+
+    /**
+     * Gets the value of the inboundParameter property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the inboundParameter property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getInboundParameter().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FacesConfigFlowDefinitionInboundParameter }
+     * 
+     * 
+     */
+    public List<FacesConfigFlowDefinitionInboundParameter> getInboundParameter() {
+        if (inboundParameter == null) {
+            inboundParameter = new ArrayList<FacesConfigFlowDefinitionInboundParameter>();
+        }
+        return this.inboundParameter;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public java.lang.String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public void setId(java.lang.String value) {
+        this.id = value;
+    }
+
+}

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCall.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCall.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCall.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCall.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,149 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 
+ *         
+ * 
+ *          <p class="changed_added_2_2">Invoke a method, passing parameters if necessary.
+ *          The return from the method is used as the outcome for where to go next in the
+ *          flow.  If the method is a void method, the default outcome is used.<p> 
+ * 
+ * 
+ *         
+ * 
+ * <p>Java class for faces-config-flow-definition-faces-method-callType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="faces-config-flow-definition-faces-method-callType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="method" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-faces-method-call-methodType"/>
+ *         &lt;element name="default-outcome" type="{http://xmlns.jcp.org/xml/ns/javaee}string"/>
+ *         &lt;element name="parameter" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-flow-call-parameterType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "faces-config-flow-definition-faces-method-callType", propOrder = {
+    "method",
+    "defaultOutcome",
+    "parameter"
+})
+public class FacesConfigFlowDefinitionFacesMethodCall {
+
+    @XmlElement(required = true)
+    protected FacesConfigFlowDefinitionFacesMethodCallMethod method;
+    @XmlElement(name = "default-outcome", required = true)
+    protected String defaultOutcome;
+    protected List<FacesConfigFlowDefinitionFlowCallParameter> parameter;
+
+    /**
+     * Gets the value of the method property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link FacesConfigFlowDefinitionFacesMethodCallMethod }
+     *     
+     */
+    public FacesConfigFlowDefinitionFacesMethodCallMethod getMethod() {
+        return method;
+    }
+
+    /**
+     * Sets the value of the method property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link FacesConfigFlowDefinitionFacesMethodCallMethod }
+     *     
+     */
+    public void setMethod(FacesConfigFlowDefinitionFacesMethodCallMethod value) {
+        this.method = value;
+    }
+
+    /**
+     * Gets the value of the defaultOutcome property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getDefaultOutcome() {
+        return defaultOutcome;
+    }
+
+    /**
+     * Sets the value of the defaultOutcome property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDefaultOutcome(String value) {
+        this.defaultOutcome = value;
+    }
+
+    /**
+     * Gets the value of the parameter property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the parameter property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getParameter().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FacesConfigFlowDefinitionFlowCallParameter }
+     * 
+     * 
+     */
+    public List<FacesConfigFlowDefinitionFlowCallParameter> getParameter() {
+        if (parameter == null) {
+            parameter = new ArrayList<FacesConfigFlowDefinitionFlowCallParameter>();
+        }
+        return this.parameter;
+    }
+
+}

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCallMethod.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCallMethod.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCallMethod.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFacesMethodCallMethod.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,115 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * <p>Java class for faces-config-flow-definition-faces-method-call-methodType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="faces-config-flow-definition-faces-method-call-methodType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://xmlns.jcp.org/xml/ns/javaee>faces-config-el-expressionType">
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "faces-config-flow-definition-faces-method-call-methodType", propOrder = {
+    "value"
+})
+public class FacesConfigFlowDefinitionFacesMethodCallMethod {
+
+    @XmlValue
+    protected java.lang.String value;
+    @XmlAttribute(name = "id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected java.lang.String id;
+
+    /**
+     *
+     *
+     *        <p> EL expressions present within a faces config file
+     *         must start with the character sequence of '#{' and
+     *         end with '}'.</p>
+     *
+     *
+     *
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *
+     */
+    public java.lang.String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *
+     */
+    public void setValue(java.lang.String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *
+     */
+    public java.lang.String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *
+     */
+    public void setId(java.lang.String value) {
+        this.id = value;
+    }
+
+}

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFinalizer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFinalizer.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFinalizer.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFinalizer.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,125 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * 
+ * 
+ *         
+ * 
+ *          <p class="changed_added_2_2">A <code>MethodExpression</code> that will be invoked when the flow is exited.<p>
+ * 
+ * 
+ * 
+ *       
+ * 
+ * <p>Java class for faces-config-flow-definition-finalizerType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="faces-config-flow-definition-finalizerType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://xmlns.jcp.org/xml/ns/javaee>faces-config-el-expressionType">
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "faces-config-flow-definition-finalizerType", propOrder = {
+    "value"
+})
+public class FacesConfigFlowDefinitionFinalizer {
+
+    @XmlValue
+    protected java.lang.String value;
+    @XmlAttribute(name = "id")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected java.lang.String id;
+
+    /**
+     *
+     *
+     *        <p> EL expressions present within a faces config file
+     *         must start with the character sequence of '#{' and
+     *         end with '}'.</p>
+     *
+     *
+     *
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *
+     */
+    public java.lang.String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *
+     */
+    public void setValue(java.lang.String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     *
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *
+     */
+    public java.lang.String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     *
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *
+     */
+    public void setId(java.lang.String value) {
+        this.id = value;
+    }
+
+}

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCall.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCall.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCall.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCall.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,163 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 
+ * 
+ *         
+ * 
+ * <p class="changed_added_2_2">Define a call node in a flow graph.</p>
+ * 
+ * <div class="changed_added_2_2">
+ * 
+ * <p>This element must contain exactly one <code>&lt;flow-reference&gt;</code> element, 
+ * which must contain exactly one <code>&lt;flow-id&gt;</code> element.</p>
+ * </div>
+ * 
+ * 
+ * 
+ *       
+ * 
+ * <p>Java class for faces-config-flow-definition-flow-callType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="faces-config-flow-definition-flow-callType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="flow-reference" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-flow-call-flow-referenceType"/>
+ *         &lt;element name="outbound-parameter" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-flow-call-outbound-parameterType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "faces-config-flow-definition-flow-callType", propOrder = {
+    "flowReference",
+    "outboundParameter"
+})
+public class FacesConfigFlowDefinitionFlowCall {
+
+    @XmlElement(name = "flow-reference", required = true)
+    protected FacesConfigFlowDefinitionFlowCallFlowReference flowReference;
+    @XmlElement(name = "outbound-parameter")
+    protected List<FacesConfigFlowDefinitionFlowCallOutboundParameter> outboundParameter;
+    @XmlAttribute(name = "id", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected java.lang.String id;
+
+    /**
+     * Gets the value of the flowReference property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link FacesConfigFlowDefinitionFlowCallFlowReference }
+     *     
+     */
+    public FacesConfigFlowDefinitionFlowCallFlowReference getFlowReference() {
+        return flowReference;
+    }
+
+    /**
+     * Sets the value of the flowReference property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link FacesConfigFlowDefinitionFlowCallFlowReference }
+     *     
+     */
+    public void setFlowReference(FacesConfigFlowDefinitionFlowCallFlowReference value) {
+        this.flowReference = value;
+    }
+
+    /**
+     * Gets the value of the outboundParameter property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the outboundParameter property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getOutboundParameter().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link FacesConfigFlowDefinitionFlowCallOutboundParameter }
+     * 
+     * 
+     */
+    public List<FacesConfigFlowDefinitionFlowCallOutboundParameter> getOutboundParameter() {
+        if (outboundParameter == null) {
+            outboundParameter = new ArrayList<FacesConfigFlowDefinitionFlowCallOutboundParameter>();
+        }
+        return this.outboundParameter;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public java.lang.String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public void setId(java.lang.String value) {
+        this.id = value;
+    }
+
+}

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallFlowReference.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallFlowReference.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallFlowReference.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallFlowReference.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,118 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 
+ *         
+ * 
+ * <p class="changed_added_2_2">Identifiy the called flow.</p>
+ * 
+ * <div class="changed_added_2_2">
+ * 
+ * </div>
+ * 
+ * 
+ *       
+ * 
+ * <p>Java class for faces-config-flow-definition-flow-call-flow-referenceType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="faces-config-flow-definition-flow-call-flow-referenceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="flow-document-id" type="{http://xmlns.jcp.org/xml/ns/javaee}java-identifierType" minOccurs="0"/>
+ *         &lt;element name="flow-id" type="{http://xmlns.jcp.org/xml/ns/javaee}java-identifierType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "faces-config-flow-definition-flow-call-flow-referenceType", propOrder = {
+    "flowDocumentId",
+    "flowId"
+})
+public class FacesConfigFlowDefinitionFlowCallFlowReference {
+
+    @XmlElement(name = "flow-document-id")
+    protected JavaIdentifier flowDocumentId;
+    @XmlElement(name = "flow-id", required = true)
+    protected JavaIdentifier flowId;
+
+    /**
+     * Gets the value of the flowDocumentId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JavaIdentifier }
+     *     
+     */
+    public JavaIdentifier getFlowDocumentId() {
+        return flowDocumentId;
+    }
+
+    /**
+     * Sets the value of the flowDocumentId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JavaIdentifier }
+     *     
+     */
+    public void setFlowDocumentId(JavaIdentifier value) {
+        this.flowDocumentId = value;
+    }
+
+    /**
+     * Gets the value of the flowId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JavaIdentifier }
+     *     
+     */
+    public JavaIdentifier getFlowId() {
+        return flowId;
+    }
+
+    /**
+     * Sets the value of the flowId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JavaIdentifier }
+     *     
+     */
+    public void setFlowId(JavaIdentifier value) {
+        this.flowId = value;
+    }
+
+}

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallOutboundParameter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallOutboundParameter.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallOutboundParameter.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallOutboundParameter.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,117 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 
+ *         
+ * 
+ *          <p class="changed_added_2_2">A named parameter whose value will be 
+ *          passed to a correspondingly named parameter within an "inbound-parameter" element
+ *          on the target flow.<p>
+ * 
+ * 
+ * 
+ *       
+ * 
+ * <p>Java class for faces-config-flow-definition-flow-call-outbound-parameterType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="faces-config-flow-definition-flow-call-outbound-parameterType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="name" type="{http://xmlns.jcp.org/xml/ns/javaee}java-identifierType"/>
+ *         &lt;element name="value" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-parameter-valueType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "faces-config-flow-definition-flow-call-outbound-parameterType", propOrder = {
+    "name",
+    "value"
+})
+public class FacesConfigFlowDefinitionFlowCallOutboundParameter {
+
+    @XmlElement(required = true)
+    protected JavaIdentifier name;
+    @XmlElement(required = true)
+    protected FacesConfigFlowDefinitionParameterValue value;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link JavaIdentifier }
+     *     
+     */
+    public JavaIdentifier getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link JavaIdentifier }
+     *     
+     */
+    public void setName(JavaIdentifier value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link FacesConfigFlowDefinitionParameterValue }
+     *     
+     */
+    public FacesConfigFlowDefinitionParameterValue getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link FacesConfigFlowDefinitionParameterValue }
+     *     
+     */
+    public void setValue(FacesConfigFlowDefinitionParameterValue value) {
+        this.value = value;
+    }
+
+}

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallParameter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallParameter.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallParameter.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowCallParameter.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,116 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * 
+ * 
+ *         
+ * 
+ *          <p class="changed_added_2_2">A parameter to pass when calling the method
+ *          identified in the "method" element that is a sibling of this element.<p>
+ * 
+ * 
+ * 
+ *       
+ * 
+ * <p>Java class for faces-config-flow-definition-flow-call-parameterType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="faces-config-flow-definition-flow-call-parameterType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="class" type="{http://xmlns.jcp.org/xml/ns/javaee}string" minOccurs="0"/>
+ *         &lt;element name="value" type="{http://xmlns.jcp.org/xml/ns/javaee}faces-config-flow-definition-parameter-valueType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "faces-config-flow-definition-flow-call-parameterType", propOrder = {
+    "clazz",
+    "value"
+})
+public class FacesConfigFlowDefinitionFlowCallParameter {
+
+    @XmlElement(name = "class")
+    protected String clazz;
+    @XmlElement(required = true)
+    protected FacesConfigFlowDefinitionParameterValue value;
+
+    /**
+     * Gets the value of the clazz property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getClazz() {
+        return clazz;
+    }
+
+    /**
+     * Sets the value of the clazz property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setClazz(String value) {
+        this.clazz = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link FacesConfigFlowDefinitionParameterValue }
+     *     
+     */
+    public FacesConfigFlowDefinitionParameterValue getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link FacesConfigFlowDefinitionParameterValue }
+     *     
+     */
+    public void setValue(FacesConfigFlowDefinitionParameterValue value) {
+        this.value = value;
+    }
+
+}

Added: tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowReturn.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowReturn.java?rev=1517461&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowReturn.java (added)
+++ tomee/tomee/trunk/container/openejb-jee/src/main/java/org/apache/openejb/jee/FacesConfigFlowDefinitionFlowReturn.java Mon Aug 26 08:43:12 2013
@@ -0,0 +1,127 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.jee;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+
+/**
+ * 
+ * 
+ *         
+ * 
+ * <p class="changed_added_2_2">Define a return node in a flow graph.</p>
+ * 
+ * <div class="changed_added_2_2">
+ * 
+ * <p>This element must contain exactly one <code>&lt;from-outcome&gt;</code> element.</p>
+ * </div>
+ * 
+ * 
+ * 
+ *       
+ * 
+ * <p>Java class for faces-config-flow-definition-flow-returnType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="faces-config-flow-definition-flow-returnType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="from-outcome" type="{http://xmlns.jcp.org/xml/ns/javaee}string"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "faces-config-flow-definition-flow-returnType", propOrder = {
+    "fromOutcome"
+})
+public class FacesConfigFlowDefinitionFlowReturn {
+
+    @XmlElement(name = "from-outcome", required = true)
+    protected XmlString fromOutcome;
+    @XmlAttribute(name = "id", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlID
+    @XmlSchemaType(name = "ID")
+    protected java.lang.String id;
+
+    /**
+     * Gets the value of the fromOutcome property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XmlString }
+     *     
+     */
+    public XmlString getFromOutcome() {
+        return fromOutcome;
+    }
+
+    /**
+     * Sets the value of the fromOutcome property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XmlString }
+     *     
+     */
+    public void setFromOutcome(XmlString value) {
+        this.fromOutcome = value;
+    }
+
+    /**
+     * Gets the value of the id property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public java.lang.String getId() {
+        return id;
+    }
+
+    /**
+     * Sets the value of the id property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link java.lang.String }
+     *     
+     */
+    public void setId(java.lang.String value) {
+        this.id = value;
+    }
+
+}



Mime
View raw message