From 0a618b0791b5ed491d3e4f96dff81bacf8ff2cfe Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 7 Feb 2018 21:55:11 -0500 Subject: [PATCH] Streamline XML namespace support towards unversioned schemas Issue: SWF-1701 --- .../main/resources/META-INF/spring.schemas | 8 +- .../faces/config/spring-faces-2.0.xsd | 76 - .../faces/config/spring-faces-2.2.xsd | 97 - ...{spring-faces-2.4.xsd => spring-faces.xsd} | 5 +- .../faces/config/flow-builder-services.xml | 2 +- .../faces/config/resources.xml | 2 +- .../faces/webflow/jsf-flow-beans.xml | 4 +- .../builder/xml/WebFlowEntityResolver.java | 14 +- .../model/builder/xml/package-info.java | 2 +- .../main/resources/META-INF/spring.schemas | 8 +- .../config/spring-webflow-config-2.0.xsd | 438 ----- .../config/spring-webflow-config-2.3.xsd | 490 ----- ...nfig-2.4.xsd => spring-webflow-config.xsd} | 5 +- .../model/builder/xml/spring-webflow-2.0.xsd | 1584 ----------------- ...ing-webflow-2.4.xsd => spring-webflow.xsd} | 3 +- .../upgrade/spring-webflow-1.0-to-2.0.xsl | 2 +- .../webflow/config/flow-builder-services.xml | 2 +- .../webflow/config/flow-executor.xml | 2 +- .../webflow/config/flow-registry.xml | 2 +- .../springframework/webflow/config/flow.xml | 2 +- .../webflow/config/flows/flow1.xml | 2 +- .../webflow/config/flows/flow2.xml | 2 +- .../engine/builder/model/resources/flow.xml | 2 +- .../xml/flow-action-evaluate-action.xml | 2 +- .../builder/xml/flow-action-evaluate-bean.xml | 2 +- .../builder/xml/flow-custom-attribute.xml | 2 +- .../engine/model/builder/xml/flow-empty.xml | 2 +- .../model/builder/xml/flow-endstate.xml | 2 +- .../builder/xml/flow-exception-handler.xml | 2 +- .../flow-formaction-validatormethod-beans.xml | 2 +- .../xml/flow-formaction-validatormethod.xml | 2 +- .../builder/xml/flow-inheritance-child.xml | 2 +- .../builder/xml/flow-inheritance-parent.xml | 2 +- .../xml/flow-inheritance-state-child-alt.xml | 2 +- .../xml/flow-inheritance-state-child.xml | 2 +- ...nheritance-state-invalid-parent-syntax.xml | 2 +- .../xml/flow-inheritance-state-parent.xml | 2 +- .../model/builder/xml/flow-inputoutput.xml | 2 +- .../builder/xml/flow-persistencecontext.xml | 2 +- .../model/builder/xml/flow-secured-state.xml | 2 +- .../builder/xml/flow-secured-transition.xml | 2 +- .../engine/model/builder/xml/flow-secured.xml | 2 +- .../builder/xml/flow-startstate-attribute.xml | 2 +- .../builder/xml/flow-startstate-default.xml | 2 +- .../builder/xml/flow-validation-hints.xml | 2 +- .../engine/model/builder/xml/flow-var.xml | 2 +- .../xml/flow-viewstate-externalredirect.xml | 2 +- .../xml/flow-viewstate-flowredirect.xml | 2 +- .../xml/flow-viewstate-model-binding.xml | 2 +- .../builder/xml/flow-viewstate-popup.xml | 2 +- .../builder/xml/flow-viewstate-redirect.xml | 2 +- .../model/builder/xml/flow-viewstate-var.xml | 2 +- .../model/builder/xml/flow-viewstate-view.xml | 2 +- .../persistence/managed-child-flow.xml | 6 +- .../webflow/persistence/managed-root-flow.xml | 10 +- .../webflow/test/search-flow.xml | 22 +- src/reference/actions.xml | 6 +- src/reference/defining-flows.xml | 10 +- src/reference/flow-managed-persistence.xml | 2 +- src/reference/spring-faces.xml | 10 +- src/reference/spring-js.xml | 8 +- src/reference/system-setup.xml | 4 +- src/reference/views.xml | 8 +- 63 files changed, 107 insertions(+), 2793 deletions(-) delete mode 100644 spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.0.xsd delete mode 100644 spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.2.xsd rename spring-faces/src/main/resources/org/springframework/faces/config/{spring-faces-2.4.xsd => spring-faces.xsd} (98%) delete mode 100644 spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.0.xsd delete mode 100644 spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.3.xsd rename spring-webflow/src/main/resources/org/springframework/webflow/config/{spring-webflow-config-2.4.xsd => spring-webflow-config.xsd} (99%) delete mode 100644 spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd rename spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/{spring-webflow-2.4.xsd => spring-webflow.xsd} (99%) diff --git a/spring-faces/src/main/resources/META-INF/spring.schemas b/spring-faces/src/main/resources/META-INF/spring.schemas index a87f14d6..c0e8326d 100644 --- a/spring-faces/src/main/resources/META-INF/spring.schemas +++ b/spring-faces/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,4 @@ -http\://www.springframework.org/schema/faces/spring-faces-2.0.xsd=org/springframework/faces/config/spring-faces-2.0.xsd -http\://www.springframework.org/schema/faces/spring-faces-2.2.xsd=org/springframework/faces/config/spring-faces-2.2.xsd -http\://www.springframework.org/schema/faces/spring-faces-2.4.xsd=org/springframework/faces/config/spring-faces-2.4.xsd -http\://www.springframework.org/schema/faces/spring-faces.xsd=org/springframework/faces/config/spring-faces-2.4.xsd \ No newline at end of file +http\://www.springframework.org/schema/faces/spring-faces-2.0.xsd=org/springframework/faces/config/spring-faces.xsd +http\://www.springframework.org/schema/faces/spring-faces-2.2.xsd=org/springframework/faces/config/spring-faces.xsd +http\://www.springframework.org/schema/faces/spring-faces-2.4.xsd=org/springframework/faces/config/spring-faces.xsd +http\://www.springframework.org/schema/faces/spring-faces.xsd=org/springframework/faces/config/spring-faces.xsd \ No newline at end of file diff --git a/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.0.xsd b/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.0.xsd deleted file mode 100644 index 445d1b06..00000000 --- a/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.0.xsd +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.2.xsd b/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.2.xsd deleted file mode 100644 index 7955a2be..00000000 --- a/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.2.xsd +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.4.xsd b/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces.xsd similarity index 98% rename from spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.4.xsd rename to spring-faces/src/main/resources/org/springframework/faces/config/spring-faces.xsd index 02261301..e6572fa6 100644 --- a/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces-2.4.xsd +++ b/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces.xsd @@ -4,10 +4,9 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans" targetNamespace="http://www.springframework.org/schema/faces" - elementFormDefault="qualified" attributeFormDefault="unqualified" - version="2.4"> + elementFormDefault="qualified" attributeFormDefault="unqualified"> - + diff --git a/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml b/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml index 1f85ccf0..be22671d 100644 --- a/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml +++ b/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/faces - http://www.springframework.org/schema/faces/spring-faces-2.4.xsd"> + http://www.springframework.org/schema/faces/spring-faces.xsd"> diff --git a/spring-faces/src/test/java/org/springframework/faces/config/resources.xml b/spring-faces/src/test/java/org/springframework/faces/config/resources.xml index f76088f9..df387639 100644 --- a/spring-faces/src/test/java/org/springframework/faces/config/resources.xml +++ b/spring-faces/src/test/java/org/springframework/faces/config/resources.xml @@ -4,7 +4,7 @@ xmlns:faces="http://www.springframework.org/schema/faces" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces-2.2.xsd"> + http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces.xsd"> diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml b/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml index ef9de169..8246ff20 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/jsf-flow-beans.xml @@ -4,9 +4,9 @@ xmlns:flow="http://www.springframework.org/schema/webflow-config" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/webflow-config - http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd"> + http://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd"> diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/WebFlowEntityResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/WebFlowEntityResolver.java index 1dddd44b..607e3639 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/WebFlowEntityResolver.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/WebFlowEntityResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2012 the original author or authors. + * Copyright 2004-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,16 +41,18 @@ import org.xml.sax.SAXException; */ class WebFlowEntityResolver implements EntityResolver { + private static final String SPRING_WEBFLOW_XSD = "spring-webflow.xsd"; + private static final String[] WEBFLOW_VERSIONS = new String[] { "spring-webflow-2.4", "spring-webflow-2.0" }; - public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - if (systemId != null && systemId.indexOf("spring-webflow.xsd") > -1) { - return createInputSource(publicId, systemId, WEBFLOW_VERSIONS[0] + ".xsd"); + + public InputSource resolveEntity(String publicId, String systemId) { + if (systemId != null && systemId.contains(SPRING_WEBFLOW_XSD)) { + return createInputSource(publicId, systemId, SPRING_WEBFLOW_XSD); } for (String element : WEBFLOW_VERSIONS) { if (systemId != null && systemId.indexOf(element) > systemId.lastIndexOf("/")) { - String fileName = systemId.substring(systemId.indexOf(element)); - return createInputSource(publicId, systemId, fileName); + return createInputSource(publicId, systemId, SPRING_WEBFLOW_XSD); } } // let the parser handle it diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/package-info.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/package-info.java index ca930cde..01c12ad8 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/package-info.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/package-info.java @@ -18,7 +18,7 @@ * Defines the XmlFlowModelBuilder, for building FlowModels from XML-based resources. * *

