Merge pull request #21 from messagehub/weiz

Change standard plan to classic plan

Author: SongAnChao

README.md

@@ -19,7 +19,7 @@ __Important Note__: Provisioning an Event Streams service in IBM Cloud® incurs
 
 
 ## Connecting to your Event Streams for IBM Cloud Cluster
-In each sample, we demonstrate a single connection path for both our Standard and Enterprise plans respectively. The aim was to get you started quickly. However your client's needs might be different. Therefore we wrote a [guide](https://cloud.ibm.com/docs/services/EventStreams?topic=eventstreams-connecting#connecting) that discusses credential generation in detail and showing you all possible ways of doing this.
+In each sample, we demonstrate a single connection path for both our Classic and Standard/Enterprise plans respectively. The aim was to get you started quickly. However your client's needs might be different. Therefore we wrote a [guide](https://cloud.ibm.com/docs/services/EventStreams?topic=eventstreams-connecting#connecting) that discusses credential generation in detail and showing you all possible ways of doing this.
 
 ## Our APIs and Sample Applications
 

kafka-java-console-sample/README.md

@@ -5,7 +5,7 @@ It can be run locally on your machine or deployed into [IBM Cloud](https://cloud
 
 For help with additional deployment modes, please refer to our [connection guide](https://cloud.ibm.com/docs/services/EventStreams?topic=eventstreams-connecting#connecting).
 
-__Important Note__: This sample creates a topic with one partition on your behalf. On the Standard plan, this will incur a fee if the topic does not already exist.
+__Important Note__: This sample creates a topic with one partition on your behalf. On the Classic and Standard plan, this will incur a fee if the topic does not already exist.
 
 ## Running the application
 

kafka-java-console-sample/docs/CF_Standard_Plan.md renamed to kafka-java-console-sample/docs/CF_Classic_Plan.md

@@ -1,4 +1,4 @@
-# IBM Cloud Foundry deployment to a Standard Plan Event Streams for IBM Cloud
+# IBM Cloud Foundry deployment to a Classic Plan Event Streams for IBM Cloud
 
 ## Overview
 

kafka-java-console-sample/docs/CF_Enterprise_Plan.md renamed to kafka-java-console-sample/docs/CF_Standard_Enterprise_Plan.md

@@ -1,9 +1,9 @@
-# IBM Cloud Foundry deployment to an Enterprise Plan Event Streams for IBM Cloud
+# IBM Cloud Foundry deployment to an Standard/Enterprise Plan Event Streams for IBM Cloud
 
 ## Overview
 
 To deploy and run the sample:
-* Create a Cloud Foundry Service Alias for your Enterprise Service
+* Create a Cloud Foundry Service Alias for your Standard/Enterprise Service
 * Setup your `manifest.yml` with your service details
 * Use `ibmcloud cf push --no-start` to deploy the app to IBM Cloud Foundry
 * Re-configure binding with Manager role
@@ -13,7 +13,7 @@ To deploy and run the sample:
 ## Set up a Cloud Foundry Service Alias
 Before continuing, connect to IBM Cloud with the [IBM Cloud command line interface](https://cloud.ibm.com/docs/cli?topic=cloud-cli-ibmcloud-cli).
 
-The Enterprise plan is IAM enabled. Therefore the following extra step is required to create a Cloud Foundry alias for your Service:
+The Standard/Enterprise plan is IAM enabled. Therefore the following extra step is required to create a Cloud Foundry alias for your Service:
 
 Create a Cloud Foundry alias for your service's associated CRN:
 ```shell

kafka-java-console-sample/docs/Cloud_Foundry.md

@@ -10,7 +10,7 @@ To build and run the sample, you must have the done the following:
 * Install [Gradle 4+](https://gradle.org/)
 * Install Java 7+
 
-## Standard or Enterprise Plan?
+## Classic or Standard/Enterprise Plan?
 
 **It's important to know which Event Streams for IBM Cloud plan you're using as the sample deployment steps are subtly different on each plan respectively.**
 
@@ -20,17 +20,18 @@ If you are not sure what type of Event Streams for IBM Cloud instance you have t
 
 *Please make sure you are in the appropriate Region, Account, Organization and Space where you provisioned your Event Streams instance!*
 
-* Event Streams for IBM Cloud Standard plan services are "Cloud Foundry Services" with the plan column showing "Standard".
+* Event Streams for IBM Cloud Classic plan services are "Cloud Foundry Services" with the plan column showing "Classic".
+* Event Streams for IBM Cloud Standard plan services are "Services" with the plan column showing "Standard".
 * Event Streams for IBM Cloud Enterprise plan services are "Services" with the plan column showing "Enterprise".
 
 
 ## Deploy the Application
 
-As the Standard and Enterprise Plan deployment steps are subtly different, we split the deployment steps into separate sections. Please navigate to the appropriate page(s):
+As the Classic and Standard/Enterprise Plan deployment steps are subtly different, we split the deployment steps into separate sections. Please navigate to the appropriate page(s):
 
-### [Standard Plan Deployment Guide](CF_Standard_Plan.md)
+### [Classic Plan Deployment Guide](CF_Classic_Plan.md)
 
-### [Enterprise Plan Deployment Guide](CF_Enterprise_Plan.md)
+### [Standard/Enterprise Plan Deployment Guide](CF_Standard_Enterprise_Plan.md)
 
 
 ## Further references

kafka-java-liberty-sample/README.md

@@ -6,7 +6,7 @@ This repository holds a sample application that was built using Liberty for Java
 
 For more information regarding IBM Event Streams for IBM Cloud, [see the documentation on IBM Cloud®](https://cloud.ibm.com/docs/services/EventStreams?topic=eventstreams-getting_started).
 
-__Important Note__: This sample creates a topic with one partition on your behalf. On the Standard plan, this will incur a fee if the topic does not already exist.
+__Important Note__: This sample creates a topic with one partition on your behalf. On the Classic and Standard plan, this will incur a fee if the topic does not already exist.
 
 ## Running the application
 

kafka-java-liberty-sample/docs/CF_Standard_Plan.md renamed to kafka-java-liberty-sample/docs/CF_Classic_Plan.md

@@ -1,4 +1,4 @@
-# IBM Cloud Foundry deployment to a Standard Plan Event Streams for IBM Cloud
+# IBM Cloud Foundry deployment to a Classic Plan Event Streams for IBM Cloud
 
 ## Overview
 

kafka-java-liberty-sample/docs/CF_Enterprise_Plan.md renamed to kafka-java-liberty-sample/docs/CF_Standard_Enterprise_Plan.md

@@ -1,9 +1,9 @@
-# IBM Cloud Foundry deployment to an Enterprise Plan Event Streams for IBM Cloud
+# IBM Cloud Foundry deployment to an Standard/Enterprise Plan Event Streams for IBM Cloud
 
 ## Overview
 
 To deploy and run the sample:
-* Create a Cloud Foundry Service Alias for your Enterprise Service
+* Create a Cloud Foundry Service Alias for your Standard/Enterprise Service
 * Setup your `manifest.yml` with your service details
 * Use `ibmcloud cf push --no-start` to deploy the app to IBM Cloud Foundry
 * Re-configure binding with Manager role
@@ -13,7 +13,7 @@ To deploy and run the sample:
 ## Set up a Cloud Foundry Service Alias
 Before continuing, connect to IBM Cloud with the [IBM Cloud command line interface](https://cloud.ibm.com/docs/cli?topic=cloud-cli-ibmcloud-cli).
 
-The Enterprise plan is IAM enabled. Therefore the following extra step is required to create a Cloud Foundry alias for your Service:
+The Standard/Enterprise plan is IAM enabled. Therefore the following extra step is required to create a Cloud Foundry alias for your Service:
 
 Create a Cloud Foundry alias for your service's associated CRN:
 ```shell

kafka-java-liberty-sample/docs/Cloud_Foundry.md

@@ -10,7 +10,7 @@ To build and run the sample, you must have the done the following:
 * Install [Gradle 4+](https://gradle.org/)
 * Install Java 7+
 
-## Standard or Enterprise Plan?
+## Classic or Standard/Enterprise Plan?
 
 **It's important to know which Event Streams for IBM Cloud plan you're using as the sample deployment steps are subtly different on each plan respectively.**
 
@@ -20,17 +20,18 @@ If you are not sure what type of Event Streams for IBM Cloud instance you have t
 
 *Please make sure you are in the appropriate Region, Account, Organization and Space where you provisioned your Event Streams instance!*
 
-* Event Streams for IBM Cloud Standard plan services are "Cloud Foundry Services" with the plan column showing "Standard".
+* Event Streams for IBM Cloud Classic plan services are "Cloud Foundry Services" with the plan column showing "Classic".
+* Event Streams for IBM Cloud Standard plan services are "Services" with the plan column showing "Standard".
 * Event Streams for IBM Cloud Enterprise plan services are "Services" with the plan column showing "Enterprise".
 
 
 ## Deploy the Application
 
-As the Standard and Enterprise Plan deployment steps are subtly different, we split the deployment steps into separate sections. Please navigate to the appropriate page(s):
+As the Classic and Standard/Enterprise Plan deployment steps are subtly different, we split the deployment steps into separate sections. Please navigate to the appropriate page(s):
 
-### [Standard Plan Deployment Guide](CF_Standard_Plan.md)
+### [Classic Plan Deployment Guide](CF_Classic_Plan.md)
 
-### [Enterprise Plan Deployment Guide](CF_Enterprise_Plan.md)
+### [Standard/Enterprise Plan Deployment Guide](CF_Standard_Enterprise_Plan.md)
 
 
 ## Further references

kafka-nodejs-console-sample/README.md

@@ -1,7 +1,7 @@
 # IBM Event Streams for IBM Cloud Kafka Node.js console sample application
 This Node.js console application demonstrates how to connect to [IBM Event Streams for IBM Cloud](https://cloud.ibm.com/docs/services/EventStreams?topic=eventstreams-getting_started), send and receive messages using the [node-rdkafka](https://github.com/Blizzard/node-rdkafka) module. It also shows how to create topics using the Kafka Admin API as exposed by `node-rdkafka`.
 
-__Important Note__: This sample creates a topic with one partition on your behalf. On the Standard plan, this will incur a fee if the topic does not already exist.
+__Important Note__: This sample creates a topic with one partition on your behalf. On the Classic and Standard plan, this will incur a fee if the topic does not already exist.
 
 ## Running the application