diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e82deec2f..5d84276fe7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,7 +30,7 @@ Once you've completed the web form, simply add the following in a comment on you 1. Go to [https://github.com/spring-projects/spring-integration](https://github.com/spring-projects/spring-integration) 2. Hit the "fork" button and choose your own github account as the target -3. For more detail see [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) +3. For more detail see [https://help.github.com/fork-a-repo/](https://help.github.com/fork-a-repo/) ## Setup your Local Development Environment @@ -50,14 +50,14 @@ _you should see branches on origin as well as upstream, including 'master' and ' * _Always_ work on topic branches (Typically use the Jira ticket ID as the branch name). - For example, to create and switch to a new branch for issue INT-123: `git checkout -b INT-123` * You might be working on several different topic branches at any given time, but when at a stopping point for one of those branches, commit (a local operation). -* Please follow the "Commit Guidelines" described in this chapter of Pro Git: [http://progit.org/book/ch5-2.html](http://progit.org/book/ch5-2.html) +* Please follow the "Commit Guidelines" described in this chapter of Pro Git: [https://progit.org/book/ch5-2.html](https://progit.org/book/ch5-2.html) * Then to begin working on another issue (say INT-101): `git checkout INT-101`. The _-b_ flag is not needed if that branch already exists in your local repository. * When ready to resolve an issue or to collaborate with others, you can push your branch to origin (your fork), e.g.: `git push origin INT-123` * If you want to collaborate with another contributor, have them fork your repository (add it as a remote) and `git fetch ` to grab your branch. Alternatively, they can use `git fetch --all` to sync their local state with all of their remotes. * If you grant that collaborator push access to your repository, they can even apply their changes to your branch. -* When ready for your contribution to be reviewed for potential inclusion in the master branch of the canonical spring-integration repository (what you know as 'upstream'), issue a pull request to the SpringSource repository (for more detail, see [http://help.github.com/send-pull-requests/](http://help.github.com/send-pull-requests/)). +* When ready for your contribution to be reviewed for potential inclusion in the master branch of the canonical spring-integration repository (what you know as 'upstream'), issue a pull request to the SpringSource repository (for more detail, see [https://help.github.com/send-pull-requests/](https://help.github.com/send-pull-requests/)). * The project lead may merge your changes into the upstream master branch as-is, he may keep the pull request open yet add a comment about something that should be modified, or he might reject the pull request by closing it. -* A prerequisite for any pull request is that it will be cleanly merge-able with the upstream master's current state. **This is the responsibility of any contributor.** If your pull request cannot be applied cleanly, the project lead will most likely add a comment requesting that you make it merge-able. For a full explanation, see the Pro Git section on rebasing: [http://progit.org/book/ch3-6.html](http://progit.org/book/ch3-6.html). As stated there: "> Often, you’ll do this to make sure your commits apply cleanly on a remote branch — perhaps in a project to which you’re trying to contribute but that you don’t maintain." +* A prerequisite for any pull request is that it will be cleanly merge-able with the upstream master's current state. **This is the responsibility of any contributor.** If your pull request cannot be applied cleanly, the project lead will most likely add a comment requesting that you make it merge-able. For a full explanation, see the Pro Git section on rebasing: [https://progit.org/book/ch3-6.html](https://progit.org/book/ch3-6.html). As stated there: "> Often, you’ll do this to make sure your commits apply cleanly on a remote branch — perhaps in a project to which you’re trying to contribute but that you don’t maintain." ## Keeping your Local Code in Sync * As mentioned above, you should always work on topic branches (since 'master' is a moving target). However, you do want to always keep your own 'origin' master branch in synch with the 'upstream' master. @@ -70,8 +70,8 @@ _you should see branches on origin as well as upstream, including 'master' and ' - Then: `git pull upstream master` - Switch back to the topic branch: `git checkout INT-123` (no -b needed since the branch already exists) - Rebase the topic branch to minimize the distance between it and your recently synched master branch: `git rebase master` -(Again, for more detail see the Pro Git section on rebasing: [http://progit.org/book/ch3-6.html](http://progit.org/book/ch3-6.html)) -* **Note** You cannot rebase if you have already pushed your branch to your remote because you'd be rewriting history (see **'The Perils of Rebasing'** in the article). If you rebase by mistake, you can undo it as discussed [in this stackoverflow discussion](http://stackoverflow.com/questions/134882/undoing-a-git-rebase). Once you have published your branch, you need to merge in the master rather than rebasing. +(Again, for more detail see the Pro Git section on rebasing: [https://progit.org/book/ch3-6.html](https://progit.org/book/ch3-6.html)) +* **Note** You cannot rebase if you have already pushed your branch to your remote because you'd be rewriting history (see **'The Perils of Rebasing'** in the article). If you rebase by mistake, you can undo it as discussed [in this stackoverflow discussion](https://stackoverflow.com/questions/134882/undoing-a-git-rebase). Once you have published your branch, you need to merge in the master rather than rebasing. * Now, if you issue a pull request, it is much more likely to be merged without conflicts. Most likely, any pull request that would produce conflicts will be deferred until the issuer of that pull request makes these adjustments. * Assuming your pull request is merged into the 'upstream' master, you will actually end up pulling that change into your own master eventually, and at that time, you may decide to delete the topic branch from your local repository and your fork (origin) if you pushed it there. - to delete the local branch: `git branch -d INT-123` @@ -183,7 +183,7 @@ Search the codebase to find related unit tests and add additional @Test methods ## Squash commits -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. +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: https://book.git-scm.com/4_interactive_rebasing.html. ## Use your real name in git commits @@ -231,6 +231,6 @@ Add a JIRA issue link to your first commit comment of the pull request on the la JIRA: https://jira.springsource.org/browse/INT-1639 -[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/INT [checking out and building]: https://github.com/spring-projects/spring-integration#checking-out-and-building diff --git a/README.md b/README.md index 44218f8e5a..a5652b8124 100644 --- a/README.md +++ b/README.md @@ -51,4 +51,4 @@ To generate IDEA metadata (.iml and .ipr files), do the following: # Resources For more information, please visit the Spring Integration website at: -[http://www.springsource.org/spring-integration](http://www.springsource.org/spring-integration) +[https://www.springsource.org/spring-integration](https://www.springsource.org/spring-integration) diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd index 94ec420461..6e47dd6b62 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.1.xsd"/> diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd index 3aef53319f..e06fbabe6d 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd index 794e061d23..2ce5ffa218 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java index 96bff9bf26..d2847d5d63 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java @@ -25,7 +25,7 @@ import com.jayway.jsonpath.JsonPath; /** * Utility class to {@link #evaluate} a jsonPath on the provided object. - * Delegates evaluation to JsonPath. + * Delegates evaluation to JsonPath. * Note {@link #evaluate} is used as {@code #jsonPath()} SpEL function. * * @author Artem Bilan diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonMessageParser.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonMessageParser.java index f2408c5e2c..e98674ebe8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonMessageParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonMessageParser.java @@ -30,7 +30,7 @@ import org.springframework.util.Assert; /** * {@link JsonInboundMessageMapper.JsonMessageParser} implementation that parses JSON messages * and builds a {@link Message} with the specified payload type from provided {@link JsonInboundMessageMapper}. - * Uses Jackson JSON-processor (@link http://jackson.codehaus.org). + * Uses Jackson JSON-processor (@link https://jackson.codehaus.org). * * @author Artem Bilan * @since 3.0 diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonObjectMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonObjectMapper.java index c82ac37a23..b1b213ebc7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonObjectMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonObjectMapper.java @@ -33,7 +33,7 @@ import org.springframework.integration.mapping.support.JsonHeaders; import org.springframework.util.Assert; /** - * Jackson JSON-processor (@link http://jackson.codehaus.org) {@linkplain JsonObjectMapper} implementation. + * Jackson JSON-processor (@link https://jackson.codehaus.org) {@linkplain JsonObjectMapper} implementation. * Delegates toJson and fromJson * to the {@linkplain org.codehaus.jackson.map.ObjectMapper} * diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/IntegrationNamespaceHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/IntegrationNamespaceHandlerTests.java index 675131fa38..605874e556 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/IntegrationNamespaceHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/IntegrationNamespaceHandlerTests.java @@ -58,7 +58,7 @@ public class IntegrationNamespaceHandlerTests { Element element = Mockito.mock(Element.class); Mockito.when(element.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "schemaLocation")) - .thenReturn("http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"); + .thenReturn("http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"); Document document = Mockito.mock(Document.class); Mockito.when(element.getOwnerDocument()).thenReturn(document); Mockito.when(document.getDocumentElement()).thenReturn(element); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/chain-elements-config.properties b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/chain-elements-config.properties index 490af3edb7..6db001bf48 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/chain-elements-config.properties +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/chain-elements-config.properties @@ -3,8 +3,8 @@ xmlheaders=\ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd \ + http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"> xmlfooter= service-activator=\ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties index edc777dd12..9d4b7b1a27 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties @@ -3,9 +3,9 @@ splitter-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -21,11 +21,11 @@ splitter-inner-success-with-poller=\ xmlns:beans="http://www.springframework.org/schema/beans" \ xmlns:task="http://www.springframework.org/schema/task" \ xsi:schemaLocation="http://www.springframework.org/schema/beans \ - http://www.springframework.org/schema/beans/spring-beans.xsd \ + https://www.springframework.org/schema/beans/spring-beans.xsd \ http://www.springframework.org/schema/task \ - http://www.springframework.org/schema/task/spring-task.xsd \ + https://www.springframework.org/schema/task/spring-task.xsd \ http://www.springframework.org/schema/integration \ - http://www.springframework.org/schema/integration/spring-integration.xsd"> \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -45,11 +45,11 @@ splitter-inner-success-with-poller-reversed-order=\ xmlns:beans="http://www.springframework.org/schema/beans" \ xmlns:task="http://www.springframework.org/schema/task" \ xsi:schemaLocation="http://www.springframework.org/schema/beans \ - http://www.springframework.org/schema/beans/spring-beans.xsd \ + https://www.springframework.org/schema/beans/spring-beans.xsd \ http://www.springframework.org/schema/task \ - http://www.springframework.org/schema/task/spring-task.xsd \ + https://www.springframework.org/schema/task/spring-task.xsd \ http://www.springframework.org/schema/integration \ - http://www.springframework.org/schema/integration/spring-integration.xsd"> \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -67,9 +67,9 @@ splitter-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -82,9 +82,9 @@ splitter-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -99,9 +99,9 @@ transformer-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -115,9 +115,9 @@ transformer-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -130,9 +130,9 @@ transformer-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -147,9 +147,9 @@ router-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -166,9 +166,9 @@ router-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -184,9 +184,9 @@ router-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -198,9 +198,9 @@ sa-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -214,9 +214,9 @@ sa-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -229,9 +229,9 @@ sa-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -246,9 +246,9 @@ aggregator-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -262,9 +262,9 @@ aggregator-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -280,11 +280,11 @@ aggregator-inner-concurrent-success=\ xmlns:beans="http://www.springframework.org/schema/beans" \ xmlns:task="http://www.springframework.org/schema/task" \ xsi:schemaLocation="http://www.springframework.org/schema/beans \ - http://www.springframework.org/schema/beans/spring-beans.xsd \ + https://www.springframework.org/schema/beans/spring-beans.xsd \ http://www.springframework.org/schema/task \ - http://www.springframework.org/schema/task/spring-task.xsd \ + https://www.springframework.org/schema/task/spring-task.xsd \ http://www.springframework.org/schema/integration \ - http://www.springframework.org/schema/integration/spring-integration.xsd"> \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -304,11 +304,11 @@ aggregator-inner-concurrent-success-reorder-bean-poller=\ xmlns:beans="http://www.springframework.org/schema/beans" \ xmlns:task="http://www.springframework.org/schema/task" \ xsi:schemaLocation="http://www.springframework.org/schema/beans \ - http://www.springframework.org/schema/beans/spring-beans.xsd \ + https://www.springframework.org/schema/beans/spring-beans.xsd \ http://www.springframework.org/schema/task \ - http://www.springframework.org/schema/task/spring-task.xsd \ + https://www.springframework.org/schema/task/spring-task.xsd \ http://www.springframework.org/schema/integration \ - http://www.springframework.org/schema/integration/spring-integration.xsd"> \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -326,9 +326,9 @@ aggregator-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -343,9 +343,9 @@ filter-inner-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -359,9 +359,9 @@ filter-ref-success=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ @@ -374,9 +374,9 @@ filter-failure-refAndBean=\ \ + https://www.springframework.org/schema/integration/spring-integration.xsd"> \ \ \ \ diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java index 72b9afb07d..50db7f3c95 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java @@ -88,9 +88,9 @@ public class PayloadTypeRouterParserTests { "" + + " https://www.springframework.org/schema/integration/spring-integration.xsd\">" + " " + " " + " " + @@ -102,9 +102,9 @@ public class PayloadTypeRouterParserTests { "" + + " https://www.springframework.org/schema/integration/spring-integration.xsd\">" + " " + " " + ""; diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd index b8b32777a7..4ca990797b 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.0.xsd @@ -8,7 +8,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.0.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.1.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.0.xsd" /> diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd index 9831c0df12..95128dfd73 100644 --- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd +++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.1.xsd" /> diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd index b9bda235d5..54bb03392e 100644 --- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd +++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> diff --git a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd index 954fe1c681..6df4fe1cc3 100644 --- a/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd +++ b/spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/empty.rss b/spring-integration-feed/src/test/java/org/springframework/integration/feed/empty.rss index dc33a94ea5..dd056fad05 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/empty.rss +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/empty.rss @@ -1,7 +1,7 @@ Spring Integration -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration Spring Integration is a really cool framework @@ -11,9 +11,9 @@ All Rights Reserved. Tue, 12 Apr 2010 18:21:32 EST 240 -http://www.springsource.org/sites/all/themes/dotorg09/images/dotorg09_logo.png +https://www.springsource.org/sites/all/themes/dotorg09/images/dotorg09_logo.png Spring Integration -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/sample.rss b/spring-integration-feed/src/test/java/org/springframework/integration/feed/sample.rss index 31fa532a39..add57258b2 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/sample.rss +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/sample.rss @@ -1,7 +1,7 @@ Spring Integration -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration Spring Integration is a really cool framework @@ -11,16 +11,16 @@ All Rights Reserved. Tue, 12 Apr 2010 18:21:32 EST 240 -http://www.springsource.org/sites/all/themes/dotorg09/images/dotorg09_logo.png +https://www.springsource.org/sites/all/themes/dotorg09/images/dotorg09_logo.png Spring Integration -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration Spring Integration adapters -http://www.springsource.org/extensions/se-sia +https://www.springsource.org/extensions/se-sia Spring Integration adapters are realy cool @@ -31,7 +31,7 @@ Spring Integration adapters are realy cool Spring Integration download -http://www.springsource.com/products/spring-community-download +https://www.springsource.com/products/spring-community-download Download Spring Integration @@ -42,7 +42,7 @@ Download Spring Integration Check out Spring Integration forums -http://forum.springsource.org/forumdisplay.php?f=42 +https://forum.spring.io/forumdisplay.php?f=42 Spring Integration forums are awesome diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-1.0.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-1.0.xsd index 3753122ea1..9b84372ba9 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-1.0.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-1.0.xsd @@ -11,7 +11,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.0.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.1.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd \ + http://www.springframework.org/schema/integration/file https://www.springframework.org/schema/integration/file/spring-integration-file.xsd \ + http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"> xmlfooter= file-oubound-gateway=\ diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd index c33819fd65..289007a8d7 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.0.xsd @@ -11,7 +11,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.0.xsd"/> diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd index 73e4c2fe59..0d39b48669 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.1.xsd" /> diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd index 5ac4c3e054..e528004c61 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd index 70f17c8053..02f42184a3 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd @@ -10,9 +10,9 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd" /> diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd index 856e629b99..81cf2af8cc 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.1.xsd @@ -7,10 +7,10 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> + schemaLocation="https://www.springframework.org/schema/beans/spring-beans-3.1.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.1.xsd" /> + schemaLocation="https://www.springframework.org/schema/beans/spring-beans-3.1.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> + schemaLocation="https://www.springframework.org/schema/beans/spring-beans.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd" /> - + diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.1.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.1.xsd index d397972165..52b1c1d47c 100644 --- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.1.xsd +++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.1.xsd @@ -7,10 +7,10 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - + diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd index dc60b9a20e..7afd6d8c70 100644 --- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd +++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd @@ -7,10 +7,10 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - + diff --git a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-3.0.xsd b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-3.0.xsd index 53f394a43b..e93aa26496 100644 --- a/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-3.0.xsd +++ b/spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-3.0.xsd @@ -7,10 +7,10 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - + diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.2.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.2.xsd index bb6190f11a..4399d71886 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.2.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.2.xsd @@ -7,7 +7,7 @@ - + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd \ + http://www.springframework.org/schema/integration/http https://www.springframework.org/schema/integration/http/spring-integration-http.xsd \ + http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd"> xmlfooter= http-oubound-gateway=\ - \ + \ diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java index 8267736938..f3ce737505 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java @@ -88,7 +88,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void simpleStringKeyStringValueFormData() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -122,7 +122,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void simpleStringKeyObjectValueFormData() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -155,7 +155,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void simpleObjectKeyObjectValueFormData() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -189,7 +189,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyStringArrayValueFormData() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -236,7 +236,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyPrimitiveArrayValueMixedFormData() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -285,7 +285,7 @@ public class HttpRequestExecutingMessageHandlerTests { } @Test public void stringKeyNullArrayValueMixedFormData() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -328,7 +328,7 @@ public class HttpRequestExecutingMessageHandlerTests { */ @Test public void stringKeyNullCollectionValueMixedFormDataString() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -375,7 +375,7 @@ public class HttpRequestExecutingMessageHandlerTests { */ @Test public void stringKeyNullCollectionValueMixedFormDataObject() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -417,7 +417,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyStringCollectionValueFormData() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -462,7 +462,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyObjectCollectionValueFormData() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -507,7 +507,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void nameOnlyWithNullValues() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -544,7 +544,7 @@ public class HttpRequestExecutingMessageHandlerTests { @SuppressWarnings("cast") @Test public void contentAsByteArray() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -570,7 +570,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void contentAsXmlSource() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -596,7 +596,7 @@ public class HttpRequestExecutingMessageHandlerTests { public void testWarnMessageForNonPostPutAndExtractPayload() throws Exception { // should see a warn message - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.GET); @@ -606,7 +606,7 @@ public class HttpRequestExecutingMessageHandlerTests { // should not see a warn message since 'setExtractPayload' is not set explicitly - handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.GET); @@ -615,7 +615,7 @@ public class HttpRequestExecutingMessageHandlerTests { // should not see a warn message since HTTP method is not GET - handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -627,7 +627,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void contentTypeIsNotSetForGetRequest() throws Exception { //GET - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.GET); @@ -652,7 +652,7 @@ public class HttpRequestExecutingMessageHandlerTests { /* //HEAD - handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.HEAD); @@ -670,7 +670,7 @@ public class HttpRequestExecutingMessageHandlerTests { assertNull(request.getHeaders().getContentType()); //DELETE - handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.DELETE); @@ -688,7 +688,7 @@ public class HttpRequestExecutingMessageHandlerTests { assertNull(request.getHeaders().getContentType()); //TRACE - handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.TRACE); @@ -753,7 +753,7 @@ public class HttpRequestExecutingMessageHandlerTests { public void testInt2455UriNotEncoded() { MockRestTemplate restTemplate = new MockRestTemplate(); HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - new SpelExpressionParser().parseExpression("'http://my.RabbitMQ.com/api/' + payload"), + new SpelExpressionParser().parseExpression("'https://my.RabbitMQ.com/api/' + payload"), restTemplate); handler.setEncodeUri(false); setBeanFactory(handler); @@ -763,13 +763,13 @@ public class HttpRequestExecutingMessageHandlerTests { handler.handleRequestMessage(message); } catch (Exception e) {} - assertEquals("http://my.RabbitMQ.com/api/queues/%2f/si.test.queue?foo#bar", restTemplate.actualUrl.get()); + assertEquals("https://my.RabbitMQ.com/api/queues/%2f/si.test.queue?foo#bar", restTemplate.actualUrl.get()); } @Test public void nonCompatibleConversionService() throws Exception { HttpRequestExecutingMessageHandler handler = - new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); ConfigurableListableBeanFactory bf = new DefaultListableBeanFactory(); ConversionService mockConversionService = mock(ConversionService.class); bf.registerSingleton("integrationConversionService", mockConversionService); @@ -786,7 +786,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void compatibleConversionService() throws Exception { HttpRequestExecutingMessageHandler handler = - new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); ConfigurableListableBeanFactory bf = new DefaultListableBeanFactory(); ProxyFactory pf = new ProxyFactory(new Class[] {ConversionService.class, ConverterRegistry.class}); final AtomicInteger converterCount = new AtomicInteger(); @@ -809,7 +809,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void acceptHeaderForSerializableResponse() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); handler.setHttpMethod(HttpMethod.GET); handler.setExpectedResponseType(Foo.class); @@ -842,7 +842,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void acceptHeaderForSerializableResponseMessageExchange() throws Exception { - HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); handler.setHttpMethod(HttpMethod.GET); handler.setExtractPayload(false); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java index d0638b3cc2..7f4ea58b08 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java @@ -271,11 +271,11 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { public void validateLocation() throws Exception{ HeaderMapper mapper = DefaultHttpHeaderMapper.inboundMapper(); Map messageHeaders = new HashMap(); - messageHeaders.put("Location", "http://foo.com"); + messageHeaders.put("Location", "http://www.foo.com/"); HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); - assertEquals(new URI("http://foo.com").toString(), headers.getLocation().toString()); + assertEquals(new URI("http://www.foo.com/").toString(), headers.getLocation().toString()); } // Transfer Encoding tests @@ -477,7 +477,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { HttpHeaders headers = new HttpHeaders(); headers.set("foobar", "abc"); headers.setAccept(Collections.singletonList(MediaType.TEXT_XML)); - headers.setLocation(new URI("http://example.org")); + headers.setLocation(new URI("https://example.org")); Map result = mapper.toHeaders(headers); assertEquals(2, result.size()); assertNull(result.get("Location")); diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd index baeddaa28a..b21d282fe7 100644 --- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd +++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.0.xsd @@ -11,7 +11,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.0.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.1.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> 1. * - * Fore more details, please see: http://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked + * Fore more details, please see: https://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked * * @author Gunnar Hillert * @since 2.2 diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd index 65d6ace1db..b4eef4240b 100644 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.0.xsd @@ -6,7 +6,7 @@ - + - + - + - + " + + " xsi:schemaLocation=\"http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd" + + " http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + + " http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">" + "" + " " + "" + @@ -84,9 +84,9 @@ public class InnerPollerParserTests { " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" + " xmlns:int=\"http://www.springframework.org/schema/integration\"" + " xmlns:int-jdbc=\"http://www.springframework.org/schema/integration/jdbc\"" + - " xsi:schemaLocation=\"http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd" + - " http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + - " http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd\">" + + " xsi:schemaLocation=\"http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd" + + " http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + + " http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">" + "" + " " + "" + @@ -120,9 +120,9 @@ public class InnerPollerParserTests { " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" + " xmlns:int=\"http://www.springframework.org/schema/integration\"" + " xmlns:int-jdbc=\"http://www.springframework.org/schema/integration/jdbc\"" + - " xsi:schemaLocation=\"http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd" + - " http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + - " http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd\">" + + " xsi:schemaLocation=\"http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd" + + " http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd" + + " http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd\">" + "" + " " + "" + diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/stored-proc-invalid-configs.properties b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/stored-proc-invalid-configs.properties index c2695d9bd3..9f61705831 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/stored-proc-invalid-configs.properties +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/stored-proc-invalid-configs.properties @@ -3,8 +3,8 @@ xmlheaders=\ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd \ + http://www.springframework.org/schema/integration/jdbc https://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd"> xmlfooter= nameAndExpressionExclusivity= + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.0.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.1.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> - + - + - + - + + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-1.0.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.0.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.1.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-2.2.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> Twitter - - - - + + + + @@ -48,7 +48,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
@@ -127,49 +127,49 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
  • Trending topics
  • - Catwoman + Catwoman
  • - Damn Beliebers + Damn Beliebers
  • - Anne Hathaway + Anne Hathaway
  • - Steven Tyler + Steven Tyler
  • - Coachella + Coachella
  • - Friday + Friday
  • - Modern Family + Modern Family
    • @@ -178,49 +178,49 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
  • Trending topics
  • - Obamacare + Obamacare
  • - First Class + First Class
  • - English + English
  • - Rise & Grind + Rise & Grind
  • - Rivaldo + Rivaldo
  • - Seoul Music Awards + Seoul Music Awards
  • - Passiva + Passiva
    • @@ -229,49 +229,49 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
  • Trending topics
  • - JBisJonasBrothers + JBisJonasBrothers
  • - Farmacêutico + Farmacêutico
  • - Giuliano + Giuliano
  • - Edgar Allan Poe + Edgar Allan Poe
  • - Tom Hardy + Tom Hardy
  • - Janis Joplin + Janis Joplin
  • - Bane + Bane
    • @@ -288,7 +288,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo @@ -314,25 +314,25 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo

    Top Trending Topics

    @@ -349,11 +349,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo

    See who’s here

    • - +
      - nate_robinson + nate_robinson
      Nate Robinson 
      @nate_robinson Rain city ( word aapp ) | in Sports @@ -369,11 +369,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - ev + ev
      Evan Williams 
      @ev San Francisco, CA, US | in Business @@ -389,11 +389,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - nytimes + nytimes
      The New York Times 
      @nytimes New York, NY | in News @@ -401,7 +401,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
      Recently tweeted:
      -
      The Caucus: Chinese President May Get Earful From Lawmakers http://nyti.ms/gVqqut
      +
      The Caucus: Chinese President May Get Earful From Lawmakers https://nyti.ms/gVqqut
      20 minutes ago
      @@ -409,11 +409,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - therealKDUB20 + therealKDUB20
      Kyle Wilson 
      @therealKDUB20 New York | in Staff Picks: NFL Playoffs @@ -429,11 +429,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - Oxfam + Oxfam
      Oxfam International 
      @Oxfam in Charity @@ -441,7 +441,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
      Recently tweeted:
      -
      Oxfam calls on international donors to fund upcoming @UN $51mn appeal for #SriLanka #floods http://oxf.am/ZMm
      +
      Oxfam calls on international donors to fund upcoming @UN $51mn appeal for #SriLanka #floods https://oxf.am/ZMm
      about 2 hours ago
      @@ -449,11 +449,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - grantimahara + grantimahara
      Grant Imahara 
      @grantimahara San Francisco, CA | in Science @@ -469,11 +469,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - chelseahandler + chelseahandler
      Chelsea Handler 
      @chelseahandler Los Angeles, CA | in Entertainment @@ -489,11 +489,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - kevin_nealon + kevin_nealon
      Kevin Nealon 
      @kevin_nealon Los Angeles, Ca. | in Funny @@ -509,11 +509,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - healthfinder + healthfinder
      healthfinder.gov 
      @healthfinder Washington, DC | in Health @@ -521,7 +521,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
      Recently tweeted:
      -
      Fight the #flu. Stay away from people who are sick, wash your hands, and get enough sleep. More quick tips: http://bit.ly/dN812J.
      +
      Fight the #flu. Stay away from people who are sick, wash your hands, and get enough sleep. More quick tips: https://bit.ly/dN812J.
      about 17 hours ago
      @@ -529,11 +529,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - kevinrose + kevinrose
      Kevin Rose 
      @kevinrose San Francisco, CA | in Technology @@ -549,11 +549,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - azizansari + azizansari
      Aziz Ansari 
      @azizansari Los Angeles, CA | in Staff Picks @@ -569,11 +569,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - SimpleMom + SimpleMom
      Tsh Oxenreider 
      @SimpleMom Austin | in Family @@ -589,11 +589,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - BoltBus + BoltBus
      BoltBus 
      @BoltBus Northeast | in Travel @@ -609,11 +609,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - ArchRecord + ArchRecord
      Architectural Record 
      @ArchRecord New York City | in Art & Design @@ -621,7 +621,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
      Recently tweeted:
      -
      Our latest Newsmaker Interview with #AIA Gold Medal Winner Fumihiko Maki http://ht.ly/3GzWs
      +
      Our latest Newsmaker Interview with #AIA Gold Medal Winner Fumihiko Maki https://www.architecturalrecord.com/news/newsmakers/1101fumihiko_maki.asp?WT.mc_id=twitter_archrecord?WT.mc_id=twitter_archrecord
      about 22 hours ago
      @@ -629,11 +629,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - gtdguy + gtdguy
      David Allen 
      @gtdguy Ojai, California | in Books @@ -649,11 +649,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - GaelGreene + GaelGreene
      Gael Greene 
      @GaelGreene New York City | in Food & Drink @@ -669,11 +669,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - CoryBooker + CoryBooker
      Cory Booker 
      @CoryBooker Newark, NJ | in Politics @@ -689,11 +689,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - amazondeals + amazondeals
      Amazon.com Deals 
      @amazondeals Seattle, Washington | in Deals @@ -701,7 +701,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
      Recently tweeted:
      -
      Lightning Deal! $109.99 - TomTom XXL 540T 5-Inch Widescreen Portable GPS Navigator (Lifetime Traffic Edition) http://amzn.to/GoldboxDeals
      +
      Lightning Deal! $109.99 - TomTom XXL 540T 5-Inch Widescreen Portable GPS Navigator (Lifetime Traffic Edition) https://amzn.to/GoldboxDeals
      about 1 hour ago
      @@ -709,11 +709,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - Support + Support
      Support 
      @Support Twitter HQ | in Twitter @@ -729,11 +729,11 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo
    • - +
      - _BoF_ + _BoF_
      Business of Fashion 
      @_BoF_ London, New York, Tokyo, Paris | in Fashion @@ -760,7 +760,7 @@ if (window.top !== window.self) {document.write = "";window.top.location = windo

      Top Tweets View all

      - + - + +