From 58d8d149125e5147be5473b5bd6458413975aeeb Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 20 Mar 2019 15:44:17 -0500 Subject: [PATCH] URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # HTTP URLs that Could Not Be Fixed These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * [ ] http://xslthl.sf.net (301) with 4 occurrences could not be migrated: ([https](https://xslthl.sf.net) result AnnotatedConnectException). * [ ] http://exslt.org/common (404) with 1 occurrences could not be migrated: ([https](https://exslt.org/common) result SSLHandshakeException). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://192.168.65.111:20043 (ConnectTimeoutException) with 1 occurrences migrated to: https://192.168.65.111:20043 ([https](https://192.168.65.111:20043) result ConnectTimeoutException). * [ ] http://m1.dcos (UnknownHostException) with 2 occurrences migrated to: https://m1.dcos ([https](https://m1.dcos) result UnknownHostException). * [ ] http://m1.dcos/marathon (UnknownHostException) with 2 occurrences migrated to: https://m1.dcos/marathon ([https](https://m1.dcos/marathon) result UnknownHostException). * [ ] http://m1.dcos/mesos (UnknownHostException) with 2 occurrences migrated to: https://m1.dcos/mesos ([https](https://m1.dcos/mesos) result UnknownHostException). * [ ] http://m1.dcos/service/chronos (UnknownHostException) with 4 occurrences migrated to: https://m1.dcos/service/chronos ([https](https://m1.dcos/service/chronos) result UnknownHostException). * [ ] http://m1.dcos/service/marathon (UnknownHostException) with 4 occurrences migrated to: https://m1.dcos/service/marathon ([https](https://m1.dcos/service/marathon) result UnknownHostException). * [ ] http://m1.dcos/service/marathon/v2/apps (UnknownHostException) with 4 occurrences migrated to: https://m1.dcos/service/marathon/v2/apps ([https](https://m1.dcos/service/marathon/v2/apps) result UnknownHostException). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://cloud.spring.io/spring-cloud-stream/ with 1 occurrences migrated to: https://cloud.spring.io/spring-cloud-stream/ ([https](https://cloud.spring.io/spring-cloud-stream/) result 200). * [ ] http://cloud.spring.io/spring-cloud-task/ with 1 occurrences migrated to: https://cloud.spring.io/spring-cloud-task/ ([https](https://cloud.spring.io/spring-cloud-task/) result 200). * [ ] http://docs.spring.io/spring-cloud-dataflow/docs/ with 5 occurrences migrated to: https://docs.spring.io/spring-cloud-dataflow/docs/ ([https](https://docs.spring.io/spring-cloud-dataflow/docs/) result 200). * [ ] http://docs.spring.io/spring-cloud-stream-app-starters/docs/ with 2 occurrences migrated to: https://docs.spring.io/spring-cloud-stream-app-starters/docs/ ([https](https://docs.spring.io/spring-cloud-stream-app-starters/docs/) result 200). * [ ] http://docs.spring.io/spring-cloud-stream/docs/ with 1 occurrences migrated to: https://docs.spring.io/spring-cloud-stream/docs/ ([https](https://docs.spring.io/spring-cloud-stream/docs/) result 200). * [ ] http://docs.spring.io/spring-cloud-task-app-starters/docs/ with 1 occurrences migrated to: https://docs.spring.io/spring-cloud-task-app-starters/docs/ ([https](https://docs.spring.io/spring-cloud-task-app-starters/docs/) result 200). * [ ] http://docs.spring.io/spring-cloud-task/ with 1 occurrences migrated to: https://docs.spring.io/spring-cloud-task/ ([https](https://docs.spring.io/spring-cloud-task/) result 200). * [ ] http://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/ with 1 occurrences migrated to: https://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/ ([https](https://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/) result 200). * [ ] http://repo.spring.io/libs-snapshot/org/springframework/cloud/task/app/ with 1 occurrences migrated to: https://repo.spring.io/libs-snapshot/org/springframework/cloud/task/app/ ([https](https://repo.spring.io/libs-snapshot/org/springframework/cloud/task/app/) result 200). * [ ] http://bit.ly/stream-applications-rabbit-docker with 1 occurrences migrated to: https://bit.ly/stream-applications-rabbit-docker ([https](https://bit.ly/stream-applications-rabbit-docker) result 301). * [ ] http://repo.spring.io/ with 1 occurrences migrated to: https://repo.spring.io/ ([https](https://repo.spring.io/) result 302). # Ignored These URLs were intentionally ignored. * http://docbook.org/ns/docbook with 4 occurrences * http://docbook.sourceforge.net/xmlns/l10n/1.0 with 2 occurrences * http://localhost:8761/eureka/ with 1 occurrences * http://localhost:8888 with 1 occurrences * http://www.w3.org/1999/XSL/Format with 2 occurrences * http://www.w3.org/1999/XSL/Transform with 6 occurrences * http://www.w3.org/1999/xlink with 1 occurrences --- .../main/asciidoc/appendix-test-cluster.adoc | 2 +- .../src/main/asciidoc/getting-started.adoc | 22 +++++++++---------- .../src/main/asciidoc/overview.adoc | 14 ++++++------ .../src/main/docbook/xsl/common.xsl | 2 +- .../src/main/docbook/xsl/epub.xsl | 2 +- .../src/main/docbook/xsl/html.xsl | 2 +- .../src/main/docbook/xsl/pdf.xsl | 2 +- src/etc/marathon/scdf-server.json | 4 ++-- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/appendix-test-cluster.adoc b/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/appendix-test-cluster.adoc index 90de3ec..749a0d5 100644 --- a/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/appendix-test-cluster.adoc +++ b/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/appendix-test-cluster.adoc @@ -2,7 +2,7 @@ [[test-cluster]] == Test Cluster -Here are brief setup instructions for setting up a local Vagrant DC/OS Mesos cluster. The DC/OS Dashboard endpoint will be http://m1.dcos[http://m1.dcos], the Mesos endpoint will be http://m1.dcos/mesos[http://m1.dcos/mesos], the Marathon endpoint will be http://m1.dcos/marathon[http://m1.dcos/marathon] and the Chronos endpoint will be http://m1.dcos/service/chronos[http://m1.dcos/service/chronos]. +Here are brief setup instructions for setting up a local Vagrant DC/OS Mesos cluster. The DC/OS Dashboard endpoint will be https://m1.dcos[https://m1.dcos], the Mesos endpoint will be https://m1.dcos/mesos[https://m1.dcos/mesos], the Marathon endpoint will be https://m1.dcos/marathon[https://m1.dcos/marathon] and the Chronos endpoint will be https://m1.dcos/service/chronos[https://m1.dcos/service/chronos]. Detailed installation instructions are here: https://github.com/dcos/dcos-vagrant[https://github.com/dcos/dcos-vagrant] diff --git a/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/getting-started.adoc index eda3586..e3b5599 100644 --- a/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/getting-started.adoc @@ -12,7 +12,7 @@ NOTE: The more recent DC/OS versions include Marathon version 3.0 which has chan + The rest of this getting started guide assumes that you have a working Mesos and Marathon cluster and know the Marathon endpoint URL. + -We are using the Marathon endpoint URL of http://m1.dcos/service/marathon[http://m1.dcos/service/marathon] for this document. +We are using the Marathon endpoint URL of https://m1.dcos/service/marathon[https://m1.dcos/service/marathon] for this document. + . Create a MySQL service on the Mesos cluster. + @@ -21,7 +21,7 @@ The `mysql` service will be used for storing stream and task definitions in the Using the above JSON file and an Mesos and Marathon cluster installed you can deploy a Rabbit MQ application instance by issuing the following command + ``` -curl -X POST http://m1.dcos/service/marathon/v2/apps -d @mysql.json -H "Content-type: application/json" +curl -X POST https://m1.dcos/service/marathon/v2/apps -d @mysql.json -H "Content-type: application/json" ``` + NOTE: Note the `@` symbol to reference a file input for the `curl` command. @@ -33,7 +33,7 @@ The `rabbitmq` service will be used for messaging between applications in the st Using the above JSON file and an Mesos and Marathon cluster installed you can deploy a Rabbit MQ service instance by issuing the following command + ``` -curl -X POST http://m1.dcos/service/marathon/v2/apps -d @rabbitmq.json -H "Content-type: application/json" +curl -X POST https://m1.dcos/service/marathon/v2/apps -d @rabbitmq.json -H "Content-type: application/json" ``` + . Create a Redis service on the Mesos cluster. @@ -43,7 +43,7 @@ The `redis` service will be used for counters as part of the analytics. There i Using the above JSON file and an Mesos and Marathon cluster installed you can deploy a Redis service instance by issuing the following command + ``` -curl -X POST http://m1.dcos/service/marathon/v2/apps -d @redis.json -H "Content-type: application/json" +curl -X POST https://m1.dcos/service/marathon/v2/apps -d @redis.json -H "Content-type: application/json" ``` + Using the Marathon and Mesos UIs you can verify that `mysql`, `rabbitmq` and `redis` services are running on the cluster. @@ -82,8 +82,8 @@ First we need to modify the Docker image to use the tag `{docker-tag}`. It shoul In the `env` section there are several environment variables that we need to adjust. We need to provide the following properties for accessing Marathon and Chronos APIs: + ``` - "MESOS_MARATHON_URI": "http://m1.dcos/service/marathon", - "MESOS_CHRONOS_URI": "http://m1.dcos/service/chronos", + "MESOS_MARATHON_URI": "https://m1.dcos/service/marathon", + "MESOS_CHRONOS_URI": "https://m1.dcos/service/chronos", ``` + Here we did set them to the defaults for a local Vagrant DC/OS installation. @@ -132,7 +132,7 @@ We also need to add the `spring.cloud.deployer.mesos.dcos.authorizationToken` pr + [source,subs="attributes"] ---- -curl -X POST http://m1.dcos/service/marathon/v2/apps -d @scdf-server.json -H "Content-type: application/json" +curl -X POST https://m1.dcos/service/marathon/v2/apps -d @scdf-server.json -H "Content-type: application/json" ---- + Verify that the `spring-cloud-data-flow` application is running before proceeding. @@ -141,7 +141,7 @@ Verify that the `spring-cloud-data-flow` application is running before proceedin + [source,subs="attributes"] ---- -$ wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-shell/{dataflow-project-version}/spring-cloud-dataflow-shell-{dataflow-project-version}.jar +$ wget https://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-shell/{dataflow-project-version}/spring-cloud-dataflow-shell-{dataflow-project-version}.jar $ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar ---- @@ -149,13 +149,13 @@ $ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar Lookup the host and port for the `spring-cloud-data-flow` application in the Marathon UI. Use those values to configure the server URI for the shell: + ``` -dataflow:>dataflow config server --uri http://192.168.65.111:20043 +dataflow:>dataflow config server --uri https://192.168.65.111:20043 ``` + -. By default, the application registry will be empty. If you would like to register all out-of-the-box stream applications built with the RabbitMQ binder in bulk, you can with the following command. For more details, review how to link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/html/spring-cloud-dataflow-register-apps.html[register applications]. +. By default, the application registry will be empty. If you would like to register all out-of-the-box stream applications built with the RabbitMQ binder in bulk, you can with the following command. For more details, review how to link:https://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/html/spring-cloud-dataflow-register-apps.html[register applications]. + ``` -dataflow:>app import --uri http://bit.ly/stream-applications-rabbit-docker +dataflow:>app import --uri https://bit.ly/stream-applications-rabbit-docker ``` + . Deploy a simple stream in the shell diff --git a/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/overview.adoc b/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/overview.adoc index 072a463..3008277 100644 --- a/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/overview.adoc +++ b/spring-cloud-dataflow-server-mesos-docs/src/main/asciidoc/overview.adoc @@ -2,25 +2,25 @@ == Spring Cloud Data Flow Spring Cloud Data Flow is a cloud-native orchestration service for composable data microservices on modern runtimes. With Spring Cloud Data Flow, developers can create and orchestrate data pipelines for common use cases such as data ingest, real-time analytics, and data import/export. -The Spring Cloud Data Flow architecture consists of a server that deploys http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#streams[Streams] and http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-task-overview[Tasks]. Streams are defined using a http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/html/_dsl_syntax.html[DSL] or visually through the browser based designer UI. Streams are based on the http://cloud.spring.io/spring-cloud-stream/[Spring Cloud Stream] programming model while Tasks are based on the http://cloud.spring.io/spring-cloud-task/[Spring Cloud Task] programming model. The sections below describe more information about creating your own custom Streams and Tasks +The Spring Cloud Data Flow architecture consists of a server that deploys https://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#streams[Streams] and https://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-task-overview[Tasks]. Streams are defined using a https://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/html/_dsl_syntax.html[DSL] or visually through the browser based designer UI. Streams are based on the https://cloud.spring.io/spring-cloud-stream/[Spring Cloud Stream] programming model while Tasks are based on the https://cloud.spring.io/spring-cloud-task/[Spring Cloud Task] programming model. The sections below describe more information about creating your own custom Streams and Tasks -For more details about the core architecture components and the supported features, please review Spring Cloud Data Flow's http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/[core reference guide]. There're several https://github.com/spring-cloud/spring-cloud-dataflow-samples[samples] available for reference. +For more details about the core architecture components and the supported features, please review Spring Cloud Data Flow's https://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/[core reference guide]. There're several https://github.com/spring-cloud/spring-cloud-dataflow-samples[samples] available for reference. [[spring-cloud-stream-overview]] == Spring Cloud Stream Spring Cloud Stream is a framework for building message-driven microservice applications. Spring Cloud Stream builds upon Spring Boot to create standalone, production-grade Spring applications, and uses Spring Integration to provide connectivity to message brokers. It provides opinionated configuration of middleware from several vendors, introducing the concepts of persistent publish-subscribe semantics, consumer groups, and partitions. -For more details about the core framework components and the supported features, please review Spring Cloud Stream's http://docs.spring.io/spring-cloud-stream/docs/{scst-core-version}/reference/htmlsingle/[reference guide]. +For more details about the core framework components and the supported features, please review Spring Cloud Stream's https://docs.spring.io/spring-cloud-stream/docs/{scst-core-version}/reference/htmlsingle/[reference guide]. -There's a rich ecosystem of Spring Cloud Stream http://docs.spring.io/spring-cloud-stream-app-starters/docs/{scst-starters-core-version}/reference/htmlsingle[Application-Starters] that can be used either as standalone data microservice applications or in Spring Cloud Data Flow. For convenience, we have generated RabbitMQ and Apache Kafka variants of these application-starters that are available for use from http://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/[Maven Repo] and https://hub.docker.com/r/springcloudstream/[Docker Hub] as maven artifacts and docker images, respectively. +There's a rich ecosystem of Spring Cloud Stream https://docs.spring.io/spring-cloud-stream-app-starters/docs/{scst-starters-core-version}/reference/htmlsingle[Application-Starters] that can be used either as standalone data microservice applications or in Spring Cloud Data Flow. For convenience, we have generated RabbitMQ and Apache Kafka variants of these application-starters that are available for use from https://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/[Maven Repo] and https://hub.docker.com/r/springcloudstream/[Docker Hub] as maven artifacts and docker images, respectively. -Do you have a requirement to develop custom applications? No problem. Refer to this guide to create http://docs.spring.io/spring-cloud-stream-app-starters/docs/{scst-starters-core-version}/reference/htmlsingle/#_creating_custom_artifacts[custom stream applications]. There're several https://github.com/spring-cloud/spring-cloud-stream-samples[samples] available for reference. +Do you have a requirement to develop custom applications? No problem. Refer to this guide to create https://docs.spring.io/spring-cloud-stream-app-starters/docs/{scst-starters-core-version}/reference/htmlsingle/#_creating_custom_artifacts[custom stream applications]. There're several https://github.com/spring-cloud/spring-cloud-stream-samples[samples] available for reference. [[spring-cloud-task-overview]] == Spring Cloud Task Spring Cloud Task makes it easy to create short-lived microservices. We provide capabilities that allow short-lived JVM processes to be executed on demand in a production environment. -For more details about the core framework components and the supported features, please review Spring Cloud Task's http://docs.spring.io/spring-cloud-task/{sct-core-version}/reference/htmlsingle/[reference guide]. +For more details about the core framework components and the supported features, please review Spring Cloud Task's https://docs.spring.io/spring-cloud-task/{sct-core-version}/reference/htmlsingle/[reference guide]. -There's a rich ecosystem of Spring Cloud Task http://docs.spring.io/spring-cloud-task-app-starters/docs/{sct-starters-core-version}/reference/htmlsingle[Application-Starters] that can be used either as standalone data microservice applications or in Spring Cloud Data Flow. For convenience, the generated application-starters are available for use from http://repo.spring.io/libs-snapshot/org/springframework/cloud/task/app/[Maven Repo]. There are several https://github.com/spring-cloud/spring-cloud-task/tree/master/spring-cloud-task-samples[samples] available for reference. \ No newline at end of file +There's a rich ecosystem of Spring Cloud Task https://docs.spring.io/spring-cloud-task-app-starters/docs/{sct-starters-core-version}/reference/htmlsingle[Application-Starters] that can be used either as standalone data microservice applications or in Spring Cloud Data Flow. For convenience, the generated application-starters are available for use from https://repo.spring.io/libs-snapshot/org/springframework/cloud/task/app/[Maven Repo]. There are several https://github.com/spring-cloud/spring-cloud-task/tree/master/spring-cloud-task-samples[samples] available for reference. \ No newline at end of file diff --git a/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/common.xsl b/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/common.xsl index 157bf9d..45143c7 100644 --- a/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/common.xsl +++ b/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/common.xsl @@ -20,7 +20,7 @@ --> diff --git a/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/epub.xsl b/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/epub.xsl index 031406c..a7d5089 100644 --- a/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/epub.xsl +++ b/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/epub.xsl @@ -20,7 +20,7 @@ under the License. --> diff --git a/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/html.xsl b/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/html.xsl index fd96f9a..6aedb3b 100644 --- a/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/html.xsl +++ b/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/html.xsl @@ -20,7 +20,7 @@ under the License. --> diff --git a/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/pdf.xsl b/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/pdf.xsl index 3074094..d106c3f 100644 --- a/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/pdf.xsl +++ b/spring-cloud-dataflow-server-mesos-docs/src/main/docbook/xsl/pdf.xsl @@ -22,7 +22,7 @@ under the License.