From 119bbafc3788c522ce7fc11e2bcad87e40d0e1e4 Mon Sep 17 00:00:00 2001 From: Sabby Anandan Date: Tue, 6 Aug 2019 15:44:15 -0700 Subject: [PATCH] Remove any and all references to bit.ly --- .../dataflowtemplate/DataflowTemplateApplication.java | 2 +- .../samples/dataflowtemplate/LoadGeneratorApplication.java | 4 ++-- .../recipes/polyglot/polyglot-python-processor/README.md | 2 +- security-ldap-uaa-example/README.adoc | 2 +- src/main/asciidoc/index.adoc | 6 +++--- src/main/asciidoc/maven-access.adoc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dataflow-template-example/src/main/java/org/springframework/cloud/samples/dataflowtemplate/DataflowTemplateApplication.java b/dataflow-template-example/src/main/java/org/springframework/cloud/samples/dataflowtemplate/DataflowTemplateApplication.java index 1bd5671..0cdcec6 100644 --- a/dataflow-template-example/src/main/java/org/springframework/cloud/samples/dataflowtemplate/DataflowTemplateApplication.java +++ b/dataflow-template-example/src/main/java/org/springframework/cloud/samples/dataflowtemplate/DataflowTemplateApplication.java @@ -49,7 +49,7 @@ public class DataflowTemplateApplication implements ApplicationRunner { public void run(ApplicationArguments applicationArguments) throws Exception { final DataFlowTemplate dataFlowTemplate = getDataFlowTemplate("user", "secret99", "http://localhost:9393"); - final String appRegistrationUrl = "https://bit.ly/Einstein-RC1-stream-applications-rabbit-maven"; + final String appRegistrationUrl = "https://dataflow.spring.io/rabbitmq-maven-latest"; logger.info("\n\nImporting Applications from: {}.\n", appRegistrationUrl); final PagedResources appRegistrations = diff --git a/dataflow-template-load-generator/src/main/java/org/springframework/cloud/samples/dataflowtemplate/LoadGeneratorApplication.java b/dataflow-template-load-generator/src/main/java/org/springframework/cloud/samples/dataflowtemplate/LoadGeneratorApplication.java index b3cc386..be758ea 100644 --- a/dataflow-template-load-generator/src/main/java/org/springframework/cloud/samples/dataflowtemplate/LoadGeneratorApplication.java +++ b/dataflow-template-load-generator/src/main/java/org/springframework/cloud/samples/dataflowtemplate/LoadGeneratorApplication.java @@ -103,8 +103,8 @@ public class LoadGeneratorApplication implements ApplicationRunner { } private void importApps(DataFlowTemplate dataFlowTemplate) { - final String taskAppRegistrationUrl = "https://dataflow.spring.io/Elston-GA-task-applications-maven"; - final String appRegistrationUrl = "https://dataflow.spring.io/Einstein-SR3-stream-applications-rabbit-maven"; + final String taskAppRegistrationUrl = "https://dataflow.spring.io/task-maven-latest"; + final String appRegistrationUrl = "https://dataflow.spring.io/rabbitmq-maven-latest"; logger.info("\n\nImporting Stream Applications from: {}.\n", appRegistrationUrl); logger.info("\n\nImporting Task Applications from: {}.\n", taskAppRegistrationUrl); diff --git a/dataflow-website/recipes/polyglot/polyglot-python-processor/README.md b/dataflow-website/recipes/polyglot/polyglot-python-processor/README.md index c194d86..20f48bc 100644 --- a/dataflow-website/recipes/polyglot/polyglot-python-processor/README.md +++ b/dataflow-website/recipes/polyglot/polyglot-python-processor/README.md @@ -12,7 +12,7 @@ NOTE: replace `chrisjs` with your docker hub user/org Register a stream using this processor in between `http` and `log`: ``` -dataflow:>app import --uri http://bit.ly/Einstein-SR2-stream-applications-kafka-docker +dataflow:>app import --uri https://dataflow.spring.io/kafka-docker-latest dataflow:>app register --type processor --name python-processor --uri docker://chrisjs/python-processor:latest ``` diff --git a/security-ldap-uaa-example/README.adoc b/security-ldap-uaa-example/README.adoc index 9ca3072..ae02471 100644 --- a/security-ldap-uaa-example/README.adoc +++ b/security-ldap-uaa-example/README.adoc @@ -177,7 +177,7 @@ Now we need to import the Composed Task Runner and the Spring Cloud Task App Sta [source,bash] ---- -dataflow:> app import https://bit.ly/Dearborn-GA-task-applications-maven +dataflow:> app import https://dataflow.spring.io/task-maven-latest ---- If you want to import _just_ the Composed Task Runner applications: diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc index a4637be..e36bfe4 100644 --- a/src/main/asciidoc/index.adoc +++ b/src/main/asciidoc/index.adoc @@ -11,9 +11,9 @@ Sabby Anandan; David Turanski; Glenn Renfro; Eric Bottard; Mark Pollack; Chris S :spring-cloud-stream-docs: https://docs.spring.io/spring-cloud-stream/docs/{scst-core-version}/reference/htmlsingle/index.html :github-code: https://github.com/spring-cloud/spring-cloud-dataflow-samples -:scdf-release-train-name: Einstein.GA -:app-import-kafka-maven: https://bit.ly/{scdf-release-train-name}-stream-applications-kafka-10-maven -:app-import-rabbit-maven: https://bit.ly/{scdf-release-train-name}-stream-applications-rabbit-maven + +:app-import-kafka-maven: https://dataflow.spring.io/kafka-maven-latest +:app-import-rabbit-maven: https://dataflow.spring.io/rabbitmq-maven-latest ifdef::backend-html5[] diff --git a/src/main/asciidoc/maven-access.adoc b/src/main/asciidoc/maven-access.adoc index 30f11de..e0143bc 100644 --- a/src/main/asciidoc/maven-access.adoc +++ b/src/main/asciidoc/maven-access.adoc @@ -3,5 +3,5 @@ access to public repositories, you will need to install the sample apps in your the server accordingly. The sample applications are typically registered using Data Flow's bulk import facility. For example, the Shell command `dataflow:>app import --uri {app-import-rabbit-maven}` _(The actual URI is release and binder specific so refer to the sample instructions for the actual URL)_. The bulk import URI references a plain text file containing entries for all of the publicly available Spring Cloud Stream and Task applications published to `https://repo.spring.io`. For example, `source.http=maven://org.springframework.cloud.stream.app:http-source-rabbit:2.1.0.RELEASE` registers the `http` source app at the corresponding Maven address, relative to the remote repository(ies) configured for the -Data Flow server. The format is `maven://::` You will need to https://repo.spring.io/libs-release/org/springframework/cloud/stream/app/spring-cloud-stream-app-descriptor/Einstein.GA/spring-cloud-stream-app-descriptor-Einstein.RELEASE.rabbit-apps-maven-repo-url.properties[download] the required apps or https://github.com/spring-cloud-stream-app-starters[build] them and then install them in your Maven repository, using whatever group, artifact, and version you choose. If you do +Data Flow server. The format is `maven://::` You will need to https://repo.spring.io/libs-release/org/springframework/cloud/stream/app/spring-cloud-stream-app-descriptor/Einstein.SR3/spring-cloud-stream-app-descriptor-Einstein.SR3.rabbit-apps-maven-repo-url.properties[download] the required apps or https://github.com/spring-cloud-stream-app-starters[build] them and then install them in your Maven repository, using whatever group, artifact, and version you choose. If you do this, register individual apps using `dataflow:>app register...` using the `maven://` resource URI format corresponding to your installed app.