From f7e8b134a69a1b4e659edfe004bc614a7a05318e Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Tue, 26 Mar 2019 05:01:25 -0500 Subject: [PATCH] URL Cleanup 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://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.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://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 2 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://repository.springsource.com/ivy/bundles/external/ with 2 occurrences migrated to: https://repository.springsource.com/ivy/bundles/external/ ([https](https://repository.springsource.com/ivy/bundles/external/) result 200). * [ ] http://repository.springsource.com/ivy/bundles/release/ with 2 occurrences migrated to: https://repository.springsource.com/ivy/bundles/release/ ([https](https://repository.springsource.com/ivy/bundles/release/) 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-2.5.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-2.5.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-2.5.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-3.0.xsd with 4 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-3.0.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-3.0.xsd) result 200). * [ ] http://www.springframework.org/schema/tool/spring-tool-3.0.xsd with 2 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 1 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://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.spring.io/ with 1 occurrences migrated to: https://forum.spring.io/ ([https](https://forum.spring.io/) 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://www.springframework.org/webflow with 1 occurrences migrated to: https://www.springframework.org/webflow ([https](https://www.springframework.org/webflow) 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://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://<host>/ with 2 occurrences * http://java.sun.com/xml/jaxp/properties/schemaLanguage with 1 occurrences * http://localhost/mockportlet?urlType=action;param_execution=12345 with 1 occurrences * 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://someHost/someApp/someServlet/foo with 1 occurrences * http://someHost/someApp/someServlet/nestedPath/bar with 1 occurrences * http://someHost/someApp/someServlet/nestedPath/foo with 2 occurrences * http://someOtherSystem?orderId= with 4 occurrences * http://www.springframework.org/schema/beans with 12 occurrences * http://www.springframework.org/schema/faces with 6 occurrences * http://www.springframework.org/schema/tool with 4 occurrences * http://www.springframework.org/schema/webflow with 41 occurrences * http://www.springframework.org/schema/webflow-config with 6 occurrences * http://www.springframework.org/schema/webflow/spring-webflow.xsd"> with 1 occurrences * http://www.w3.org/1999/XSL/Transform with 1 occurrences * http://www.w3.org/2001/XMLSchema with 9 occurrences * http://www.w3.org/2001/XMLSchema-instance with 2 occurrences * http://www.w3.org/XML/1998/namespace with 2 occurrences --- CODE_OF_CONDUCT.adoc | 4 ++-- CONTRIBUTING.md | 6 +++--- README.md | 8 ++++---- .../faces/config/spring-faces-2.0.xsd | 2 +- .../faces/config/spring-faces-2.2.xsd | 2 +- .../faces/config/spring-faces-2.4.xsd | 2 +- .../faces/webflow/MockFacesContext.java | 2 +- .../scripts/dojo/build.properties | 2 +- .../scripts/dojo/standard.profile.js | 4 ++-- .../context/servlet/FilenameFlowUrlHandler.java | 6 +++--- .../webflow/test/package-info.java | 2 +- .../webflow/upgrade/WebFlowUpgrader.java | 2 +- .../webflow/config/spring-webflow-config-2.0.xsd | 2 +- .../webflow/config/spring-webflow-config-2.3.xsd | 4 ++-- .../webflow/config/spring-webflow-config-2.4.xsd | 4 ++-- .../upgrade/spring-webflow-1.0-to-2.0.xsl | 2 +- .../builder/model/FlowModelFlowBuilderTests.java | 2 +- .../builder/xml/WebFlowEntityResolverTests.java | 6 +++--- .../webflow/mvc/servlet/FlowControllerTests.java | 4 ++-- .../mvc/servlet/FlowHandlerAdapterTests.java | 8 ++++---- src/api/overview.html | 2 +- src/dist/readme.txt | 16 ++++++++-------- 22 files changed, 46 insertions(+), 46 deletions(-) diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index f013d6f3..17783c7c 100644 --- a/CODE_OF_CONDUCT.adoc +++ b/CODE_OF_CONDUCT.adoc @@ -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/] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 02e845c1..c0834525 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/README.md b/README.md index 91cf1e7e..dbb6232f 100644 --- a/README.md +++ b/README.md @@ -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 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 index 445d1b06..e51cb7b6 100644 --- 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 @@ -7,7 +7,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0"> - + 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 index 7955a2be..a35fb2ac 100644 --- 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 @@ -7,7 +7,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.2"> - + 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-2.4.xsd index 02261301..de260564 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-2.4.xsd @@ -7,7 +7,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.4"> - + diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.java b/spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.java index 639a5b11..b2d66dc4 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/MockFacesContext.java @@ -31,7 +31,7 @@ import javax.faces.render.RenderKit; * Mock implementation of the FacesContext class to facilitate standalone Action unit tests. *

* NOT intended to be used for anything but standalone unit tests. This is a simple state holder, a stub - * implementation, at least if you follow Martin + * implementation, at least if you follow Martin * Fowler's reasoning. This class is called MockFacesContext to be consistent with the naming convention in * the rest of the Spring framework (e.g. MockHttpServletRequest, ...). * diff --git a/spring-js-resources/scripts/dojo/build.properties b/spring-js-resources/scripts/dojo/build.properties index 2d77d6f5..ea5f8779 100644 --- a/spring-js-resources/scripts/dojo/build.properties +++ b/spring-js-resources/scripts/dojo/build.properties @@ -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 diff --git a/spring-js-resources/scripts/dojo/standard.profile.js b/spring-js-resources/scripts/dojo/standard.profile.js index 3c2f4d8a..b75a4488 100644 --- a/spring-js-resources/scripts/dojo/standard.profile.js +++ b/spring-js-resources/scripts/dojo/standard.profile.js @@ -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", diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/FilenameFlowUrlHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/FilenameFlowUrlHandler.java index 519e14e1..198f925b 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/FilenameFlowUrlHandler.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/FilenameFlowUrlHandler.java @@ -39,7 +39,7 @@ import org.springframework.webflow.mvc.servlet.FlowController; * 

  * 	http://someHost/someApp/someServlet/foo
  * 	http://someHost/someApp/someServlet/nestedPath/foo
