Skip to content

Commit af5c61f

Browse files
natashadsilvanatashadsilva
committed
remove unused tags
delete bluemix references
1 parent a80e362 commit af5c61f

File tree

25 files changed

+74
-74
lines changed

25 files changed

+74
-74
lines changed

‎General/LibertyStreamsProxy/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ The goal of this servlet, to easily move a Streams applications to the web, for
1414
## Demonstration walk through.
1515

1616
Assumed:
17-
* You have a [Bluemix account](https://console.ng.bluemix.net/registration/).
18-
* You have downloaded and installed [cf](https://github.com/cloudfoundry/cli#downloads) and [Bluemix](https://console.bluemix.net/docs/starters/install_cli.html) command-line tools.
17+
* You have a [IBM Cloud account](https://console.ng.bluemix.net/registration/).
18+
* You have downloaded and installed [cf](https://github.com/cloudfoundry/cli#downloads) and [IBM Cloud](https://console.bluemix.net/docs/starters/install_cli.html) command-line tools.
1919

2020
Provided:
2121
* UpperRestRH6.sab : The Streams application bundle file, with the demonstration Streams application, source below.
@@ -24,10 +24,10 @@ Provided:
2424

2525
Overview of Steps.
2626

27-
1. Allocate and attach resources in Bluemix.
27+
1. Allocate and attach resources in IBM Cloud.
2828
2. Start the Streams application.
2929
3. Build, install, start the Liberty application.
30-
4. Access the Streams application running in Bluemix.
30+
4. Access the Streams application running in IBM Cloud.
3131

3232

3333
### The Streams application.
@@ -107,7 +107,7 @@ we need to build an install the proxy server on Liberty.
107107

108108
### Build and upload the LibertyStreamsProxy server.
109109

110-
From a terminal, login to your bluemix account and set your target. Using my account, it looks like...
110+
From a terminal, login to your IBM Cloud account and set your target. Using my account, it looks like...
111111

112112
```bash
113113
bluemix login -o [email protected] -sso

‎General/LibertyStreamsProxy/catalog.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{"category": ["2"],
22
"description": "How to set up a proxy server to connect to a Streams application running in the cloud. The Streams application receives requests via HTTP using the HTTPRequestProcess operator.", "language": ["SPL"],
3-
"tags": ["post", "get", "rest", "browser","inet","bluemix"],
3+
"tags": ["post", "get", "rest", "browser","inet","Cloud"],
44
"url": "https://github.com/IBMStreams/samples/tree/main/General/LibertyStreamsProxy",
55
"name": "Enable a Streams app running in the Cloud to receive HTTP requests",
66
"toolkits": ["inet"],

‎General/LibertyStreamsProxy/src/main/java/com/ibm/streamsx/bridge/http/StreamsBlueMix.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
import com.ibm.json.java.JSONObject;
2323

2424
/**
25-
* StreamsBlueResource - Support for Streams when running within BlueMix.
25+
* StreamsBlueResource - Support for Streams when running within IBM Cloud.
2626
* Streams infrastructure was conceived as running on the bare hardware. When
27-
* it's running within BlueMix, this is not the case, some 'glue' is needed to
27+
* it's running within IBM Cloud, this is not the case, some 'glue' is needed to
2828
* bridge the gap between expectations and reality.
2929
*
3030
*
3131
* <ul>
32-
* <li>proxy HTTP, from the wide web into Streams Bluemix.</li>
33-
* <li>proxy WS, from the wide web into Streams running within BlueMix</li>
34-
* <li>resources within in BlueMix,</li>
32+
* <li>proxy HTTP, from the wide web into Streams IBM Cloud.</li>
33+
* <li>proxy WS, from the wide web into Streams running within IBM Cloud</li>
34+
* <li>resources within in IBM Cloud,</li>
3535
* </ul>
3636
*
3737
* @author siegenth
@@ -63,7 +63,7 @@ public StreamsBlueMix(String service) {
6363
String vcapString = System.getenv(service);
6464
if (vcapString == null) {
6565
throw new IllegalArgumentException(
66-
"Failed to get environment variable '" + service + "', a value that is specified by BLUEMIX.");
66+
"Failed to get environment variable '" + service + "', a value that is specified by IBM Cloud.");
6767
}
6868
JSONObject vcap = null;
6969
try {

‎General/LibertyStreamsProxy/src/main/java/com/ibm/streamsx/bridge/http/TopologyResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.ibm.streamsx.rest.Operator;
1414
import com.ibm.streamsx.rest.StreamingAnalyticsConnection;
1515
/**
16-
* Derive the IP and PORT using the topology interface when running within BlueMix.
16+
* Derive the IP and PORT using the topology interface when running within IBM Cloud.
1717
*
1818
* @author siegenth
1919
*

‎Geospatial/MapMatch/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## MapMatching using Streams Geospatial Toolkit in Bluemix
1+
## MapMatching using Streams Geospatial Toolkit in IBM Cloud
22

33
This project provides a simple SPL data flow for ingesting tuples through the HTTP server of Streams (streamx.inet toolkit)
44
and then doing map matching using a preconfigured map, which can be modified in the Main.spl file, the `mapfile` parameter can
@@ -8,4 +8,4 @@ The output from the map matching operator is submitted to a `WebSink` operator t
88
using the REST API.
99
To run the sample, you will need to download an OSM map file from https://www.openstreetmap.org. Place it in the "etc" folder of your application and change the `mapfile` parameter in line 36 of Main.spl.
1010

11-
The code can be deployed into BlueMix that is described in further detail on the StreamsDev blog (Real-time Map Matching using BlueMix).
11+
The code can be deployed into IBM Cloud that is described in further detail on the StreamsDev blog (Real-time Map Matching using IBM Cloud).

‎Geospatial/MapMatch/catalog.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"blogPost": "https://developer.ibm.com/streamsdev/docs/realtime-map-matching-in-streams-v4-0-1/",
66
"url": "https://github.com/IBMStreams/samples/tree/main/Geospatial/MapMatch",
77
"tags": [],
8-
"services": ["Bluemix"],
8+
99
"toolkits": ["geospatial","inet"],
1010
"operators": ["OSMPointMapMatcher","HTTPTupleInjection","HTTPTupleView"]
1111
}

‎Geospatial/MapMatch/com.ibm.streams.mapmatch/Main.spl

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/**
66
* The below provides a wrapper to the map matching operator, the operator function is explained in the
77
* geospatial toolkit v3.x and higher in IBM Streams 4.x and higher. This allows for the deployment of
8-
* this functionality in the Cloud -- specifically BlueMix.
8+
* this functionality in the Cloud -- specifically IBM Cloud.
99
**/
1010
namespace com.ibm.streams.mapmatch ;
1111

‎IoT/ReadEdgentEvents/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This project contains Streams applications written in Java, SPL and Python. It s
1313
- Java and Python: Credentials for your Streaming Analytics service in a file.
1414

1515

16-
The easiest way to get started is to [deploy the Streams IoT starter kit](https://github.com/IBMStreams/streamsx.iot.starterkit). Click the **Deploy to Bluemix** button to set up all the needed services. Then, [follow these steps](https://github.com/IBMStreams/streamsx.iot.starterkit/blob/develop/README.md#run-a-complete-edgent-streams-scenario)) to run an Edgent application that will send events to the Watson IoT Platform.
16+
The easiest way to get started is to [deploy the Streams IoT starter kit](https://github.com/IBMStreams/streamsx.iot.starterkit). Click the **Deploy to IBM Cloud** button to set up all the needed services. Then, [follow these steps](https://github.com/IBMStreams/streamsx.iot.starterkit/blob/develop/README.md#run-a-complete-edgent-streams-scenario)) to run an Edgent application that will send events to the Watson IoT Platform.
1717

1818
If you choose not to deploy the starter kit, follow [steps 1-3 of this recipe](https://developer.ibm.com/recipes/tutorials/connect-apache-edgent-to-the-streaming-analytics-service-using-the-watson-iot-platform/).
1919

‎IoT/ReadEdgentEvents/java/StreamingAnalyticsAndEdgent/catalog.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"blogPost": "https://developer.ibm.com/recipes/tutorials/connect-apache-edgent-to-the-streaming-analytics-service-using-the-watson-iot-platform/",
66
"url": "https://github.com/IBMStreams/samples/tree/main/IoT/ReadEdgentEvents/java/StreamingAnalyticsAndEdgent",
77
"tags": ["send commands", "topology","read event","raspberry pi", "iot","edge device","send data", "streaming analytics"],
8-
"services": ["Bluemix","Edgent"]
8+
99

1010
}

‎IoT/ReadEdgentEvents/java/StreamingAnalyticsAndEdgent/src/com/ibm/streamsx/iot/sample/SubmitToService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static void submitTopologyToService(Topology topology) throws Exception{
2020
String serviceName = "service name"; //Insert your service name here
2121
config.put(AnalyticsServiceProperties.VCAP_SERVICES, new File(credentialFile));
2222
config.put(AnalyticsServiceProperties.SERVICE_NAME, serviceName);
23-
// Submit application bundle to Bluemix
23+
// Submit application bundle to IBM Cloud
2424
Future<?> result = StreamsContextFactory.getStreamsContext(Type.ANALYTICS_SERVICE).submit(topology, config);
2525
//result should be a BigInteger
2626
System.out.println("Submitted job to service, job id = " + result.get().toString());

‎IoT/ReadEdgentEvents/python/StreamsPythonAndEdgent/catalog.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"blogPost": "https://developer.ibm.com/recipes/tutorials/connect-apache-edgent-to-the-streaming-analytics-service-using-the-watson-iot-platform/",
66
"url": "https://github.com/IBMStreams/samples/tree/main/IoT/ReadEdgentEvents/python/StreamsPythonAndEdgent/",
77
"tags": ["send commands", "topology","read event","raspberry pi", "iot","edge device","send data", "streaming analytics"],
8-
"services": ["Bluemix","Edgent"]
8+
99
}

‎IoT/WeatherStationApp/WeatherStationSimulator/src/com/ibm/streamsx/sample/weather/WeatherStationSimulator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static void main(String[] args) throws Exception {
3030
//Create and start the edgent application
3131
createTopo(deviceCfgPath);
3232

33-
//Start the shutdown timer. The IoT platform on Bluemix has a limit on the amount of data that can be sent
33+
//Start the shutdown timer. The IoT platform on IBM Cloud has a limit on the amount of data that can be sent
3434
//if this application is left running indefinitely that could be used up quickly.
3535
//The optional timeout parameter is used to determine how long to run the application.
3636
//Default is 20 minutes

‎QuickStart/EventDetection/README.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
## EventDetection Starter Application for Bluemix Streaming Analytics
2-
This sample demonstrates how to use the Streaming Analytics service in conjunction with a Bluemix application.
3-
The project contains both a Bluemix application and a Streams application.
1+
## EventDetection Starter Application for IBM Cloud Streaming Analytics
2+
This sample demonstrates how to use the Streaming Analytics service in conjunction with a IBM Cloud application.
3+
The project contains both a IBM Cloud application and a Streams application.
44

5-
#### Bluemix Application
6-
The Bluemix application is written in Node.js using the SDK for Node.js runtime in Bluemix. It uses the Streaming Analytics REST API to submit an analytic application to Streams and displays results on a web page.
5+
#### IBM Cloud Application
6+
The IBM Cloud application is written in Node.js using the SDK for Node.js runtime in IBM Cloud. It uses the Streaming Analytics REST API to submit an analytic application to Streams and displays results on a web page.
77

88
#### Streams Application
99
The Streams application performs event detection against a feed of weather data and sends its results to the Node.js application. A pre-compiled copy of the Streams application is provided in the root folder of this project as `EventDetection.sab`. The source code for the Streams application is contained in the `spl` folder.
1010

1111
#### Getting ready to run the sample
1212

1313
To run the EventDetection, you will need to perform the following actions if you have not already done so:
14-
1. Sign up for [Bluemix](https://ace.ng.bluemix.net/) and log in.
14+
1. Sign up for [IBM Cloud](https://ace.ng.bluemix.net/) and log in.
1515

16-
2. [Install the Bluemix command-line tool](https://console.bluemix.net/docs/cli/index.html#cli).
16+
2. [Install the IBM Cloud command-line tool](https://console.bluemix.net/docs/cli/index.html#cli).
1717

18-
3. Create an application in the Bluemix web portal using the **SDK for Node.js** runtime. Remember the name you give your application, you will need it later on.
18+
3. Create an application in the IBM Cloud web portal using the **SDK for Node.js** runtime. Remember the name you give your application, you will need it later on.
1919

20-
4. Create a Streaming Analytics service in the Bluemix web portal
20+
4. Create a Streaming Analytics service in the IBM Cloud web portal
2121

2222
5. Connect your application to your Streaming Analytics instance using the "Connect existing" button on your application's Overview page.
2323

2424

2525

26-
#### Pushing the EventDetection starter application to Bluemix
26+
#### Pushing the EventDetection starter application to IBM Cloud
2727

28-
After you perform the steps above, you are ready to download and push the starter application to Bluemix:
28+
After you perform the steps above, you are ready to download and push the starter application to IBM Cloud:
2929

3030
1. Download the [EventDetection.zip](https://streams-github-samples.mybluemix.net/?get=QuickStart/EventDetection) file.
3131

3232
2. After the download completes, extract the .zip file.
3333

34-
3. **Important:** Rename the root directory of the extracted zip to match the name you gave your application in Bluemix.
34+
3. **Important:** Rename the root directory of the extracted zip to match the name you gave your application in IBM Cloud.
3535

3636
4. On the command line, `cd` to the renamed directory. For example:
3737

3838
cd myapp
3939
40-
5. Connect to Bluemix:
40+
5. Connect to IBM Cloud:
4141

4242
cf api https://api.ng.bluemix.net
4343

44-
6. Log into Bluemix and set your target org when prompted:
44+
6. Log into IBM Cloud and set your target org when prompted:
4545

4646
cf login
4747

4848
7. Deploy your app. For example:
4949

5050
cf push myapp
5151

52-
8. Access your Node.js application by clicking on `Visit App URL` near the top of your application's detail page in Bluemix.
52+
8. Access your Node.js application by clicking on `Visit App URL` near the top of your application's detail page in IBM Cloud.
5353

5454

‎QuickStart/EventDetection/catalog.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"category": ["1","2"],
55
"blogPost": "https://developer.ibm.com/streamsdev/docs/detect-events-with-streams/",
66
"url": "https://github.com/IBMStreams/samples/tree/main/QuickStart/EventDetection",
7-
"tags": ["complex event processing","cep","noaa","submit job","streams rest api"],"services": ["Bluemix"],
7+
"tags": ["complex event processing","cep","noaa","submit job","streams rest api"],
88
"operators": ["InetSource", "HTTPPost","JSonToTuple"]
99
}

‎QuickStart/EventDetectionV2/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Streaming Analytics Event Detection Starter Application - For use only with Streaming Analytics V2 service plans
2-
Welcome to the Streaming Analytics service powered by IBM Streams! This starter application demonstrates how to configure and control the Streaming Analytics service through its V2 REST API. The application is written in Node.js using the SDK for Node.js runtime in Bluemix.
2+
Welcome to the Streaming Analytics service powered by IBM Streams! This starter application demonstrates how to configure and control the Streaming Analytics service through its V2 REST API. The application is written in Node.js using the SDK for Node.js runtime in IBM Cloud.
33

44
This sample should only be used with an instance created under a Streaming Analytics V2 service plan, because the Streams application included in this sample is compiled for RHEL/CentOS 7.x. If you are using an instance created with a Streaming Analytics V1 service plan, please use [the V1 Event Detection sample](https://github.com/IBMStreams/samples/tree/main/QuickStart/EventDetection).
55

‎QuickStart/EventDetectionV2/catalog.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"category": ["1","2"],
55
"blogPost": "https://developer.ibm.com/streamsdev/docs/detect-events-with-streams/",
66
"url": "https://github.com/IBMStreams/samples/tree/main/QuickStart/EventDetectionV2",
7-
"tags": ["complex event processing","cep","noaa","submit job","streams rest api"],"services": ["cloud","bluemix"],
7+
"tags": ["complex event processing","cep","noaa","submit job","streams rest api"],
88
"operators": ["InetSource", "HTTPPost","JSonToTuple"]
99
}

‎QuickStart/NYCTraffic/README.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
## NYCTraffic Starter Application for Bluemix Streaming Analytics
2-
This sample demonstrates how to use the Streaming Analytics service in conjunction with a Bluemix application.
3-
The project contains both a Bluemix application and a Streams application.
1+
## NYCTraffic Starter Application for IBM Cloud Streaming Analytics
2+
This sample demonstrates how to use the Streaming Analytics service in conjunction with a IBM Cloud application.
3+
The project contains both a IBM Cloud application and a Streams application.
44

5-
#### Bluemix Application
6-
The Bluemix application is written in Java using the Liberty for Java runtime in Bluemix. It uses the Streaming Analytics REST API to submit an analytic application to Streams and displays results on a web page. You can modify the application code and push your changes back to the Bluemix environment.
5+
#### IBM Cloud Application
6+
The IBM Cloud application is written in Java using the Liberty for Java runtime in IBM Cloud. It uses the Streaming Analytics REST API to submit an analytic application to Streams and displays results on a web page. You can modify the application code and push your changes back to the IBM Cloud environment.
77

88
#### Streams Application
99
The Streams application analyzes a Stream of New York City traffic data and sends its results Liberty for Java application. A pre-compiled copy of the Streams application is provided in `NYCTrafficSample/WebContent/public/NYCTraffic.sab`, and the source code for the Streams application is in the same subfolder in `NYCTraffic.spl`.
1010

1111
#### Getting ready to run the sample
1212

1313
To run the NYCTraffic sample, you will need to perform the following actions if you have not already done so:
14-
1. Sign up for [Bluemix](https://ace.ng.bluemix.net/) and log in.
14+
1. Sign up for [IBM Cloud](https://ace.ng.bluemix.net/) and log in.
1515

16-
2. [Install the Bluemix command-line tool](https://console.bluemix.net/docs/cli/index.html#cli).
16+
2. [Install the IBM Cloud command-line tool](https://console.bluemix.net/docs/cli/index.html#cli).
1717

18-
3. Create an application in the Bluemix web portal using the **Liberty for Java** runtime. Remember the name you give your application, you will need it later on.
18+
3. Create an application in the IBM Cloud web portal using the **Liberty for Java** runtime. Remember the name you give your application, you will need it later on.
1919

20-
4. Create a Streaming Analytics service in the Bluemix web portal
20+
4. Create a Streaming Analytics service in the IBM Cloud web portal
2121

2222
5. Connect your application to your Streaming Analytics instance using the "Connect existing" button on your application's Overview page.
2323

2424

2525

26-
#### Pushing the NYCTraffic starter application to Bluemix
26+
#### Pushing the NYCTraffic starter application to IBM Cloud
2727

28-
After you perform the steps above, you are ready to download and push the starter application to Bluemix:
28+
After you perform the steps above, you are ready to download and push the starter application to IBM Cloud:
2929

3030

3131
1. Download the [NYCTraffic.zip](https://streams-github-samples.mybluemix.net/?get=QuickStart/NYCTraffic) file.
3232

3333
2. After the download completes, extract the .zip file.
3434

35-
3. Rename the directory NYCTrafficSample in the extracted files to match the name you gave your application in Bluemix earlier.
35+
3. Rename the directory NYCTrafficSample in the extracted files to match the name you gave your application in IBM Cloud earlier.
3636

3737
4. On the command line, `cd` to the renamed directory. For example:
3838
cd myapp
3939
40-
5. Connect to Bluemix:
40+
5. Connect to IBM Cloud:
4141

4242
cf api https://api.ng.bluemix.net
4343

44-
6. Log into Bluemix and set your target org when prompted:
44+
6. Log into IBM Cloud and set your target org when prompted:
4545

4646
cf login
4747

4848
7. Deploy your app. For example:
4949

5050
cf push myapp
5151

52-
8. Access your app by clicking on the route displayed near the top of your application's Overview page in Bluemix.
52+
8. Access your app by clicking on the route displayed near the top of your application's Overview page in IBM Cloud.

‎QuickStart/NYCTraffic/catalog.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"description":"This is a complete web application that runs on IBM Cloud. It uses Streams to retrieve data from New York City traffic sensors and compute speed statistics. It also demonstrates using the Aggregate, DeDuplicate, InetSource and HTTPPost operators. The web application is written in Liberty for Java.",
33
"language": ["SPL"],
44
"category": ["1","2","7"],
5-
"blogPost": "https://developer.ibm.com/streamsdev/docs/bluemix-streaming-analytics-starter-application",
5+
"blogPost": "https://developer.ibm.com/streamsdev/docs/Cloud-streaming-analytics-starter-application",
66
"url": "https://github.com/IBMStreams/samples/tree/main/QuickStart/NYCTraffic",
7-
"tags": ["nyc traffic","rest","submit job","streams rest api","Rest api"],"services": ["Bluemix"],
7+
"tags": ["nyc traffic","rest","submit job","streams rest api","Rest api"],
88
"operators": ["InetSource", "HTTPPost","JSonToTuple","aggregate"]
99
}

0 commit comments

Comments
 (0)