From 8c76ad9e0b519753dbc6a69e35f18a1c90e37b12 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 20 Mar 2019 22:33:06 -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://<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"> 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 --- CODE_OF_CONDUCT.adoc | 4 ++-- CONTRIBUTING.md | 6 +++--- README.md | 8 ++++---- .../org/springframework/faces/config/spring-faces.xsd | 2 +- .../faces/webflow/MockFacesContext.java | 2 +- spring-js-resources/scripts/dojo/build.properties | 2 +- spring-js-resources/scripts/dojo/standard.profile.js | 4 ++-- .../webflow/context/servlet/DefaultFlowUrlHandler.java | 8 ++++---- .../context/servlet/FilenameFlowUrlHandler.java | 10 +++++----- .../model/builder/xml/DefaultDocumentLoader.java | 2 +- .../org/springframework/webflow/test/package-info.java | 2 +- .../webflow/upgrade/WebFlowUpgrader.java | 2 +- .../webflow/config/spring-webflow-config.xsd | 4 ++-- .../engine/model/builder/xml/spring-webflow.xsd | 6 +++--- .../webflow/upgrade/spring-webflow-1.0-to-2.0.xsl | 2 +- .../builder/model/FlowModelFlowBuilderTests.java | 2 +- .../model/builder/xml/WebFlowEntityResolverTests.java | 6 +++--- .../webflow/mvc/servlet/FlowControllerTests.java | 4 ++-- .../webflow/mvc/servlet/FlowHandlerAdapterTests.java | 8 ++++---- src/api/overview.html | 2 +- src/dist/readme.txt | 4 ++-- 21 files changed, 45 insertions(+), 45 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 0e5bed84..acb4f699 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 4d753035..ba944be5 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.xsd b/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces.xsd index e6572fa6..fe861923 100644 --- a/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces.xsd +++ b/spring-faces/src/main/resources/org/springframework/faces/config/spring-faces.xsd @@ -6,7 +6,7 @@ targetNamespace="http://www.springframework.org/schema/faces" elementFormDefault="qualified" attributeFormDefault="unqualified"> - + 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 054a7176..911c231a 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/DefaultFlowUrlHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java index aa1695f6..6c3249e2 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/DefaultFlowUrlHandler.java @@ -33,7 +33,7 @@ import org.springframework.webflow.core.collection.AttributeMap; *

* * 
- * http://<host>/[app context path]/[app servlet path]/<flow path>
+ * https://<host>/[app context path]/[app servlet path]/<flow path>
  *
* * As an example, the URL http://localhost/springtravel/app/booking would map to flow "booking", while the @@ -51,7 +51,7 @@ import org.springframework.webflow.core.collection.AttributeMap; *

* * 
- * http://<host>/[app context path]/[app servlet path]/<flow path>?execution=<flow execution key>
+ * https://<host>/[app context path]/[app servlet path]/<flow path>?execution=<flow execution key>
  *
* * 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: * * 
-	 * http://someHost/someApp/someServlet/nestedPath/foo
+	 * https://someHost/someApp/someServlet/nestedPath/foo
 	 *
* * and a request for the flow id "nestedPath/bar", the new flow definition URL would be: * * 
-	 * http://someHost/someApp/someServlet/nestedPath/bar
+	 * https://someHost/someApp/someServlet/nestedPath/bar
 	 *
*/ public String createFlowDefinitionUrl(String flowId, AttributeMap input, HttpServletRequest request) { 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 aa327de9..ab6603e5 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 @@ -35,9 +35,9 @@ import org.springframework.webflow.core.collection.AttributeMap; * For example the URLs: * * 
- * 	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
  *
* * 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: * * 
-	 * 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/engine/model/builder/xml/DefaultDocumentLoader.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DefaultDocumentLoader.java index 5da6a6fd..84f77e64 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DefaultDocumentLoader.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/DefaultDocumentLoader.java @@ -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. 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 bbd6f636..a4f81c43 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 0da70b7b..71ab66e0 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.xsd b/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config.xsd index 44b9e513..f5df688a 100644 --- a/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config.xsd +++ b/spring-webflow/src/main/resources/org/springframework/webflow/config/spring-webflow-config.xsd @@ -18,8 +18,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/engine/model/builder/xml/spring-webflow.xsd b/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow.xsd index 71dbdc04..a19ce8a7 100644 --- a/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow.xsd +++ b/spring-webflow/src/main/resources/org/springframework/webflow/engine/model/builder/xml/spring-webflow.xsd @@ -26,7 +26,7 @@ Events that occur within states drive state transitions. - + @@ -483,7 +483,7 @@ The supported formats for an encoded externalRedirect expression are: For example: 

 	externalRedirect:/hotels/index
-	externalRedirect:http://someOtherSystem?orderId=#{order.id}&callbackUrl=#{flowExecutionUrl}
+	externalRedirect:https://someOtherSystem?orderId=#{order.id}&callbackUrl=#{flowExecutionUrl}
The flowRedirect: prefix may be used to redirect to another flow: 
@@ -942,7 +942,7 @@ The supported formats for an encoded externalRedirect expression are:
 For example:
 
 	externalRedirect:/hotels/index
-	externalRedirect:http://someOtherSystem?orderId=#{order.id}
+	externalRedirect:https://someOtherSystem?orderId=#{order.id}
 

 The flowRedirect: prefix may be used to redirect to another flow:
 
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 ed21cad3..9743b6cf 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.xsd
+                https://www.springframework.org/schema/webflow/spring-webflow.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 1bbf9322..0711524f 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
@@ -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();
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 31fe9fb3..fddb77f9 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() {
 		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);
 	}
 
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 882cfce5..7a7d5e82 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
@@ -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);
 	}
 
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 b1ce23ea..ffcba449 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(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"));
 
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 b39c97c7..942f255a 100644
--- a/src/dist/readme.txt
+++ b/src/dist/readme.txt
@@ -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:
 
     spring
     Spring Snapshots
-    http://repo.spring.io/snapshot
+    https://repo.spring.io/snapshot
 
 
 Then declare the following dependencies (note that many times it's sufficient