diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index f013d6f36b..17783c7c06 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.adoc b/CONTRIBUTING.adoc index b236df01b1..03cbfcd1f5 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -33,7 +33,7 @@ Signing the CLA does not grant anyone commit rights to the main repository, but 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/[Fork A Repo]. +3. For more detail see https://help.github.com/fork-a-repo/[Fork A Repo]. == Setup your Local Development Environment @@ -53,7 +53,7 @@ _you should see branches on origin as well as upstream, including 'master'_ * _Always_ work on topic branches (Typically use the GitHub issue ID as the branch name). - For example, to create and switch to a new branch for issue 123: `git checkout -b GH-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 http://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project[this chapter of Pro Git]. +* Please follow the "Commit Guidelines" described in https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project[this chapter of Pro Git]. * Then to begin working on another issue (say 101): `git checkout GH-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 GH-123` @@ -65,7 +65,7 @@ Alternatively, they can use `git fetch --all` to sync their local state with all * 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 http://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]. +For a full explanation, see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]. 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 @@ -80,7 +80,7 @@ As stated there: _"> Often, you’ll do this to make sure your commits apply cle - Then: `git pull upstream master` - Switch back to the topic branch: `git checkout GH-123` (no -b needed since the branch already exists) - Rebase the topic branch to minimize the distance between it and your recently synced master branch: `git rebase master` -(Again, for more detail see http://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]). +(Again, for more detail see https://git-scm.com/book/en/Git-Branching-Rebasing[the Pro Git section on rebasing]). * **Note** While it is generally recommended to __not__ re-write history by using `push --force`, and we do not do this on `master` (and release) branches in the main repo, we require topic branches for pull requests to be rebased before merging, in order to maintain a clean timeline and avoid "merge" commits. * If, while rebasing for the merge, we find significant conflicts, we may ask you to rebase and `push --force` to your topic branch after resolving the conflicts. * Assuming your pull request is merged into the 'upstream' master, you will 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. diff --git a/README.md b/README.md index 4e54e2dd78..92a11df820 100644 --- a/README.md +++ b/README.md @@ -53,4 +53,4 @@ To generate IDEA metadata (.iml and .ipr files), do the following: # Resources For more information, please visit the Spring Integration website at: -[http://projects.spring.io/spring-integration](http://projects.spring.io/spring-integration/) +[https://projects.spring.io/spring-integration](https://projects.spring.io/spring-integration/) diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd index 1b2ce7f920..b493dfbf45 100644 --- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd +++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-5.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java index 0a0b884993..251f25e781 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/IdempotentReceiverInterceptor.java @@ -28,7 +28,7 @@ import org.springframework.util.Assert; /** * The {@link org.aopalliance.intercept.MethodInterceptor} implementation for the - * Idempotent Receiver + * Idempotent Receiver * E.I. Pattern. *