This package also contains the definition of the XML-based flow definition language, defined within - * {@code spring-webflow-2.4.xsd}. See this schema for a detailed description of language elements. + * {@code spring-webflow.xsd}. See this schema for a detailed description of language elements. */ package org.springframework.webflow.engine.model.builder.xml; diff --git a/spring-webflow/src/main/resources/META-INF/spring.schemas b/spring-webflow/src/main/resources/META-INF/spring.schemas index dae657a7..11e3d341 100644 --- a/spring-webflow/src/main/resources/META-INF/spring.schemas +++ b/spring-webflow/src/main/resources/META-INF/spring.schemas @@ -1,4 +1,4 @@ -http\://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd=org/springframework/webflow/config/spring-webflow-config-2.0.xsd -http\://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd=org/springframework/webflow/config/spring-webflow-config-2.3.xsd -http\://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd=org/springframework/webflow/config/spring-webflow-config-2.4.xsd -http\://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd=org/springframework/webflow/config/spring-webflow-config-2.4.xsd \ No newline at end of file +http\://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd=org/springframework/webflow/config/spring-webflow-config.xsd +http\://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd=org/springframework/webflow/config/spring-webflow-config.xsd +http\://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd=org/springframework/webflow/config/spring-webflow-config.xsd +http\://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd=org/springframework/webflow/config/spring-webflow-config.xsd \ No newline at end of file diff --git a/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.0.xsd b/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.0.xsd deleted file mode 100644 index 1fac1a1c..00000000 --- a/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.0.xsd +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - -A XML-based DSL for configuring the Spring Web Flow 2.0 system. -]]> - - - - - - - - - -Each flow definition registered in this registry is assigned a unique identifier. By default, -this identifier is the name of the externalized resource minus its file extension. For example, -a registry containing flow definitions built from the files "orderitem-flow.xml" and "shipping-flow.xml" -would index those definitions by "orderitem-flow" and "shipping-flow" by default. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.3.xsd b/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.3.xsd deleted file mode 100644 index a9640aed..00000000 --- a/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.3.xsd +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - -A XML-based DSL for configuring the Spring Web Flow 2.0 system. -]]> - - - - - - - - - - -Each flow definition registered in this registry is assigned a unique identifier. By default, -this identifier is the name of the externalized resource minus its file extension. For example, -a registry containing flow definitions built from the files "orderitem-flow.xml" and "shipping-flow.xml" -would index those definitions by "orderitem-flow" and "shipping-flow" by default. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.4.xsd b/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config.xsd similarity index 99% rename from spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.4.xsd rename to spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config.xsd index d307a2d6..44b9e513 100644 --- a/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.4.xsd +++ b/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config.xsd @@ -5,8 +5,7 @@ xmlns:beans="http://www.springframework.org/schema/beans" xmlns:tool="http://www.springframework.org/schema/tool" targetNamespace="http://www.springframework.org/schema/webflow-config" - elementFormDefault="qualified" attributeFormDefault="unqualified" - version="2.4"> + elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -19,7 +18,7 @@ A XML-based DSL for configuring the Spring Web Flow 2.0 system. - + diff --git a/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd b/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd deleted file mode 100644 index 130caeca..00000000 --- a/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd +++ /dev/null @@ -1,1584 +0,0 @@ - - - - - - -This schema defines Spring Web Flow's XML-based flow definition language. -
-The root "flow" element in this document defines exactly one flow definition. -A flow definition is a blueprint for a carrying out a conversation with a single user. -
-A flow is composed of one or more states that form the steps of the flow. -Each state executes a behavior when entered. What behavior is executed is a -function of the state's type. Core state types include view states, -action states, subflow states, decision states, and end states. -
-A flow definition has exactly one start state. -Events that occur within states drive state transitions. -]]> - - - - - - - - - - -A flow may also exhibit the following characteristics: -

    -
  • Be annotated with attributes that define descriptive properties that may affect flow execution. -(See the <attribute/> element) - -
  • Be secured -(See the <secured/> element) - -
  • Be a persistence context for managing persistent objects during the course of flow execution. -(See the <persistence-context/> element) - -
  • Instantiate a set of instance variables when started. -(See the <var/> element) - -
  • Map input provided by callers that start it -(See the <input/> element) - -
  • Return output to callers that end it. -(See the <output/> element) - -
  • Execute actions at start time and end time. -(See the <on-start/> and <on-end/> elements) - -
  • Define transitions shared by all states. -(See the <global-transitions/> element) - -
  • Handle exceptions thrown by during flow execution. -(See the <exception-handler/> element) - -
  • Import one or more local bean definition files defining custom flow artifacts -(such as actions, exception handlers, view factories, transition criteria, etc). -(See the <bean-import/> element) -
