You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/07/28 23:10:09 UTC
svn commit: r1507846 [3/3] - in /myfaces/core/trunk/impl: ./
src/main/java/org/apache/myfaces/application/
src/main/java/org/apache/myfaces/config/
src/main/java/org/apache/myfaces/config/element/
src/main/java/org/apache/myfaces/config/impl/digester/ ...
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfiguratorDefaultValidatorsTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfiguratorDefaultValidatorsTestCase.java?rev=1507846&r1=1507845&r2=1507846&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfiguratorDefaultValidatorsTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/FacesConfiguratorDefaultValidatorsTestCase.java Sun Jul 28 21:10:08 2013
@@ -27,10 +27,14 @@ import javax.faces.validator.BeanValidat
import javax.faces.validator.LengthValidator;
import javax.faces.validator.RequiredValidator;
import javax.faces.webapp.FacesServlet;
+import org.apache.myfaces.application.ApplicationFactoryImpl;
-import org.apache.myfaces.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit4.AbstractJsfConfigurableMockTestCase;
import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.apache.myfaces.util.ExternalSpecifications;
+import org.apache.myfaces.view.ViewDeclarationLanguageFactoryImpl;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Test cases for the installation of default validators (e.g. BeanValidator).
@@ -38,17 +42,16 @@ import org.apache.myfaces.util.ExternalS
* @version $Revision$ $Date$
* @since 2.0
*/
-public class FacesConfiguratorDefaultValidatorsTestCase extends AbstractJsfTestCase
+public class FacesConfiguratorDefaultValidatorsTestCase extends AbstractJsfConfigurableMockTestCase
{
private FacesConfigurator facesConfigurator;
- public FacesConfiguratorDefaultValidatorsTestCase(String name)
+ public FacesConfiguratorDefaultValidatorsTestCase()
{
- super(name);
}
- protected void setUp() throws Exception
+ public void setUp() throws Exception
{
super.setUp();
@@ -56,12 +59,22 @@ public class FacesConfiguratorDefaultVal
}
@Override
- protected void tearDown() throws Exception
+ public void tearDown() throws Exception
{
facesConfigurator = null;
super.tearDown();
}
+
+ @Override
+ public void setFactories() throws Exception
+ {
+ super.setFactories();
+ FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY,
+ ApplicationFactoryImpl.class.getName());
+ FactoryFinder.setFactory(FactoryFinder.VIEW_DECLARATION_LANGUAGE_FACTORY,
+ ViewDeclarationLanguageFactoryImpl.class.getName());
+ }
/**
* We have to reset MockRenderKitFactory before, because the FacesConfigurator
@@ -110,6 +123,7 @@ public class FacesConfiguratorDefaultVal
* javax.faces.validator.DISABLE_DEFAULT_BEAN_VALIDATOR, but it is defined in the faces-config.
* In this case the bean validator should be installed as a default validator.
*/
+ @Test
public void testDefaultBeanValidatorDisabledButPresentInFacesConfig()
{
// remove existing RenderKit installations
@@ -136,7 +150,7 @@ public class FacesConfiguratorDefaultVal
// the bean validator has to be installed, because
// of the entry in default-bean-validator.xml
- assertTrue(application.getDefaultValidatorInfo()
+ Assert.assertTrue(application.getDefaultValidatorInfo()
.containsKey(BeanValidator.VALIDATOR_ID));
}
@@ -146,6 +160,7 @@ public class FacesConfiguratorDefaultVal
* is no faces-config file that would install it manually.
* In this case the BeanValidator mustn't be installed.
*/
+ @Test
public void testDefaultBeanValidatorDisabled()
{
// remove existing RenderKit installations
@@ -169,7 +184,7 @@ public class FacesConfiguratorDefaultVal
// the bean validator must not be installed, because it
// has been disabled and there is no entry in the faces-config
// that would install it manually.
- assertFalse(application.getDefaultValidatorInfo()
+ Assert.assertFalse(application.getDefaultValidatorInfo()
.containsKey(BeanValidator.VALIDATOR_ID));
}
@@ -177,6 +192,7 @@ public class FacesConfiguratorDefaultVal
* Tests the case that bean validation is not available in the classpath.
* In this case the BeanValidator must not be installed.
*/
+ @Test
public void testBeanValidationNotAvailable()
{
// remove existing RenderKit installations
@@ -194,7 +210,7 @@ public class FacesConfiguratorDefaultVal
// the bean validator mustn't be installed, because
// bean validation is not available in the classpath
- assertFalse(application.getDefaultValidatorInfo()
+ Assert.assertFalse(application.getDefaultValidatorInfo()
.containsKey(BeanValidator.VALIDATOR_ID));
}
@@ -206,6 +222,7 @@ public class FacesConfiguratorDefaultVal
* In this case the RequiredValidator must not be installed, however the BeanValidator
* has to be installed (automatically) since bean validation is available.
*/
+ @Test
public void testDefaultValidatorsClearedByLatterConfigFileWithEmptyElement()
{
// remove existing RenderKit installations
@@ -232,10 +249,10 @@ public class FacesConfiguratorDefaultVal
// the required validator must not be installed, because the latter config file
// (empty-default-validators.xml) has an empty default validators element
// and this cleares all existing default-validators.
- assertFalse(application.getDefaultValidatorInfo().containsKey(RequiredValidator.VALIDATOR_ID));
+ Assert.assertFalse(application.getDefaultValidatorInfo().containsKey(RequiredValidator.VALIDATOR_ID));
// and since bean validation is available, the BeanValidator has to be installed
- assertTrue(application.getDefaultValidatorInfo().containsKey(BeanValidator.VALIDATOR_ID));
+ Assert.assertTrue(application.getDefaultValidatorInfo().containsKey(BeanValidator.VALIDATOR_ID));
}
/**
@@ -246,6 +263,7 @@ public class FacesConfiguratorDefaultVal
* config file does not specify and default-validator information. Furthermore the
* BeanValidator must also be installed since bean validation is available.
*/
+ @Test
public void testDefaultValidatorsNotClearedByLatterConfigFileWithNoElement()
{
// remove existing RenderKit installations
@@ -271,10 +289,10 @@ public class FacesConfiguratorDefaultVal
// the required validator must be installed, because the latter config file
// (no-default-validators.xml) has not got a default validators element.
- assertTrue(application.getDefaultValidatorInfo().containsKey(RequiredValidator.VALIDATOR_ID));
+ Assert.assertTrue(application.getDefaultValidatorInfo().containsKey(RequiredValidator.VALIDATOR_ID));
// and since bean validation is available, the BeanValidator has to be installed
- assertTrue(application.getDefaultValidatorInfo().containsKey(BeanValidator.VALIDATOR_ID));
+ Assert.assertTrue(application.getDefaultValidatorInfo().containsKey(BeanValidator.VALIDATOR_ID));
}
/**
@@ -286,6 +304,7 @@ public class FacesConfiguratorDefaultVal
* LengthValidator has to be installed (and the BeanValidator must not be installed
* since bean validation is not available).
*/
+ @Test
public void testDefaultValidatorsOverwrittenByLatterConfigFile()
{
// remove existing RenderKit installations
@@ -312,14 +331,14 @@ public class FacesConfiguratorDefaultVal
// the required validator must not be installed, because the latter config file
// (default-length-validator.xml) specifies a default validators element
// and this cleares all existing default-validators.
- assertFalse(application.getDefaultValidatorInfo().containsKey(RequiredValidator.VALIDATOR_ID));
+ Assert.assertFalse(application.getDefaultValidatorInfo().containsKey(RequiredValidator.VALIDATOR_ID));
// the length validator has to be installed, because it was installed
// by the latter config file
- assertTrue(application.getDefaultValidatorInfo().containsKey(LengthValidator.VALIDATOR_ID));
+ Assert.assertTrue(application.getDefaultValidatorInfo().containsKey(LengthValidator.VALIDATOR_ID));
// and since bean validation is not available, the BeanValidator must not be installed
- assertFalse(application.getDefaultValidatorInfo().containsKey(BeanValidator.VALIDATOR_ID));
+ Assert.assertFalse(application.getDefaultValidatorInfo().containsKey(BeanValidator.VALIDATOR_ID));
}
}
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java?rev=1507846&r1=1507845&r2=1507846&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/impl/digister/DigesterFacesConfigUnmarshallerImplTest.java Sun Jul 28 21:10:08 2013
@@ -217,7 +217,7 @@ public class DigesterFacesConfigUnmarsha
assertEquals(1, facesFlowDefinition.getFlowCallList().size());
FacesFlowCall facesFlowCall = facesFlowDefinition.getFlowCallList().get(0);
assertEquals("flowCall", facesFlowCall.getId());
- assertEquals("flow2", facesFlowCall.getCalledFlowId());
+ assertEquals("flow2", facesFlowCall.getFlowReference().getFlowId());
assertEquals(1, facesFlowCall.getOutboundParameterList().size());
FacesFlowParameter facesFlowOutboundParameter = facesFlowCall.getOutboundParameterList().get(0);
assertEquals("name1", facesFlowOutboundParameter.getName());
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/WEB-INF/
------------------------------------------------------------------------------
bugtraq:number = true
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/WEB-INF/flow1-flow.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/WEB-INF/flow1-flow.xml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/WEB-INF/flow1-flow.xml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/WEB-INF/flow1-flow.xml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,99 @@
+<?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://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_2.xsd">
+
+ <flow-definition id="flow1">
+ <start-node>begin</start-node>
+
+ <flow-return id="end">
+ <from-outcome>exit</from-outcome>
+ </flow-return>
+
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>flow1_content</from-outcome>
+ <to-view-id>content</to-view-id>
+ </navigation-case>
+
+ <!-- This navigation rule is a critical point, and very difficult to
+ get it done right. The intention is redirect the exit here and
+ end both flow1 and flow2 in 1 step. Note the from-action is
+ different here and in the final outer navigation case. -->
+ <navigation-case>
+ <from-action>flow2</from-action>
+ <from-outcome>exit</from-outcome>
+ <to-view-id>end</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <flow-call id="call_flow2">
+ <flow-reference>
+ <flow-id>flow2</flow-id>
+ </flow-reference>
+ </flow-call>
+
+ <view id="begin">
+ <vdl-document>/flow1/begin.xhtml</vdl-document>
+ </view>
+ <view id="content">
+ <vdl-document>/flow1/content.xhtml</vdl-document>
+ </view>
+ </flow-definition>
+
+ <flow-definition id="flow2">
+ <start-node>begin</start-node>
+
+ <flow-return id="end">
+ <from-outcome>exit</from-outcome>
+ </flow-return>
+
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>flow2_content</from-outcome>
+ <to-view-id>content</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <view id="begin">
+ <vdl-document>/flow2/begin.xhtml</vdl-document>
+ </view>
+ <view id="content">
+ <vdl-document>/flow2/content.xhtml</vdl-document>
+ </view>
+ </flow-definition>
+
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <!-- End Flow 1 -->
+ <navigation-case>
+ <from-action>flow1</from-action>
+ <from-outcome>exit</from-outcome>
+ <to-view-id>/flow1_end.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+</faces-config>
+
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/WEB-INF/flow1-flow.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/begin.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/begin.xhtml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/begin.xhtml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/begin.xhtml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+ <h1>Myfaces Flow Examples</h1>
+ <h2>begin.xhtml</h2>
+ <h:form id="mainForm">
+ <h:commandButton value="End" action="content"/>
+
+ <h:commandButton id="call_flow2" value="Start Flow 2" action="call_flow2"/>
+ </h:form>
+ <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+ <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/begin.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/content.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/content.xhtml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/content.xhtml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/content.xhtml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+ <h1>Myfaces Flow Examples</h1>
+ <h2>begin.xhtml</h2>
+ <h:form id="mainForm">
+ <h:commandButton value="End" action="end"/>
+ </h:form>
+ <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+ <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1/content.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_1.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_1.xhtml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_1.xhtml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_1.xhtml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+<h:head>
+</h:head>
+<h:body>
+ <h:panelGrid columns="1">
+ <h:form id="mainForm">
+ <h:commandButton id="startFlow1" action="flow1" value="Start Flow 1"/>
+ </h:form>
+ </h:panelGrid>
+</h:body>
+</html>
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_1.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_2.xhtml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_2.xhtml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_2.xhtml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+<h:head>
+</h:head>
+<h:body>
+ <h:panelGrid columns="1">
+ <h:form id="mainForm">
+ <h:commandButton id="startFlow1" action="flow1" value="Start Flow 1"/>
+ </h:form>
+ </h:panelGrid>
+</h:body>
+</html>
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_2.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_end.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_end.xhtml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_end.xhtml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_end.xhtml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+<h:head>
+</h:head>
+<h:body>
+ <h:panelGrid columns="1">
+ <h:form id="mainForm">
+ <h:commandButton id="startFlow1" action="flow1" value="Start Flow 1"/>
+ </h:form>
+ </h:panelGrid>
+</h:body>
+</html>
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow1_end.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/begin.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/begin.xhtml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/begin.xhtml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/begin.xhtml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+ <h1>Myfaces Flow Examples</h1>
+ <h2>begin.xhtml</h2>
+ <h:form id="mainForm">
+ <h:commandButton id="content" value="Content" action="content"/>
+ <h:commandButton id="end_flow" value="End" action="end"/>
+ </h:form>
+ <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+ <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/begin.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/content.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/content.xhtml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/content.xhtml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/content.xhtml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+ <h1>Myfaces Flow Examples</h1>
+ <h2>begin.xhtml</h2>
+ <h:form id="mainForm">
+ <h:commandButton id="end_flow" value="End" action="end"/>
+ </h:form>
+ <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+ <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow2/content.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/
------------------------------------------------------------------------------
bugtraq:number = true
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/begin.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/begin.xhtml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/begin.xhtml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/begin.xhtml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+ <h1>Myfaces Flow Examples</h1>
+ <h2>begin.xhtml</h2>
+ <h:form id="mainForm">
+ <h:commandButton value="End" action="content"/>
+ </h:form>
+ <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+ <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/begin.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Added: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/content.xhtml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/content.xhtml?rev=1507846&view=auto
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/content.xhtml (added)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/content.xhtml Sun Jul 28 21:10:08 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+ <h1>Myfaces Flow Examples</h1>
+ <h2>begin.xhtml</h2>
+ <h:form id="mainForm">
+ <h:commandButton value="End" action="end"/>
+ </h:form>
+ <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+ <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
Propchange: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/application/flow/flow3/content.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/config/impl/digister/faces-flow.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/config/impl/digister/faces-flow.xml?rev=1507846&r1=1507845&r2=1507846&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/config/impl/digister/faces-flow.xml (original)
+++ myfaces/core/trunk/impl/src/test/resources/org/apache/myfaces/config/impl/digister/faces-flow.xml Sun Jul 28 21:10:08 2013
@@ -19,7 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">
- <faces-flow-definition id="flow1">
+ <flow-definition id="flow1">
<start-node>node1</start-node>
<view id="outcome2">
<vdl-document>outcome-to-2.xhtml</vdl-document>
@@ -47,9 +47,9 @@
</navigation-case>
</navigation-rule>
<flow-call id="flowCall">
- <faces-flow-reference>
- <faces-flow-id>flow2</faces-flow-id>
- </faces-flow-reference>
+ <flow-reference>
+ <flow-id>flow2</flow-id>
+ </flow-reference>
<outbound-parameter>
<name>name1</name>
<value>value1</value>
@@ -65,5 +65,5 @@
<name>name1</name>
<value>value1</value>
</inbound-parameter>
- </faces-flow-definition>
+ </flow-definition>
</faces-config>