* This {@link org.aopalliance.intercept.MethodInterceptor} works like a 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 5827f8ffec..6b6ee5d1b6 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 @@ -26,7 +26,7 @@ import com.jayway.jsonpath.Predicate; /** * 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/scattergather/ScatterGatherHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java index 2b2c95cbe9..1b528b6c8e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/scattergather/ScatterGatherHandler.java @@ -44,7 +44,7 @@ import org.springframework.util.ClassUtils; /** * The {@link MessageHandler} implementation for the - * Scatter-Gather EIP pattern. + * Scatter-Gather EIP pattern. * * @author Artem Bilan * @author Abdul Zaheer diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java index 5f51ae18ad..1e2e57b0b8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/MetadataStoreSelector.java @@ -39,7 +39,7 @@ import org.springframework.util.Assert; * {@code MetadataStore} associated with the {@code key}. *

* This {@link MessageSelector} is useful for an - * Idempotent Receiver + * Idempotent Receiver * implementation. *

* It can be used in a {@link org.springframework.integration.filter.MessageFilter} 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/idempotent-receiver-configs.properties b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/idempotent-receiver-configs.properties index bef7d6af06..574974b0a0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/idempotent-receiver-configs.properties +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/idempotent-receiver-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 https://www.springframework.org/schema/integration/spring-integration.xsd"> xmlfooter= empty= 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 d17d38496d..df0d215dde 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 7970fd0ab8..047ec245ad 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 @@ -84,9 +84,9 @@ public class PayloadTypeRouterParserTests { "" + + " https://www.springframework.org/schema/integration/spring-integration.xsd\">" + " " + " " + " " + @@ -98,9 +98,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-5.1.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd index ee50ce9886..9c8b9b4919 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-5.1.xsd @@ -8,7 +8,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.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 c475f18280..3f940edfb3 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 really cool @@ -31,7 +31,7 @@ Spring Integration adapters are really 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-5.1.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd index 5b8a245403..b9fff22c3d 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd @@ -10,7 +10,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.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-outbound-gateway=\ diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd index 0036d9b269..44f557e7e8 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-5.1.xsd @@ -10,9 +10,9 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/file/spring-integration-file-5.1.xsd" /> diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd index 8203f9a326..264b6c562a 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-5.1.xsd @@ -7,10 +7,10 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> + schemaLocation="https://www.springframework.org/schema/beans/spring-beans.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java index 07e7a3022b..49bfd28091 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/dsl/HttpInboundEndpointSupportSpec.java @@ -364,7 +364,7 @@ public abstract class HttpInboundEndpointSupportSpecThese values are placed in the {@code Access-Control-Allow-Origin} * header of both the pre-flight response and the actual response. * {@code "*"} means that all origins are allowed. diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd index b85ec32c07..f1d30adf23 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.1.xsd @@ -8,7 +8,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.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-outbound-gateway=\ - \ + \ diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests-context.xml b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests-context.xml index b0ba72eaad..cee952905a 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests-context.xml +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/CrossOriginTests-context.xml @@ -31,7 +31,7 @@ - diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java index 5ffb24105e..2518ddec1d 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/management/IntegrationGraphControllerTests.java @@ -85,7 +85,7 @@ public class IntegrationGraphControllerTests { @Test public void testIntegrationGraphGet() throws Exception { this.mockMvc.perform(get("/testIntegration") - .header(HttpHeaders.ORIGIN, "http://foo.bar.com") + .header(HttpHeaders.ORIGIN, "https://example.com") .accept(MediaType.parseMediaType("application/json;charset=UTF-8"))) .andExpect(status().isOk()) .andExpect(content().contentType("application/json;charset=UTF-8")) @@ -113,7 +113,7 @@ public class IntegrationGraphControllerTests { MockHttpServletRequest request = new MockHttpServletRequest(); request.setMethod("GET"); request.setRequestURI("/foo"); - request.addHeader(HttpHeaders.ORIGIN, "http://foo.bar.com"); + request.addHeader(HttpHeaders.ORIGIN, "https://example.com"); MockHttpServletResponse response = new MockHttpServletResponse(); HandlerExecutionChain executionChain = handlerMapping.getHandler(request); @@ -161,7 +161,7 @@ public class IntegrationGraphControllerTests { @EnableIntegrationManagement(statsEnabled = "_org.springframework.integration.errorLogger.handler", countsEnabled = "!*", defaultLoggingEnabled = "false") - @EnableIntegrationGraphController(path = "/testIntegration", allowedOrigins = "http://foo.bar.com") + @EnableIntegrationGraphController(path = "/testIntegration", allowedOrigins = "https://example.com") public static class ContextConfiguration { } 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 ce48fa9a6b..fad55b6775 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 @@ -90,7 +90,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void simpleStringKeyStringValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -125,7 +125,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void simpleStringKeyObjectValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -159,7 +159,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void simpleObjectKeyObjectValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -194,7 +194,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyStringArrayValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -242,7 +242,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyPrimitiveArrayValueMixedFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -293,7 +293,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyNullArrayValueMixedFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -337,7 +337,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyNullCollectionValueMixedFormDataString() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -384,7 +384,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyNullCollectionValueMixedFormDataObject() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -427,7 +427,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyStringCollectionValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -472,7 +472,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void stringKeyObjectCollectionValueFormData() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -517,7 +517,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void nameOnlyWithNullValues() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -555,7 +555,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void contentAsByteArray() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -582,7 +582,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void contentAsXmlSource() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.POST); @@ -609,7 +609,7 @@ public class HttpRequestExecutingMessageHandlerTests { // should see a warn message HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.GET); @@ -619,7 +619,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); @@ -628,7 +628,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); @@ -641,7 +641,7 @@ public class HttpRequestExecutingMessageHandlerTests { public void contentTypeIsNotSetForGetAndHeadRequest() throws Exception { // GET HttpRequestExecutingMessageHandler handler = - new HttpRequestExecutingMessageHandler("http://www.springsource.org/spring-integration"); + new HttpRequestExecutingMessageHandler("https://www.springsource.org/spring-integration"); MockRestTemplate template = new MockRestTemplate(); new DirectFieldAccessor(handler).setPropertyValue("restTemplate", template); handler.setHttpMethod(HttpMethod.GET); @@ -755,7 +755,7 @@ public class HttpRequestExecutingMessageHandlerTests { public void testInt2455UriNotEncoded() { MockRestTemplate restTemplate = new MockRestTemplate(); HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - new SpelExpressionParser().parseExpression("'http://my.RabbitMQ.com/api/' + payload"), restTemplate); + new SpelExpressionParser().parseExpression("'https://my.RabbitMQ.com/api/' + payload"), restTemplate); handler.setEncodeUri(false); setBeanFactory(handler); handler.afterPropertiesSet(); @@ -765,13 +765,13 @@ public class HttpRequestExecutingMessageHandlerTests { } 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 acceptHeaderForSerializableResponse() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "https://www.springsource.org/spring-integration"); handler.setHttpMethod(HttpMethod.GET); handler.setExpectedResponseType(Foo.class); @@ -805,7 +805,7 @@ public class HttpRequestExecutingMessageHandlerTests { @Test public void acceptHeaderForSerializableResponseMessageExchange() throws Exception { HttpRequestExecutingMessageHandler handler = new HttpRequestExecutingMessageHandler( - "http://www.springsource.org/spring-integration"); + "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 aecdb6e439..fe7079b72e 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 @@ -272,11 +272,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 @@ -479,7 +479,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-5.1.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd index b35ae329d7..728c4314f6 100644 --- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd +++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-5.1.xsd @@ -9,7 +9,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> 1. *

* Fore more details, please see: - * http://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked + * https://stackoverflow.com/questions/6117254/force-oracle-to-return-top-n-rows-with-skip-locked * * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd index 1abf4db82a..c49ac946af 100644 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-5.1.xsd @@ -7,7 +7,7 @@ + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.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\">" + "" + " " + "" + @@ -87,9 +87,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\">" + "" + " " + "" + @@ -124,9 +124,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-5.1.xsd"/> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.xsd" /> + schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.1.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

      - + - + +