-]]> - - - - - - - - - - - - - - - - - - - - - - -The persistence context can be referenced from within this flow by the "entityManager" variable. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . -If inheriting from a state defined in another flow, the flowId prefix is required. -If inheriting from a state defined in this flow, the flowId should not be specified. -For example, 
<action-state id="state" parent="myParentFlow#myParentState">
or 
<action-state id="state" parent="#myLocalParentState">
-]]> - - - - - - - - - -Once paused, a view-state may be 'refreshed' by the user. -A refresh causes the response to be reissued and then returns control back to the user. -
-A view state may be configured with one or more render-actions using the 'on-render' element. -Render actions are executed immediately before the view is rendered. -
-A view state is a transitionable state. -A view state transition is triggered by a user event. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . -If inheriting from a state defined in another flow, the flowId prefix is required. -If inheriting from a state defined in this flow, the flowId should not be specified. -For example, 
<view-state id="state" parent="myParentFlow#myParentState">
or 
<view-state id="state" parent="#myLocalParentState">
-]]> - - - - - - - - priceForm.jsp - -Can also be an evaluatable expression: -
-	#{flowScope.myViewExpression}
-
-The externalRedirect: prefix may be used to redirect to an external location, typically to interface with an external system or controller. -External redirect query parameters may be specified using #{expressions} that evaluate against the request context. -The supported formats for an encoded externalRedirect expression are: -
-	externalRedirect:
-	externalRedirect:contextRelative:
-	externalRedirect:serverRelative:
-	externalRedirect:
-
-For example: -
-	externalRedirect:/hotels/index
-	externalRedirect:http://someOtherSystem?orderId=#{order.id}&callbackUrl=#{flowExecutionUrl}
-
-The flowRedirect: prefix may be used to redirect to another flow: -
-	flowRedirect:myOtherFlow?someData=#{flowScope.data}
-
-For exotic usages, you may plug in a custom ViewFactory bean you define: -
-	#{myCustomViewFactory}
-
-When this attribute is not specified, the view to render will be determined by convention. -The default convention is to treat the id of this view state as the view identifier. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -A decision state is a transitionable state. -A decision state transition can be triggered by evaluating a boolean expression against the flow execution request context. -To define transition expressions, use the 'if' element. -
-Examples: -
-A simple boolean expression test, using the convenient 'if' element: -
-    <decision-state id="requiresShipping">
-	    <if test="sale.requiresShipping" then="enterShippingDetails" else="processSale"/>
-    </decision-state>
-
-]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -The form is: -
-	<if test="criteriaExpression" then="trueStateId" else="falseStateId"/>
-
-]]> - - - - - - - - <if test="sale.requiresShipping" then="enterShippingDetails"/> - -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . -If inheriting from a state defined in another flow, the flowId prefix is required. -If inheriting from a state defined in this flow, the flowId should not be specified. -For example, 
<decision-state id="state" parent="myParentFlow#myParentState">
or 
<decision-state id="state" parent="#myLocalParentState">
-]]> - - - - - - - - - -A subflow state is a transitionable state. -A transition is triggered by the subflow outcome that was reached. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . -If inheriting from a state defined in another flow, the flowId prefix is required. -If inheriting from a state defined in this flow, the flowId should not be specified. -For example, 
<subflow-state id="state" parent="myParentFlow#myParentState">
or 
<subflow-state id="state" parent="#myLocalParentState">
-]]> - - - - - - - - - - - - - - - - - - - - - - - -An end state is not transitionable; there are never transitions out of an end state. -When an end-state is entered, an instance of this flow is terminated. -
-When this flow terminates, if it was the "root" flow the entire execution is terminated. -If this flow was a subflow, its parent flow resumes. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . -If inheriting from a state defined in another flow, the flowId prefix is required. -If inheriting from a state defined in this flow, the flowId should not be specified. -For example, 
<end-state id="state" parent="myParentFlow#myParentState">
or 
<end-state id="state" parent="#myLocalParentState">
-]]> - - - - - - - - priceForm.jsp - -It can also be an evaluatable expression: -
-	#{flowScope.myViewExpression}
-
-The externalRedirect: prefix may be used to request a redirect to an external location, typically to interface with an external system or controller. -External redirect query parameters may be specified using #{expressions} that evaluate against the request context. -The supported formats for an encoded externalRedirect expression are: -
-	externalRedirect:
-	externalRedirect:contextRelative:
-	externalRedirect:serverRelative:
-	externalRedirect:
-
-For example: -
-	externalRedirect:/hotels/index
-	externalRedirect:http://someOtherSystem?orderId=#{order.id}
-
-The flowRedirect: prefix may be used to redirect to another flow: -
-	flowRedirect:myOtherFlow?someData=#{flowScope.data}
-
-For exotic usages, you may plug in a custom ViewFactory bean you define: -
-	#{myCustomViewFactory}
-
-
-When this attribute is not specified, no final response will be issued. -In this case, the caller is expected to handle this flow outcome. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -For example: -
-    <bean-import resource="orderitem-flow-beans.xml"/>
-
-... would look for 'orderitem-flow-beans.xml' in the same directory as this document. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Note: Cannot be used in conjunction with an exception based transition. -]]> - - - - - - - - - - <transition on="submit" to="state"/> - -... which reads "on the occurrence of the 'submit' event, transition to 'state'" -
-Sophisticated transitional expressions are also supported when enclosed in a delimited expression: -
-	<transition on="#{currentEvent.id == 'submit' &;amp;& flowScope.attribute == 'foo'}" to="state"/>
-
-]]> - - - - - - - -The value of this attribute must be a fully-qualified java.lang.Exception class name (e.g. example.booking.ItineraryExpiredException). -Superclasses of the configured exception class match by default. Use this attribute or the 'on' attribute, not both. -
-Note: Cannot be used in conjunction with a secured element. -]]> - - - - - - - -The value of this attribute may be a static state identifier (e.g. to="displayForm") or a dynamic expression (e.g. to="#{flowScope.previousViewState}"). -If no value is specified, this transition acts as a simple event handler and will not change the state of the flow. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Note: This element configures a meta-attribute. -For the attribute to be enforced, the flow execution must be observed by a SecurityFlowExecutionListener. -]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.4.xsd b/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow.xsd similarity index 99% rename from spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.4.xsd rename to spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow.xsd index 6b8ecdc3..71dbdc04 100644 --- a/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.4.xsd +++ b/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow.xsd @@ -2,8 +2,7 @@ + elementFormDefault="qualified"> diff --git a/spring-webflow/src/main/resources/org/springframework/webflow/upgrade/spring-webflow-1.0-to-2.0.xsl b/spring-webflow/src/main/resources/org/springframework/webflow/upgrade/spring-webflow-1.0-to-2.0.xsl index 7d8c2d65..7830baab 100644 --- a/spring-webflow/src/main/resources/org/springframework/webflow/upgrade/spring-webflow-1.0-to-2.0.xsl +++ b/spring-webflow/src/main/resources/org/springframework/webflow/upgrade/spring-webflow-1.0-to-2.0.xsl @@ -33,7 +33,7 @@ namespace="http://www.w3.org/2001/XMLSchema-instance"> http://www.springframework.org/schema/webflow - http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd + http://www.springframework.org/schema/webflow/spring-webflow.xsd diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml index 8043f001..8e845bbb 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/webflow-config - http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd"> + http://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml index 643f5933..3f09b46c 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/webflow-config - http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd"> + http://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml index 15033590..ea503b39 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/webflow-config - http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd"> + http://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml index 00011745..55ad0937 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow1.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow1.xml index 00011745..55ad0937 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow1.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow1.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow2.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow2.xml index 00011745..55ad0937 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow2.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flows/flow2.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/resources/flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/resources/flow.xml index 00011745..55ad0937 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/resources/flow.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/resources/flow.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-action.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-action.xml index 7c16d45c..c97b9b58 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-action.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-action.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-bean.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-bean.xml index c85d1dae..cb23e905 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-bean.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-action-evaluate-bean.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-custom-attribute.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-custom-attribute.xml index 4ba5777f..eaa59d43 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-custom-attribute.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-custom-attribute.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-empty.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-empty.xml index cb39f147..e5ec8994 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-empty.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-empty.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> \ No newline at end of file diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-endstate.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-endstate.xml index 00011745..55ad0937 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-endstate.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-endstate.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-exception-handler.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-exception-handler.xml index a94ff736..1edb85f9 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-exception-handler.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-exception-handler.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod-beans.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod-beans.xml index 916314c4..174c860b 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod-beans.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod-beans.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> + http://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod.xml index 2a306b26..c9847920 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-formaction-validatormethod.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-child.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-child.xml index d76941ab..6eb83baf 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-child.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-child.xml @@ -1,6 +1,6 @@ diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-parent.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-parent.xml index d006bd3c..6fc7b8c8 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-parent.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-parent.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child-alt.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child-alt.xml index b9b10c0c..99a63b30 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child-alt.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child-alt.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child.xml index fe147880..fe26ed46 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-child.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-invalid-parent-syntax.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-invalid-parent-syntax.xml index 3c407a37..6c750058 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-invalid-parent-syntax.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-invalid-parent-syntax.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-parent.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-parent.xml index 6225c36a..5c031fc7 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-parent.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inheritance-state-parent.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inputoutput.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inputoutput.xml index 2a9cfd47..9cb4e9b5 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inputoutput.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-inputoutput.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-persistencecontext.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-persistencecontext.xml index a0ec47dc..a8ba0fec 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-persistencecontext.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-persistencecontext.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-state.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-state.xml index e056e496..130c75c1 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-state.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-state.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-transition.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-transition.xml index d006bd3c..6fc7b8c8 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-transition.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured-transition.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured.xml index fdb2b369..7975e797 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-secured.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-attribute.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-attribute.xml index acbfa555..906e08a0 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-attribute.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-attribute.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd" start-state="end"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-default.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-default.xml index 00011745..55ad0937 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-default.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-startstate-default.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-validation-hints.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-validation-hints.xml index 8fa112da..743ec30c 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-validation-hints.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-validation-hints.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-var.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-var.xml index ce830e1e..5c001493 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-var.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-var.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-externalredirect.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-externalredirect.xml index 2f697ef1..29c6fa04 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-externalredirect.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-externalredirect.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-flowredirect.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-flowredirect.xml index 0f310383..7a0436aa 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-flowredirect.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-flowredirect.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-model-binding.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-model-binding.xml index d0ca9a5f..1a4bf613 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-model-binding.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-model-binding.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-popup.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-popup.xml index 20af01de..747c5a53 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-popup.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-popup.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-redirect.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-redirect.xml index fac265e1..12f27372 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-redirect.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-redirect.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-var.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-var.xml index 5b86843f..8643e044 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-var.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-var.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-view.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-view.xml index 352406a5..b61cebc1 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-view.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/flow-viewstate-view.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-child-flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-child-flow.xml index 30e540db..4c57daea 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-child-flow.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-child-flow.xml @@ -1,7 +1,7 @@ - + + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> @@ -14,5 +14,5 @@ - + \ No newline at end of file diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-root-flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-root-flow.xml index 729052c2..70e12d57 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-root-flow.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/managed-root-flow.xml @@ -1,7 +1,7 @@ - + + xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"> @@ -18,17 +18,17 @@ - + - + - + \ No newline at end of file diff --git a/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml index 73060941..2098e1bd 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml +++ b/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml @@ -1,30 +1,30 @@ - - + + - + - + - + - + - - + + - + \ No newline at end of file diff --git a/src/reference/actions.xml b/src/reference/actions.xml index e6bc3dde..0a55dd7e 100644 --- a/src/reference/actions.xml +++ b/src/reference/actions.xml @@ -35,7 +35,7 @@ + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> @@ -278,7 +278,7 @@ public Event makeBooking(RequestContext context) { + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> @@ -332,7 +332,7 @@ public Event makeBooking(RequestContext context) { + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/src/reference/defining-flows.xml b/src/reference/defining-flows.xml index 4f24523e..4bf83a0f 100644 --- a/src/reference/defining-flows.xml +++ b/src/reference/defining-flows.xml @@ -76,7 +76,7 @@ + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> ]]> @@ -136,7 +136,7 @@ + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> @@ -217,7 +217,7 @@ + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> @@ -347,7 +347,7 @@ public interface FlowOutcome { + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> @@ -513,7 +513,7 @@ public interface FlowOutcome { + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/src/reference/flow-managed-persistence.xml b/src/reference/flow-managed-persistence.xml index 04fb4046..f792b2ef 100644 --- a/src/reference/flow-managed-persistence.xml +++ b/src/reference/flow-managed-persistence.xml @@ -42,7 +42,7 @@ + http://www.springframework.org/schema/webflow/spring-webflow.xsd"> diff --git a/src/reference/spring-faces.xml b/src/reference/spring-faces.xml index 333baeef..0ba3fd05 100644 --- a/src/reference/spring-faces.xml +++ b/src/reference/spring-faces.xml @@ -204,11 +204,11 @@ xsi:schemaLocation=" xmlns:faces="http://www.springframework.org/schema/faces" si:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/webflow-config - http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd + http://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd http://www.springframework.org/schema/faces - http://www.springframework.org/schema/faces/spring-faces-2.4.xsd"> + http://www.springframework.org/schema/faces/spring-faces.xsd"> <!-- Executes flows: the central entry point into the Spring Web Flow system --> <webflow:flow-executor id="flowExecutor"> @@ -276,9 +276,9 @@ public class WebFlowConfig extends AbstractFacesFlowConfiguration { xmlns:faces="http://www.springframework.org/schema/faces" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/faces - http://www.springframework.org/schema/faces/spring-faces-2.4.xsd"> + http://www.springframework.org/schema/faces/spring-faces.xsd"> <faces:resources /> diff --git a/src/reference/spring-js.xml b/src/reference/spring-js.xml index 7d29bd21..36a68c56 100644 --- a/src/reference/spring-js.xml +++ b/src/reference/spring-js.xml @@ -53,8 +53,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> @@ -102,8 +102,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> ... diff --git a/src/reference/system-setup.xml b/src/reference/system-setup.xml index 54308b2e..933d066e 100644 --- a/src/reference/system-setup.xml +++ b/src/reference/system-setup.xml @@ -29,9 +29,9 @@ xmlns:webflow="http://www.springframework.org/schema/webflow-config" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/webflow-config - http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd"> + http://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd"> diff --git a/src/reference/views.xml b/src/reference/views.xml index 6ee6d5b7..e00e59f6 100644 --- a/src/reference/views.xml +++ b/src/reference/views.xml @@ -241,9 +241,9 @@ public class ApplicationConversionService extends DefaultConversionService { xmlns:mvc="http://www.springframework.org/schema/mvc" xsi:schemaLocation=" http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd + http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> + http://www.springframework.org/schema/beans/spring-beans.xsd"> ]]> @@ -288,9 +288,9 @@ public class ApplicationConversionServiceFactoryBean extends FormattingConversio xmlns:mvc="http://www.springframework.org/schema/mvc" xsi:schemaLocation=" http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd + http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> + http://www.springframework.org/schema/beans/spring-beans.xsd">