Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

URL Cleanup

Browse Source 
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# HTTP URLs that Could Not Be Fixed
These URLs were unable to be fixed. Please review them to see if they can be manually resolved.

* [ ] http://url.somewhereelse.com (200) with 2 occurrences could not be migrated:
   ([https](https://url.somewhereelse.com) result SSLHandshakeException).

# Fixed URLs

## Fixed But Review Recommended
These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.

* [ ] http://progit.org/book/ch5-2.html (301) with 1 occurrences migrated to:
  https://progit.org/book/ch5-2.html ([https](https://progit.org/book/ch5-2.html) result SSLHandshakeException).
* [ ] http://<host>/ (UnknownHostException) with 2 occurrences migrated to:
  https://<host>/ ([https](https://<host>/) result UnknownHostException).
* [ ] http://someHost/someApp/someServlet/foo (UnknownHostException) with 1 occurrences migrated to:
  https://someHost/someApp/someServlet/foo ([https](https://someHost/someApp/someServlet/foo) result UnknownHostException).
* [ ] http://someHost/someApp/someServlet/nestedPath/bar (UnknownHostException) with 1 occurrences migrated to:
  https://someHost/someApp/someServlet/nestedPath/bar ([https](https://someHost/someApp/someServlet/nestedPath/bar) result UnknownHostException).
* [ ] http://someHost/someApp/someServlet/nestedPath/bar.html (UnknownHostException) with 1 occurrences migrated to:
  https://someHost/someApp/someServlet/nestedPath/bar.html ([https](https://someHost/someApp/someServlet/nestedPath/bar.html) result UnknownHostException).
* [ ] http://someHost/someApp/someServlet/nestedPath/foo (UnknownHostException) with 2 occurrences migrated to:
  https://someHost/someApp/someServlet/nestedPath/foo ([https](https://someHost/someApp/someServlet/nestedPath/foo) result UnknownHostException).
* [ ] http://someHost/someApp/someServlet/nestedPath/foo.html (UnknownHostException) with 2 occurrences migrated to:
  https://someHost/someApp/someServlet/nestedPath/foo.html ([https](https://someHost/someApp/someServlet/nestedPath/foo.html) result UnknownHostException).
* [ ] http://someOtherSystem?orderId= (UnknownHostException) with 2 occurrences migrated to:
  https://someOtherSystem?orderId= ([https](https://someOtherSystem?orderId=) result UnknownHostException).
* [ ] http://url.somewhere.com (UnknownHostException) with 2 occurrences migrated to:
  https://url.somewhere.com ([https](https://url.somewhere.com) result UnknownHostException).
* [ ] http://book.git-scm.com/4_interactive_rebasing.html (301) with 1 occurrences migrated to:
  https://book.git-scm.com/4_interactive_rebasing.html ([https](https://book.git-scm.com/4_interactive_rebasing.html) result 404).
* [ ] http://download.dojotoolkit.org/release- (301) with 1 occurrences migrated to:
  https://download.dojotoolkit.org/release- ([https](https://download.dojotoolkit.org/release-) result 404).
* [ ] http://help.github.com/send-pull-requests (404) with 2 occurrences migrated to:
  https://help.github.com/send-pull-requests ([https](https://help.github.com/send-pull-requests) result 404).
* [ ] http://svn.dojotoolkit.org/src/util/trunk/buildscripts/profiles/standard.profile.js (404) with 1 occurrences migrated to:
  https://svn.dojotoolkit.org/src/util/trunk/buildscripts/profiles/standard.profile.js ([https](https://svn.dojotoolkit.org/src/util/trunk/buildscripts/profiles/standard.profile.js) result 404).
* [ ] http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd (404) with 1 occurrences migrated to:
  https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd ([https](https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd) result 404).
* [ ] http://www.springframework.org/schema/webflow/spring-webflow-2.4.xsd (404) with 1 occurrences migrated to:
  https://www.springframework.org/schema/webflow/spring-webflow-2.4.xsd ([https](https://www.springframework.org/schema/webflow/spring-webflow-2.4.xsd) result 404).

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://bugs.dojotoolkit.org/ticket/6849 with 1 occurrences migrated to:
  https://bugs.dojotoolkit.org/ticket/6849 ([https](https://bugs.dojotoolkit.org/ticket/6849) result 200).
* [ ] http://docs.spring.io/spring-webflow/docs/current/api/ with 1 occurrences migrated to:
  https://docs.spring.io/spring-webflow/docs/current/api/ ([https](https://docs.spring.io/spring-webflow/docs/current/api/) result 200).
* [ ] http://docs.spring.io/spring-webflow/docs/current/reference/html/ with 1 occurrences migrated to:
  https://docs.spring.io/spring-webflow/docs/current/reference/html/ ([https](https://docs.spring.io/spring-webflow/docs/current/reference/html/) result 200).
* [ ] http://static.springframework.org/spring-webflow/images/spring-webflow.jpg (301) with 1 occurrences migrated to:
  https://docs.spring.io/spring-webflow/images/spring-webflow.jpg ([https](https://static.springframework.org/spring-webflow/images/spring-webflow.jpg) result 200).
* [ ] http://projects.spring.io/spring-webflow/ with 1 occurrences migrated to:
  https://projects.spring.io/spring-webflow/ ([https](https://projects.spring.io/spring-webflow/) result 200).
* [ ] http://stackoverflow.com/questions/tagged/spring-webflow with 1 occurrences migrated to:
  https://stackoverflow.com/questions/tagged/spring-webflow ([https](https://stackoverflow.com/questions/tagged/spring-webflow) result 200).
* [ ] http://www.martinfowler.com/articles/mocksArentStubs.html with 2 occurrences migrated to:
  https://www.martinfowler.com/articles/mocksArentStubs.html ([https](https://www.martinfowler.com/articles/mocksArentStubs.html) result 200).
* [ ] http://www.springframework.org/schema/beans/spring-beans.xsd with 2 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-beans.xsd ([https](https://www.springframework.org/schema/beans/spring-beans.xsd) result 200).
* [ ] http://www.springframework.org/schema/tool/spring-tool-3.0.xsd with 1 occurrences migrated to:
  https://www.springframework.org/schema/tool/spring-tool-3.0.xsd ([https](https://www.springframework.org/schema/tool/spring-tool-3.0.xsd) result 200).
* [ ] http://www.springframework.org/schema/webflow/spring-webflow.xsd with 2 occurrences migrated to:
  https://www.springframework.org/schema/webflow/spring-webflow.xsd ([https](https://www.springframework.org/schema/webflow/spring-webflow.xsd) result 200).
* [ ] http://www.w3.org/XML/1998/namespace with 1 occurrences migrated to:
  https://www.w3.org/XML/1998/namespace ([https](https://www.w3.org/XML/1998/namespace) result 200).
* [ ] http://contributor-covenant.org with 1 occurrences migrated to:
  https://contributor-covenant.org ([https](https://contributor-covenant.org) result 301).
* [ ] http://contributor-covenant.org/version/1/3/0/ with 1 occurrences migrated to:
  https://contributor-covenant.org/version/1/3/0/ ([https](https://contributor-covenant.org/version/1/3/0/) result 301).
* [ ] http://forum.springsource.org/forumdisplay.php?36-Web-Flow (301) with 1 occurrences migrated to:
  https://forum.spring.io/forumdisplay.php?36-Web-Flow ([https](https://forum.springsource.org/forumdisplay.php?36-Web-Flow) result 301).
* [ ] http://jira.springsource.org/browse/SWF with 1 occurrences migrated to:
  https://jira.springsource.org/browse/SWF ([https](https://jira.springsource.org/browse/SWF) result 301).
* [ ] http://xml.apache.org/xalan with 1 occurrences migrated to:
  https://xml.apache.org/xalan ([https](https://xml.apache.org/xalan) result 301).
* [ ] http://java.sun.com/xml/jaxp/properties/schemaLanguage with 1 occurrences migrated to:
  https://java.sun.com/xml/jaxp/properties/schemaLanguage ([https](https://java.sun.com/xml/jaxp/properties/schemaLanguage) result 302).
* [ ] http://repo.spring.io/snapshot with 1 occurrences migrated to:
  https://repo.spring.io/snapshot ([https](https://repo.spring.io/snapshot) result 302).
* [ ] http://springsource.com/support/springsupport with 1 occurrences migrated to:
  https://springsource.com/support/springsupport ([https](https://springsource.com/support/springsupport) result 302).
* [ ] http://www.paypal.com with 4 occurrences migrated to:
  https://www.paypal.com ([https](https://www.paypal.com) result 302).
* [ ] http://www.paypal.com?_callbackUrl= with 1 occurrences migrated to:
  https://www.paypal.com?_callbackUrl= ([https](https://www.paypal.com?_callbackUrl=) result 302).

# Ignored
These URLs were intentionally ignored.

* http://localhost/springtravel/app/booking with 1 occurrences
* http://localhost/springtravel/app/flight/booking with 1 occurrences
* http://localhost/springtravel/app/hotel/booking with 1 occurrences
* http://localhost/springtravel/app/hotels/booking with 1 occurrences
* http://localhost/springtravel/app/hotels/booking?execution=e1s1 with 1 occurrences
* http://localhost/springtravel/hotels/booking.htm with 1 occurrences
* http://www.springframework.org/schema/beans with 4 occurrences
* http://www.springframework.org/schema/faces with 2 occurrences
* http://www.springframework.org/schema/tool with 2 occurrences
* http://www.springframework.org/schema/webflow with 39 occurrences
* http://www.springframework.org/schema/webflow-config with 2 occurrences
* http://www.springframework.org/schema/webflow/spring-webflow.xsd"&gt with 1 occurrences
* http://www.w3.org/1999/XSL/Transform with 1 occurrences
* http://www.w3.org/2001/XMLSchema with 4 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 2 occurrences
This commit is contained in:
Spring Operator
2019-03-20 22:33:06 -05:00
committed by Rossen Stoyanchev
parent 8b9e13ba38
commit 8c76ad9e0b
21 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CODE_OF_CONDUCT.adoc
View File

@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
with regard to the reporter of an incident.
This Code of Conduct is adapted from the
http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]

6
CONTRIBUTING.md
View File

@@ -170,7 +170,7 @@ public class Spr8954Tests {
Use `git rebase --interactive`, `git add --patch` and other tools to "squash"
multiple commits into atomic changes. In addition to the man pages for git,
there are many resources online to help you understand how these tools work.
Here is one: http://book.git-scm.com/4_interactive_rebasing.html.
Here is one: https://book.git-scm.com/4_interactive_rebasing.html.
## Use real name in git commits
@@ -296,9 +296,9 @@ Note that you can always force push (`git push -f`) reworked / rebased commits
against the branch used to submit your pull request. i.e. you do not need to
issue a new pull request when asked to make changes.
[help documentation]: http://help.github.com/send-pull-requests
[help documentation]: https://help.github.com/send-pull-requests
[JIRA issue tracker]: https://jira.springsource.org/browse/SWF
[SpringSource CLA form]: https://support.springsource.com/spring_committer_signup
[fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button
[commit guidelines section of Pro Git]: http://progit.org/book/ch5-2.html#commit_guidelines
[commit guidelines section of Pro Git]: https://progit.org/book/ch5-2.html#commit_guidelines
[building from source]: https://github.com/SpringSource/spring-webflow#building-from-source

8
README.md
View File

@@ -20,7 +20,7 @@ Some key benefits of using Spring Web Flow:
# Documentation
See the current [Javadoc](http://docs.spring.io/spring-webflow/docs/current/api/) and [Reference](http://docs.spring.io/spring-webflow/docs/current/reference/html/) docs.
See the current [Javadoc](https://docs.spring.io/spring-webflow/docs/current/api/) and [Reference](https://docs.spring.io/spring-webflow/docs/current/reference/html/) docs.
# Samples
@@ -36,11 +36,11 @@ Instructions on [downloading Spring Web Flow](https://github.com/SpringSource/sp
# Issue Tracking
Spring Web Flow's JIRA issue tracker can be found [here](http://jira.springsource.org/browse/SWF). If you think you've found a bug, please consider helping to reproduce it by submitting an issue reproduction project via the [spring-webflow-issues](https://github.com/springsource/spring-webflow-issues) repository. The [readme](https://github.com/springsource/spring-webflow-issues#readme) provides simple step-by-step instructions.
Spring Web Flow's JIRA issue tracker can be found [here](https://jira.springsource.org/browse/SWF). If you think you've found a bug, please consider helping to reproduce it by submitting an issue reproduction project via the [spring-webflow-issues](https://github.com/springsource/spring-webflow-issues) repository. The [readme](https://github.com/springsource/spring-webflow-issues#readme) provides simple step-by-step instructions.
# Getting support
Check out the [Spring forums](http://forum.springsource.org/forumdisplay.php?36-Web-Flow) and the [spring-webflow tag](http://stackoverflow.com/questions/tagged/spring-webflow) on StackOverflow. [Commercial support](http://springsource.com/support/springsupport) is available too.
Check out the [Spring forums](https://forum.spring.io/forumdisplay.php?36-Web-Flow) and the [spring-webflow tag](https://stackoverflow.com/questions/tagged/spring-webflow) on StackOverflow. [Commercial support](https://springsource.com/support/springsupport) is available too.
# Building from source
@@ -73,7 +73,7 @@ The Spring Framework and Spring Web Flow use a very similar build system. For th
# Contributing
[Pull requests](http://help.github.com/send-pull-requests) are welcome. You'll be asked to sign our contributor license agreement ([CLA](https://support.springsource.com/spring_committer_signup)). Trivial changes like typo fixes are especially appreciated (just [fork and edit](https://github.com/blog/844-forking-with-the-edit-button)!). For larger changes, please search through JIRA for similiar issues, creating a new one if necessary, and discuss your ideas with the Spring Web Flow team.
[Pull requests](https://help.github.com/send-pull-requests) are welcome. You'll be asked to sign our contributor license agreement ([CLA](https://support.springsource.com/spring_committer_signup)). Trivial changes like typo fixes are especially appreciated (just [fork and edit](https://github.com/blog/844-forking-with-the-edit-button)!). For larger changes, please search through JIRA for similiar issues, creating a new one if necessary, and discuss your ideas with the Spring Web Flow team.
# License

2
spring-faces/src/main/resources/org/springframework/faces/config/spring-faces.xsd
View File

@@ -6,7 +6,7 @@
targetNamespace="http://www.springframework.org/schema/faces"
elementFormDefault="qualified" attributeFormDefault="unqualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="https://www.springframework.org/schema/beans/spring-beans.xsd" />
<xsd:element name="flow-builder-services">
<xsd:annotation>

2
spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.java
View File

@@ -31,7 +31,7 @@ import javax.faces.render.RenderKit;
* Mock implementation of the <code>FacesContext</code> class to facilitate standalone Action unit tests.
* <p>
* NOT intended to be used for anything but standalone unit tests. This is a simple state holder, a <i>stub</i>
* implementation, at least if you follow <a href="http://www.martinfowler.com/articles/mocksArentStubs.html">Martin
* implementation, at least if you follow <a href="https://www.martinfowler.com/articles/mocksArentStubs.html">Martin
* Fowler's</a> reasoning. This class is called <i>Mock</i>FacesContext to be consistent with the naming convention in
* the rest of the Spring framework (e.g. MockHttpServletRequest, ...).
*

2
spring-js-resources/scripts/dojo/build.properties
View File

@@ -1,4 +1,4 @@
dojo.version=1.5.0
dojo.download.url=http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}-src.zip
dojo.download.url=https://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}-src.zip
dojo.profile=standard.profile.js

4
spring-js-resources/scripts/dojo/standard.profile.js
View File

@@ -1,6 +1,6 @@
dependencies ={
//Strip all console.* calls except console.warn and console.error. This is basically a work-around
//for trac issue: http://bugs.dojotoolkit.org/ticket/6849 where Safari 3's console.debug seems
//for trac issue: https://bugs.dojotoolkit.org/ticket/6849 where Safari 3's console.debug seems
//to be flaky to set up (apparently fixed in a webkit nightly).
//But in general for a build, console.warn/error should be the only things to survive anyway.
stripConsole: "normal",
@@ -16,7 +16,7 @@ dependencies ={
},
// Now add layers from Dojo's standard.profile.js:
// http://svn.dojotoolkit.org/src/util/trunk/buildscripts/profiles/standard.profile.js
// https://svn.dojotoolkit.org/src/util/trunk/buildscripts/profiles/standard.profile.js
{
name: "../dijit/dijit.js",

8
spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java
View File

@@ -33,7 +33,7 @@ import org.springframework.webflow.core.collection.AttributeMap;
* </p>
*
* <pre>
* http://&lt;host&gt;/[app context path]/[app servlet path]/&lt;flow path&gt;
* https://&lt;host&gt;/[app context path]/[app servlet path]/&lt;flow path&gt;
* </pre>
*
* As an example, the URL <code>http://localhost/springtravel/app/booking</code> would map to flow "booking", while the
@@ -51,7 +51,7 @@ import org.springframework.webflow.core.collection.AttributeMap;
* </p>
*
* <pre>
* http://&lt;host&gt;/[app context path]/[app servlet path]/&lt;flow path&gt;?execution=&lt;flow execution key&gt;
* https://&lt;host&gt;/[app context path]/[app servlet path]/&lt;flow path&gt;?execution=&lt;flow execution key&gt;
* </pre>
*
* As an example, the URL http://localhost/springtravel/app/hotels/booking?execution=e1s1 would attempt to resume
@@ -118,13 +118,13 @@ public class DefaultFlowUrlHandler implements FlowUrlHandler {
* Example - given a request originating at:
*
* <pre>
* http://someHost/someApp/someServlet/nestedPath/foo
* https://someHost/someApp/someServlet/nestedPath/foo
* </pre>
*
* and a request for the flow id "nestedPath/bar", the new flow definition URL would be:
*
* <pre>
* http://someHost/someApp/someServlet/nestedPath/bar
* https://someHost/someApp/someServlet/nestedPath/bar
* </pre>
*/
public String createFlowDefinitionUrl(String flowId, AttributeMap<?> input, HttpServletRequest request) {

10
spring-webflow/src/main/java/org/springframework/webflow/context/servlet/FilenameFlowUrlHandler.java
View File

@@ -35,9 +35,9 @@ import org.springframework.webflow.core.collection.AttributeMap;
* For example the URLs:
*
* <pre>
* http://someHost/someApp/someServlet/foo
* http://someHost/someApp/someServlet/nestedPath/foo
* http://someHost/someApp/someServlet/nestedPath/foo.html
* https://someHost/someApp/someServlet/foo
* https://someHost/someApp/someServlet/nestedPath/foo
* https://someHost/someApp/someServlet/nestedPath/foo.html
* </pre>
*
* will all treat the filename "foo" as the flow id.
@@ -101,13 +101,13 @@ public class FilenameFlowUrlHandler extends DefaultFlowUrlHandler {
* Example - given a request originating at:
*
* <pre>
* http://someHost/someApp/someServlet/nestedPath/foo.html
* https://someHost/someApp/someServlet/nestedPath/foo.html
* </pre>
*
* and a request for the flow id "bar", the new flow definition URL would be:
*
* <pre>
* http://someHost/someApp/someServlet/nestedPath/bar.html
* https://someHost/someApp/someServlet/nestedPath/bar.html
* </pre>
*/
public String createFlowDefinitionUrl(String flowId, AttributeMap<?> input, HttpServletRequest request) {

2
spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DefaultDocumentLoader.java
View File

@@ -46,7 +46,7 @@ public class DefaultDocumentLoader implements DocumentLoader {
/**
* JAXP attribute used to configure the schema language for validation.
*/
private static final String SCHEMA_LANGUAGE_ATTRIBUTE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
private static final String SCHEMA_LANGUAGE_ATTRIBUTE = "https://java.sun.com/xml/jaxp/properties/schemaLanguage";
/**
* JAXP attribute value indicating the XSD schema language.

2
spring-webflow/src/main/java/org/springframework/webflow/test/package-info.java
View File

@@ -26,7 +26,7 @@
*
* <p>All mock implementations provided by this package are NOT intended to be used for anything but standalone unit
* tests. They are simple state holders, <i>stub</i> implementations, at least if you follow
* <a href="http://www.martinfowler.com/articles/mocksArentStubs.html">Martin Fowler's</a> reasoning. These classes
* <a href="https://www.martinfowler.com/articles/mocksArentStubs.html">Martin Fowler's</a> reasoning. These classes
* are called <i>Mock</i>s to be consistent with the naming convention in the rest of the Spring framework
* (e.g. {@code MockHttpServletRequest}, ...).
*/

2
spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java
View File

@@ -83,7 +83,7 @@ public class WebFlowUpgrader {
Source source = new StreamSource(xslResource.getInputStream());
transformer = factory.newTransformer(source);
// com.sun.org.apache.xml.internal.serializer.OutputPropertiesFactory.S_KEY_INDENT_AMOUNT
transformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "4");
transformer.setOutputProperty("{https://xml.apache.org/xalan}indent-amount", "4");
}
return transformer;
}

4
spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config.xsd
View File

@@ -18,8 +18,8 @@ A XML-based DSL for configuring the Spring Web Flow 2.0 system.
</xsd:documentation>
</xsd:annotation>
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-3.0.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="https://www.springframework.org/schema/beans/spring-beans.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="https://www.springframework.org/schema/tool/spring-tool-3.0.xsd" />
<xsd:element name="flow-registry">
<xsd:annotation>

6
spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow.xsd
View File

@@ -26,7 +26,7 @@ Events that occur within states drive state transitions.
</xsd:documentation>
</xsd:annotation>
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:import namespace="https://www.w3.org/XML/1998/namespace" />
<!-- Top level element -->
<xsd:element name="flow">
@@ -483,7 +483,7 @@ The supported formats for an encoded externalRedirect expression are:
For example:
<pre>
externalRedirect:/hotels/index
externalRedirect:http://someOtherSystem?orderId=#{order.id}&callbackUrl=#{flowExecutionUrl}
externalRedirect:https://someOtherSystem?orderId=#{order.id}&callbackUrl=#{flowExecutionUrl}
</pre>
The flowRedirect: prefix may be used to redirect to another flow:
<pre>
@@ -942,7 +942,7 @@ The supported formats for an encoded externalRedirect expression are:
For example:
<pre>
externalRedirect:/hotels/index
externalRedirect:http://someOtherSystem?orderId=#{order.id}
externalRedirect:https://someOtherSystem?orderId=#{order.id}
</pre>
The flowRedirect: prefix may be used to redirect to another flow:
<pre>

2
spring-webflow/src/main/resources/org/springframework/webflow/upgrade/spring-webflow-1.0-to-2.0.xsl
View File

@@ -33,7 +33,7 @@
namespace="http://www.w3.org/2001/XMLSchema-instance">
<xsl:text>http://www.springframework.org/schema/webflow</xsl:text>
<xsl:text> </xsl:text>
<xsl:text>http://www.springframework.org/schema/webflow/spring-webflow.xsd</xsl:text>
<xsl:text>https://www.springframework.org/schema/webflow/spring-webflow.xsd</xsl:text>
</xsl:attribute>
<xsl:if test="webflow:start-state">
<xsl:attribute name="start-state">

2
spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java
View File

@@ -240,7 +240,7 @@ public class FlowModelFlowBuilderTests extends TestCase {
public void testViewStateExternalRedirect() {
ViewStateModel state = new ViewStateModel("view");
state.setView("externalRedirect:http://www.paypal.com?_callbackUrl=#{flowExecutionUri}");
state.setView("externalRedirect:https://www.paypal.com?_callbackUrl=#{flowExecutionUri}");
model.setStates(asList(state));
Flow flow = getFlow(model);
ViewFactory vf = ((ViewState) flow.getStateInstance("view")).getViewFactory();

6
spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/WebFlowEntityResolverTests.java
View File

@@ -11,21 +11,21 @@ public class WebFlowEntityResolverTests extends TestCase {
public void testResolve24() {
WebFlowEntityResolver resolver = new WebFlowEntityResolver();
InputSource source = resolver.resolveEntity(PUBLIC_ID,
"http://www.springframework.org/schema/webflow/spring-webflow-2.4.xsd");
"https://www.springframework.org/schema/webflow/spring-webflow-2.4.xsd");
assertNotNull(source);
}
public void testResolve20() {
WebFlowEntityResolver resolver = new WebFlowEntityResolver();
InputSource source = resolver.resolveEntity(PUBLIC_ID,
"http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd");
"https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd");
assertNotNull(source);
}
public void testResolveLatest() {
WebFlowEntityResolver resolver = new WebFlowEntityResolver();
InputSource source = resolver.resolveEntity(PUBLIC_ID,
"http://www.springframework.org/schema/webflow/spring-webflow.xsd");
"https://www.springframework.org/schema/webflow/spring-webflow.xsd");
assertNotNull(source);
}

4
spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowControllerTests.java
View File

@@ -225,7 +225,7 @@ public class FlowControllerTests extends TestCase {
request.setPathInfo("/foo");
request.setRequestURI("/springtravel/app/foo");
request.setMethod("GET");
context.requestExternalRedirect("http://www.paypal.com");
context.requestExternalRedirect("https://www.paypal.com");
executor.launchExecution("foo", null, context);
FlowExecutionResult result = FlowExecutionResult.createPausedResult("foo", "12345");
EasyMock.expectLastCall().andReturn(result);
@@ -233,7 +233,7 @@ public class FlowControllerTests extends TestCase {
ModelAndView mv = controller.handleRequest(request, response);
assertNull(mv);
EasyMock.verify(executor);
assertEquals("http://www.paypal.com", response.getRedirectedUrl());
assertEquals("https://www.paypal.com", response.getRedirectedUrl());
EasyMock.verify(executor);
}

8
spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapterTests.java
View File

@@ -215,14 +215,14 @@ public class FlowHandlerAdapterTests extends TestCase {
public void testLaunchFlowWithExternalHttpRedirect() throws Exception {
setupRequest("/springtravel", "/app", "/foo", "GET");
context.requestExternalRedirect("http://www.paypal.com");
context.requestExternalRedirect("https://www.paypal.com");
flowExecutor.launchExecution("foo", flowInput, context);
FlowExecutionResult result = FlowExecutionResult.createPausedResult("foo", "12345");
EasyMock.expectLastCall().andReturn(result);
EasyMock.replay(flowExecutor);
flowHandlerAdapter.handle(request, response, flowHandler);
EasyMock.verify(flowExecutor);
assertEquals("http://www.paypal.com", response.getRedirectedUrl());
assertEquals("https://www.paypal.com", response.getRedirectedUrl());
EasyMock.verify(flowExecutor);
}
@@ -388,13 +388,13 @@ public class FlowHandlerAdapterTests extends TestCase {
}
public void testRemoteHost() throws Exception {
assertFalse(flowHandlerAdapter.isRemoteHost("http://url.somewhere.com"));
assertFalse(flowHandlerAdapter.isRemoteHost("https://url.somewhere.com"));
assertFalse(flowHandlerAdapter.isRemoteHost("/path"));
assertFalse(flowHandlerAdapter.isRemoteHost("http://url.somewhereelse.com"));
flowHandlerAdapter.setHosts(new String[] {"url.somewhere.com"});
assertFalse(flowHandlerAdapter.isRemoteHost("http://url.somewhere.com"));
assertFalse(flowHandlerAdapter.isRemoteHost("https://url.somewhere.com"));
assertFalse(flowHandlerAdapter.isRemoteHost("/path"));
assertTrue(flowHandlerAdapter.isRemoteHost("http://url.somewhereelse.com"));

2
src/api/overview.html
View File

@@ -1,7 +1,7 @@
<html>
<body>
<p align="center">
<img src="http://static.springframework.org/spring-webflow/images/spring-webflow.jpg"><br>
<img src="https://docs.spring.io/spring-webflow/images/spring-webflow.jpg"><br>
The public Java Documentation for the Spring Web Flow project.
</p>
<p>Spring Web Flow facilitates building web applications that require guided navigation -- e.g. a shopping cart, flight check-in, a loan application, and many others. In contrast to stateless, free-form navigation such use cases have a clear start and end point, one or more screens to go through in a specific order, and a set of changes that are not finalized to the end.</p>

4
src/dist/readme.txt vendored
View File

@@ -1,6 +1,6 @@
SPRING WEB FLOW ${version}
--------------------------
http://projects.spring.io/spring-webflow/
https://projects.spring.io/spring-webflow/
1. INTRODUCTION
---------------
@@ -46,7 +46,7 @@ Add the following repository to your Maven pom.xml:
<repository>
<id>spring</id>
<name>Spring Snapshots</name>
<url>http://repo.spring.io/snapshot</url>
<url>https://repo.spring.io/snapshot</url>
</repository>
Then declare the following dependencies (note that many times it's sufficient