- * 	http://someHost/someApp/someServlet/nestedPath/foo.html
+ * 	https://someHost/someApp/someServlet/nestedPath/foo.html
  *
* * will all treat the filename "foo" as the flow id. @@ -79,13 +79,13 @@ public class FilenameFlowUrlHandler extends DefaultFlowUrlHandler { * Example - given a request originating at: * * 
-	 * http://someHost/someApp/someServlet/nestedPath/foo.html
+	 * https://someHost/someApp/someServlet/nestedPath/foo.html
 	 *
* * and a request for the flow id "bar", the new flow definition URL would be: * * 
-	 * http://someHost/someApp/someServlet/nestedPath/bar.html
+	 * https://someHost/someApp/someServlet/nestedPath/bar.html
 	 *
*/ public String createFlowDefinitionUrl(String flowId, AttributeMap input, HttpServletRequest request) { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/package-info.java b/spring-webflow/src/main/java/org/springframework/webflow/test/package-info.java index c96966ac..15e02f30 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/test/package-info.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/test/package-info.java @@ -26,7 +26,7 @@ * *

All mock implementations provided by this package are NOT intended to be used for anything but standalone unit * tests. They are simple state holders, stub implementations, at least if you follow - * Martin Fowler's reasoning. These classes + * Martin Fowler's reasoning. These classes * are called Mocks to be consistent with the naming convention in the rest of the Spring framework * (e.g. {@code MockHttpServletRequest}, ...). */ diff --git a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java index 3de4860e..8a4079c5 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/upgrade/WebFlowUpgrader.java @@ -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; } 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 index 1fac1a1c..28934147 100644 --- 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 @@ -18,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/config/spring-webflow-config-2.3.xsd b/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config-2.3.xsd index a9640aed..046a6fa9 100644 --- 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 @@ -19,8 +19,8 @@ A XML-based DSL for configuring the Spring Web Flow 2.0 system. - - + + 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-2.4.xsd index d307a2d6..553c052f 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-2.4.xsd @@ -19,8 +19,8 @@ A XML-based DSL for configuring the Spring Web Flow 2.0 system. - - + + 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..14257137 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 + https://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java index 5350046f..cb409d41 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilderTests.java @@ -241,7 +241,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(AbstractStateModel.class, state)); Flow flow = getFlow(model); ViewFactory vf = ((ViewState) flow.getStateInstance("view")).getViewFactory(); diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/WebFlowEntityResolverTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/WebFlowEntityResolverTests.java index 52d312b4..a72612d7 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/WebFlowEntityResolverTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/builder/xml/WebFlowEntityResolverTests.java @@ -11,21 +11,21 @@ public class WebFlowEntityResolverTests extends TestCase { public void testResolve24() throws Exception { 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() throws Exception { 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() throws Exception { 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); } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowControllerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowControllerTests.java index 4f8d94e4..11c86a0a 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowControllerTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowControllerTests.java @@ -224,7 +224,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); @@ -232,7 +232,7 @@ public class FlowControllerTests extends TestCase { ModelAndView mv = controller.handleRequest(request, response); assertNull(mv); EasyMock.verify(new Object[] { executor }); - assertEquals("http://www.paypal.com", response.getRedirectedUrl()); + assertEquals("https://www.paypal.com", response.getRedirectedUrl()); EasyMock.verify(new Object[] { executor }); } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapterTests.java b/spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapterTests.java index 421ec50f..52af6e48 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapterTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapterTests.java @@ -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(new Object[] { flowExecutor }); flowHandlerAdapter.handle(request, response, flowHandler); EasyMock.verify(new Object[] { flowExecutor }); - assertEquals("http://www.paypal.com", response.getRedirectedUrl()); + assertEquals("https://www.paypal.com", response.getRedirectedUrl()); EasyMock.verify(new Object[] { 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")); diff --git a/src/api/overview.html b/src/api/overview.html index 84d0c175..eaafe7f6 100644 --- a/src/api/overview.html +++ b/src/api/overview.html @@ -1,7 +1,7 @@

-
+
The public Java Documentation for the Spring Web Flow project.

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.

diff --git a/src/dist/readme.txt b/src/dist/readme.txt index 8731340e..200908b0 100644 --- a/src/dist/readme.txt +++ b/src/dist/readme.txt @@ -1,6 +1,6 @@ SPRING WEB FLOW ${version} --------------- -http://www.springframework.org/webflow +https://www.springframework.org/webflow 1. INTRODUCTION --------------- @@ -46,7 +46,7 @@ SpringSource repository. Add the following repository to your Maven pom.xml: springsource-repository Spring project releases, milestones, and snapshots - http://repo.spring.io/snapshot + https://repo.spring.io/snapshot Then declare the following dependencies (note that many times it's sufficient @@ -82,13 +82,13 @@ If using JSF all you need to include is: To access jars using Ivy, add the following repositories to your Ivy config: - - + + - - + + Then declare the following dependencies in your ivy.xml: @@ -107,8 +107,8 @@ https://github.com/spring-projects/spring-framework/wiki/Spring-repository-FAQ 5. ADDITIONAL RESOURCES ----------------------- The Spring Web Flow homepage is located at: - http://projects.spring.io/spring-webflow/ + https://projects.spring.io/spring-webflow/ The Spring Web Flow community forums are located at: - http://forum.spring.io/ + https://forum.spring.io/