diff --git a/src/components/404.js b/src/components/404.js
index c4e7b5f2..ed18c0a4 100644
--- a/src/components/404.js
+++ b/src/components/404.js
@@ -30,7 +30,7 @@
solace.dev is the homebase where developers start building all of the things
- docs.solace.com houses all PubSub+ Event Broker technical documentation
+ docs.solace.com houses all Solace Event Broker technical documentation
Explore success stories within your Industry or the Environment you’re interested in
diff --git a/src/components/footer.js b/src/components/footer.js
index b0f7ee16..ac151b2c 100644
--- a/src/components/footer.js
+++ b/src/components/footer.js
@@ -32,7 +32,7 @@ const Footer = () => (
target="_blank"
rel="noopener noreferrer"
>
- PubSub+ Platform
+ Solace Platform
@@ -41,7 +41,7 @@ const Footer = () => (
target="_blank"
rel="noopener noreferrer"
>
- PubSub+ Event Broker
+ Solace Event Broker
@@ -50,7 +50,7 @@ const Footer = () => (
target="_blank"
rel="noopener noreferrer"
>
- PubSub+ Event Broker: Software
+ Solace Event Broker Software
@@ -59,7 +59,7 @@ const Footer = () => (
target="_blank"
rel="noopener noreferrer"
>
- PubSub+ Event Broker: Appliance
+ Solace Event Broker Appliance
@@ -68,7 +68,7 @@ const Footer = () => (
target="_blank"
rel="noopener noreferrer"
>
- PubSub+ Event Broker: Cloud
+ Solace Cloud
@@ -77,7 +77,7 @@ const Footer = () => (
target="_blank"
rel="noopener noreferrer"
>
- PubSub+ Event Portal
+ Solace Event Portal
diff --git a/src/components/resources.js b/src/components/resources.js
index 25d3582d..ea0baae8 100644
--- a/src/components/resources.js
+++ b/src/components/resources.js
@@ -26,7 +26,7 @@ const Resources = (props) => {
Developer Community
-
Technical community for PubSub+.
+
Technical community for Solace.
Learn More
@@ -72,7 +72,7 @@ const Resources = (props) => {
Codelabs & Workshops
- Get guided, hands on coding experience with PubSub+ Codelabs.
+ Get guided, hands on coding experience with Solace Codelabs.
Learn More
@@ -94,7 +94,7 @@ const Resources = (props) => {
Free Courses
- Learn the fundamentals of PubSub+ at your own pace.
+ Learn the fundamentals of Solace at your own pace.
Learn More
@@ -119,7 +119,7 @@ const Resources = (props) => {
{" "}
SDKPerf is a command line tool for validating performance,
checking configuration, and exploring features associated with
- your PubSub+ message broker.
+ your Solace message broker.
Learn More
@@ -131,7 +131,7 @@ const Resources = (props) => {
Queue Browser
Get all the information you need to use JMS ToolBox with
- PubSub+.
+ Solace.
Learn More
diff --git a/src/pages/404.js b/src/pages/404.js
index 415dd5b9..6fd1095e 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -77,7 +77,7 @@ const NotFoundPage = () => (
>
docs.solace.com
{" "}
- houses all PubSub+ Event Broker technical documentation
+ houses all Solace Event Broker technical documentation
Q/
3. Now start a replay from the message broker. The flow event callback monitors for a replay start event. When the message broker initiates a replay, the flow will see a `SOLCLIENT_FLOW_EVENT_DOWN_ERROR` event with SubCode `SOLCLIENT_SUBCODE_REPLAY_STARTED`. This means an administrator has initiated a replay, and the application must destroy and re-create the flow to receive the replayed messages.
This will replay all logged messages including the live one published in step 2.
-
+
## Learn More
diff --git a/src/pages/tutorials/c/persistence-with-queues.md b/src/pages/tutorials/c/persistence-with-queues.md
index 589545ca..d6a1f045 100644
--- a/src/pages/tutorials/c/persistence-with-queues.md
+++ b/src/pages/tutorials/c/persistence-with-queues.md
@@ -13,19 +13,19 @@ links:
---
-This tutorial builds on the basic concepts introduced in the [publish/subscribe tutorial](../publish-subscribe/), and will show you how to send and receive persistent messages from a PubSub+ queue in a point to point fashion.
+This tutorial builds on the basic concepts introduced in the [publish/subscribe tutorial](../publish-subscribe/), and will show you how to send and receive persistent messages from a Solace queue in a point to point fashion.
## Assumptions
This tutorial assumes the following:
* You are familiar with Solace PubSub+ [core concepts](https://docs.solace.com/PubSub-Basics/Core-Concepts.htm).
-* You have access to PubSub+ messaging with the following configuration details:
- * Connectivity information for a PubSub+ message-VPN configured for guaranteed messaging support
+* You have access to Solace messaging with the following configuration details:
+ * Connectivity information for a Solace message-VPN configured for guaranteed messaging support
* Enabled client username and password
* Client-profile enabled with guaranteed messaging permissions.
-One simple way to get access to Solace messaging quickly is to create a messaging service in Solace PubSub+ Cloud [as outlined here](https://solace.com/products/event-broker/cloud/). You can find other ways to get access to Solace messaging below.
+One simple way to get access to Solace messaging quickly is to create a messaging service in Solace Cloud [as outlined here](https://solace.com/products/event-broker/cloud/). You can find other ways to get access to Solace messaging below.
## Goals
@@ -52,9 +52,9 @@ Durable endpoints are not auto created on Solace message routers. However there
* Using the management interface
* Using the APIs
-Using the Solace PubSub+ APIs to provision an endpoint can be a convenient way of getting started quickly without needing to become familiar with the management interface. This is why it is used in this tutorial. However it should be noted that the management interface provides more options to control the queue properties. So generally it becomes the preferred method over time.
+Using the Solace Messaging APIs to provision an endpoint can be a convenient way of getting started quickly without needing to become familiar with the management interface. This is why it is used in this tutorial. However it should be noted that the management interface provides more options to control the queue properties. So generally it becomes the preferred method over time.
-Provisioning an endpoint through the API requires the “Guaranteed Endpoint Create” permission in the client-profile. You can confirm this is enabled by looking at the client profile in PubSub+ Manager. If it is correctly set you will see the following:
+Provisioning an endpoint through the API requires the “Guaranteed Endpoint Create” permission in the client-profile. You can confirm this is enabled by looking at the client profile in Broker Manager. If it is correctly set you will see the following:
@@ -112,7 +112,7 @@ Now it is time to send a message to the queue.
-To send a message, you must create a message and a queue destination. This tutorial will send a PubSub+ binary message with contents "Hello world!". Then you must send the message to the PubSub+ message router.
+To send a message, you must create a message and a queue destination. This tutorial will send a PubSub+ binary message with contents "Hello world!". Then you must send the message to the Solace Event Broker.
```cpp
@@ -145,7 +145,7 @@ To send a message, you must create a message and a queue destination. This tutor
```
-The message is transferred to the PubSub+ message router asynchronously, but if all goes well, it will be waiting for your consumer on the queue.
+The message is transferred to the Solace Event Broker asynchronously, but if all goes well, it will be waiting for your consumer on the queue.
## Receiving a message from a queue
@@ -153,11 +153,11 @@ Now it is time to receive the messages sent to your queue.
-You still need to connect a session just as you did with the publisher. With a connected session, you then need to bind to the PubSub+ message router queue with a flow receiver. Flow receivers allow applications to receive messages from a PubSub+ guaranteed message flow. Flows encapsulate all of the acknowledgement behaviour required for guaranteed messaging. Conveniently flow receivers have the same interface as message consumers but flows also require some additional properties on creation.
+You still need to connect a session just as you did with the publisher. With a connected session, you then need to bind to the Solace Event Broker queue with a flow receiver. Flow receivers allow applications to receive messages from a PubSub+ guaranteed message flow. Flows encapsulate all of the acknowledgement behaviour required for guaranteed messaging. Conveniently flow receivers have the same interface as message consumers but flows also require some additional properties on creation.
A flow requires properties. At its most basic, the flow properties require the endpoint (our newly provisioned or existing queue) and an ack mode. In this example you’ll use the client ack mode where the application will explicitly acknowledge each message.
-Flows are created from PubSub+ session objects just as direct message consumers are.
+Flows are created from Solace session objects just as direct message consumers are.
Notice `flowMessageReceiveCallback` and `flowEventCallback` callbacks that are passed in when creating a flow. These callbacks will be invoked when a message arrives to the endpoint (the queue) or a flow events occurs.
@@ -227,7 +227,7 @@ Combining the example source code shown above results in the following source co
### Running the Samples
-If you start the `QueuePublisher` with the required arguments of your PubSub+ messaging, if will publish the message to the specified queue. In the example below, a message is published to a queue `q1`
+If you start the `QueuePublisher` with the required arguments of your Solace messaging, if will publish the message to the specified queue. In the example below, a message is published to a queue `q1`
```sh
bin$ . /setenv.sh
bin$ ./QueuePublisher
diff --git a/src/pages/tutorials/c/publish-subscribe.md b/src/pages/tutorials/c/publish-subscribe.md
index f1b59f15..e2663f6f 100644
--- a/src/pages/tutorials/c/publish-subscribe.md
+++ b/src/pages/tutorials/c/publish-subscribe.md
@@ -14,18 +14,18 @@ links:
link: https://github.com/SolaceDev/solace-dev-tutorials/blob/master/src/pages/tutorials/c/publish-subscribe.md
---
-This tutorial will introduce you to the fundamentals of the Solace PubSub+ API by connecting a client, adding a topic subscription and sending a message matching this topic subscription. This forms the basis for any publish / subscribe message exchange.
+This tutorial will introduce you to the fundamentals of the Solace Messaging API by connecting a client, adding a topic subscription and sending a message matching this topic subscription. This forms the basis for any publish / subscribe message exchange.
## Assumptions
This tutorial assumes the following:
* You are familiar with Solace PubSub+ [core concepts](https://docs.solace.com/PubSub-Basics/Core-Concepts.htm).
-* You have access to PubSub+ messaging with the following configuration details:
- * Connectivity information for a PubSub+ message-VPN
+* You have access to Solace messaging with the following configuration details:
+ * Connectivity information for a Solace message-VPN
* Enabled client username and password
-One simple way to get access to PubSub+ messaging quickly is to create a messaging service in PubSub+ Cloud [as outlined here](https://solace.com/products/event-broker/cloud/). You can find other ways to get access to PubSub+ messaging below.
+One simple way to get access to Solace messaging quickly is to create a messaging service in Solace Cloud [as outlined here](https://solace.com/products/event-broker/cloud/). You can find other ways to get access to Solace messaging below.
## Goals
@@ -72,7 +72,7 @@ Now it is time to send a message to the waiting consumer.
-To send a message, you must create a message and a topic destination. This tutorial will send a PubSub+ binary message with contents "Hello world!". Then you must send the message to the PubSub+ message router.
+To send a message, you must create a message and a topic destination. This tutorial will send a PubSub+ binary message with contents "Hello world!". Then you must send the message to the Solace Event Broker.
```cpp
/* Message */
@@ -104,9 +104,9 @@ solClient_msg_free ( &msg_p );
In the SolClient API, messages are allocated and freed from an internal API message pool for greatest performance and efficiency. Therefore as shown, messages must be acquired by calls to solClient_msg_alloc and then later freed back to the pool by calls to solClient_msg_free.
-The minimum properties required to create a SolClient message that can be sent is to set the delivery mode, queue or topic destination, and message contents as shown in the above code. Once the message is created it is sent to the PubSub+ message router with a call to solClient_session_sendMsg.
+The minimum properties required to create a SolClient message that can be sent is to set the delivery mode, queue or topic destination, and message contents as shown in the above code. Once the message is created it is sent to the Solace Event Broker with a call to solClient_session_sendMsg.
-At this point the producer has sent a message to the PubSub+ message router and your waiting consumer will have received the message and printed its contents to the screen.
+At this point the producer has sent a message to the Solace Event Broker and your waiting consumer will have received the message and printed its contents to the screen.
## Summarizing
@@ -125,7 +125,7 @@ The OS source code simply provides platform abstraction. The subscriber sample m
### Running the Samples
-If you start the `TopicSubscriber` with the required arguments of your PubSub+ messaging, it will connect and wait for a message.
+If you start the `TopicSubscriber` with the required arguments of your Solace messaging, it will connect and wait for a message.
```sh
bin$ . ./setenv.sh
diff --git a/src/pages/tutorials/c/request-reply.md b/src/pages/tutorials/c/request-reply.md
index f611797c..11c6784f 100644
--- a/src/pages/tutorials/c/request-reply.md
+++ b/src/pages/tutorials/c/request-reply.md
@@ -20,11 +20,11 @@ This tutorial outlines both roles in the request-response message exchange patte
This tutorial assumes the following:
* You are familiar with Solace PubSub+ [core concepts](https://docs.solace.com/PubSub-Basics/Core-Concepts.htm).
-* You have access to PubSub+ messaging with the following configuration details:
- * Connectivity information for a PubSub+ message-VPN
+* You have access to Solace messaging with the following configuration details:
+ * Connectivity information for a Solace message-VPN
* Enabled client username and password
-One simple way to get access to Solace messaging quickly is to create a messaging service in Solace PubSub+ Cloud [as outlined here](https://solace.com/products/event-broker/cloud/). You can find other ways to get access to PubSub+ messaging below.
+One simple way to get access to Solace messaging quickly is to create a messaging service in Solace Cloud [as outlined here](https://solace.com/products/event-broker/cloud/). You can find other ways to get access to Solace messaging below.
The build instructions in this tutorial assume you are using a Linux shell. If your environment differs, adapt the instructions.
@@ -35,20 +35,20 @@ The goal of this tutorial is to understand the following:
* On the requestor side:
1. How to create a request
2. How to receive a response
- 3. How to use the Solace PubSub+ API to correlate the request and response
+ 3. How to use the Solace Messaging API to correlate the request and response
* On the replier side:
1. How to detect a request expecting a reply
2. How to generate a reply message
## Overview
-Request-reply messaging is supported by the PubSub+ message router for all delivery modes. For direct messaging, the Solace PubSub+ APIs provide the Requestor object for convenience. This object makes it easy to send a request and wait for the reply message. It is a convenience object that makes use of the API provided “inbox” topic that is automatically created for each PubSub+ client and automatically correlates requests with replies using the message correlation ID. (See Message Correlation below for more details). On the reply side another convenience method enables applications to easily send replies for specific requests. Direct messaging request reply is the delivery mode that is illustrated in this sample.
+Request-reply messaging is supported by the Solace Event Broker for all delivery modes. For direct messaging, the Solace Messaging APIs provide the Requestor object for convenience. This object makes it easy to send a request and wait for the reply message. It is a convenience object that makes use of the API provided “inbox” topic that is automatically created for each PubSub+ client and automatically correlates requests with replies using the message correlation ID. (See Message Correlation below for more details). On the reply side another convenience method enables applications to easily send replies for specific requests. Direct messaging request reply is the delivery mode that is illustrated in this sample.
It is also possible to use guaranteed messaging for request reply scenarios. In this case the replier can listen on a queue for incoming requests and the requestor can use a temporary endpoint to attract replies. The requestor and replier must manually correlate the messages. This is explained further in the [Solace PubSub+ documentation](https://docs.solace.com/Solace-PubSub-Messaging-APIs/API-Developer-Guide/Request-Reply-Messaging.htm) and shown in the API samples named `RRGuaranteedRequestor` and `RRGuaranteedReplier`.
### Message Correlation
-For request-reply messaging to be successful it must be possible for the requestor to correlate the request with the subsequent reply. PubSub+ messages support two fields that are needed to enable request-reply correlation. The reply-to field can be used by the requestor to indicate a PubSub+ Topic or Queue where the reply should be sent. A natural choice for this is often the unique `P2PInboxInUse` topic which is an auto-generated unique topic per client which is accessible as a session property. The second requirement is to be able to detect the reply message from the stream of incoming messages. This is accomplished using the correlation-id field. This field will transit the PubSub+ messaging system unmodified. Repliers can include the same correlation-id in a reply message to allow the requestor to detect the corresponding reply. The figure below outlines this exchange.
+For request-reply messaging to be successful it must be possible for the requestor to correlate the request with the subsequent reply. PubSub+ messages support two fields that are needed to enable request-reply correlation. The reply-to field can be used by the requestor to indicate a PubSub+ Topic or Queue where the reply should be sent. A natural choice for this is often the unique `P2PInboxInUse` topic which is an auto-generated unique topic per client which is accessible as a session property. The second requirement is to be able to detect the reply message from the stream of incoming messages. This is accomplished using the correlation-id field. This field will transit the Solace messaging system unmodified. Repliers can include the same correlation-id in a reply message to allow the requestor to detect the corresponding reply. The figure below outlines this exchange.
@@ -164,7 +164,7 @@ The full source code for this example is available in [GitHub](https://github.co
### Running the Samples
-First start the `BasicReplier` so that it is up and listening for requests. Then you can use the `BasicRequestor` sample to send requests and receive replies. Pass your PubSub+ messaging router connection properties as parameters.
+First start the `BasicReplier` so that it is up and listening for requests. Then you can use the `BasicRequestor` sample to send requests and receive replies. Pass your Solace messaging router connection properties as parameters.
```sh
bin$ . ./setenv.sh
diff --git a/src/pages/tutorials/c/topic-to-queue-mapping.md b/src/pages/tutorials/c/topic-to-queue-mapping.md
index c27c710a..56b8f1c2 100644
--- a/src/pages/tutorials/c/topic-to-queue-mapping.md
+++ b/src/pages/tutorials/c/topic-to-queue-mapping.md
@@ -1,7 +1,7 @@
---
layout: tutorials
title: Topic to Queue Mapping
-summary: Learn how to map topics to PubSub+ queues.
+summary: Learn how to map topics to Solace queues.
icon: I_dev_topic2q.svg
links:
- label: TopicToQueueMapping.c
@@ -20,25 +20,25 @@ The following diagram illustrates this feature.
-If you have a durable queue named `Q`, it will receive messages published directly to the queue destination named `Q`. However, it is also possible to add subscriptions to this queue in the form of topics. This example adds topics `A` and `B`. Once these subscriptions are added, the queue will start receiving messages published to the topic destinations `A` and `B`. When you combine this with the wildcard support provided by PubSub+ topics this opens up a number of interesting use cases.
+If you have a durable queue named `Q`, it will receive messages published directly to the queue destination named `Q`. However, it is also possible to add subscriptions to this queue in the form of topics. This example adds topics `A` and `B`. Once these subscriptions are added, the queue will start receiving messages published to the topic destinations `A` and `B`. When you combine this with the wildcard support provided by Solace topics this opens up a number of interesting use cases.
## Assumptions
This tutorial assumes the following:
-* You have access to PubSub+ messaging with the following configuration details:
- * Connectivity information for a PubSub+ message-VPN configured for guaranteed messaging support
+* You have access to Solace messaging with the following configuration details:
+ * Connectivity information for a Solace message-VPN configured for guaranteed messaging support
* Enabled client username and password
* Client-profile enabled with guaranteed messaging permissions.
-One simple way to get access to PubSub+ messaging quickly is to create a messaging service in PubSub+ Cloud [as outlined here](https://solace.com/products/event-broker/cloud/). You can find other ways to get access to PubSub+ messaging below.
+One simple way to get access to Solace messaging quickly is to create a messaging service in Solace Cloud [as outlined here](https://solace.com/products/event-broker/cloud/). You can find other ways to get access to Solace messaging below.
## Goals
The goal of this tutorial is to understand the following:
* How to add topic subscriptions to a queue. Two ways are shown in this case.
-* How to interrogate the PubSub+ message router to confirm capabilities.
+* How to interrogate the Solace Event Broker to confirm capabilities.
* How to delete a queue.
diff --git a/src/pages/tutorials/common-assets/helloWorld-intro.md b/src/pages/tutorials/common-assets/helloWorld-intro.md
index bcdebc7f..68525443 100644
--- a/src/pages/tutorials/common-assets/helloWorld-intro.md
+++ b/src/pages/tutorials/common-assets/helloWorld-intro.md
@@ -16,4 +16,4 @@ However, as you can tell from this [Wikipedia article](https://en.wikipedia.org/
- **Asynchronous messaging:** use of callback handlers
- **Connection lifecycle management:** connect once, and stay online for the lifetime of the app
-This Hello World sample application will connect to a Solace PubSub+ Event Broker, and publish/subscribe in a loop. Let's begin!
\ No newline at end of file
+This Hello World sample application will connect to a Solace Event Broker, and publish/subscribe in a loop. Let's begin!
\ No newline at end of file
diff --git a/src/pages/tutorials/common-assets/initC.md b/src/pages/tutorials/common-assets/initC.md
index af11f1fc..54eb7cbe 100644
--- a/src/pages/tutorials/common-assets/initC.md
+++ b/src/pages/tutorials/common-assets/initC.md
@@ -1,6 +1,6 @@
-## Connecting to the Solace PubSub+ message router
+## Connecting to the Solace Event Broker
-In order to send or receive messages, an application must connect a PubSub+ session. The PubSub+ session is the basis for all client communication with the PubSub+ message router.
+In order to send or receive messages, an application must connect a Solace session. The Solace session is the basis for all client communication with the Solace Event Broker.
In the Solace messaging API for C (SolClient), a few distinct steps are required to create and connect a Solace session.
@@ -65,7 +65,7 @@ solClient_context_create ( SOLCLIENT_CONTEXT_PROPS_DEFAULT_WITH_CREATE_THREAD,
### Session Creation
-Finally a session is needed to actually connect to the PubSub+ message router. This is accomplished by creating a properties array and connecting the session.
+Finally a session is needed to actually connect to the Solace Event Broker. This is accomplished by creating a properties array and connecting the session.
```cpp
/* Session */
@@ -114,6 +114,6 @@ solClient_session_connect ( session_p );
printf ( "Connected.\n" );
```
-When creating the session, the factory method takes the session properties, the session pointer and information about the session callback functions. The API then creates the session within the supplied context and returns a reference in the session pointer. The final call to solClient_session_connect establishes the connection to the PubSub+ message router which makes the session ready for use.
+When creating the session, the factory method takes the session properties, the session pointer and information about the session callback functions. The API then creates the session within the supplied context and returns a reference in the session pointer. The final call to solClient_session_connect establishes the connection to the Solace Event Broker which makes the session ready for use.
-At this point your client is connected to the PubSub+ message router. You can use PubSub+ Manager to view the client connection and related details.
+At this point your client is connected to the Solace Event Broker. You can use Broker Manager to view the client connection and related details.
diff --git a/src/pages/tutorials/common-assets/solaceApi.md b/src/pages/tutorials/common-assets/solaceApi.md
index b8196ce1..f9785885 100644
--- a/src/pages/tutorials/common-assets/solaceApi.md
+++ b/src/pages/tutorials/common-assets/solaceApi.md
@@ -1,5 +1,5 @@
-## Obtaining the Solace PubSub+ API
+## Obtaining the Solace Messaging API
The latest versions of all Solace APIs can be downloaded from the [solace downloads page](https://www.solace.com/downloads/). Otherwise, check the public samples repository of the API where the library is already packaged as a gzipped tar file. Note: always check for the latest API version!
\ No newline at end of file
diff --git a/src/pages/tutorials/common-assets/solaceMessaging-part1.md b/src/pages/tutorials/common-assets/solaceMessaging-part1.md
index 4a4ec214..8e353ead 100644
--- a/src/pages/tutorials/common-assets/solaceMessaging-part1.md
+++ b/src/pages/tutorials/common-assets/solaceMessaging-part1.md
@@ -1,7 +1,7 @@
## Get Solace Messaging
-This tutorial requires access Solace PubSub+ messaging and requires that you know several connectivity properties about your Solace messaging. Specifically you need to know the following:
+This tutorial requires access Solace messaging and requires that you know several connectivity properties about your Solace messaging. Specifically you need to know the following:
@@ -12,12 +12,12 @@ This tutorial requires access Solace PubSub+ messaging and requires that you kno
| Host |
String |
- This is the address clients use when connecting to the PubSub+ messaging to send and receive messages. (Format: DNS_NAME:Port or IP:Port) |
+ This is the address clients use when connecting to the Solace messaging to send and receive messages. (Format: DNS_NAME:Port or IP:Port) |
| Message VPN |
String |
- The PubSub+ message router Message VPN that this client should connect to. |
+ The Solace message router Message VPN that this client should connect to. |
| Client Username |
@@ -31,11 +31,11 @@ This tutorial requires access Solace PubSub+ messaging and requires that you kno
-There are several ways you can get access to PubSub+ Messaging and find these required properties.
+There are several ways you can get access to Solace Messaging and find these required properties.
-### Option 1: Use PubSub+ Cloud
+### Option 1: Use Solace Cloud
-* Follow [these instructions](https://solace.com/products/platform/cloud/) to quickly spin up a cloud-based PubSub+ messaging service for your applications.
+* Follow [these instructions](https://solace.com/products/platform/cloud/) to quickly spin up a cloud-based Solace messaging service for your applications.
* The messaging connectivity information is found in the service details in the connectivity tab (shown below). You will need:
* Host:Port (use the SMF URI)
* Message VPN
diff --git a/src/pages/tutorials/common-assets/solaceMessaging-part2.md b/src/pages/tutorials/common-assets/solaceMessaging-part2.md
index e11b1540..81e17d88 100644
--- a/src/pages/tutorials/common-assets/solaceMessaging-part2.md
+++ b/src/pages/tutorials/common-assets/solaceMessaging-part2.md
@@ -1,17 +1,17 @@
-### Option 2: Start a PubSub+ Software
+### Option 2: Start a Solace Event Broker Software
-* Follow [these instructions](https://docs.solace.com/Basics/Getting-Started-Try-Broker.htm) to start the PubSub+ Software in leading Clouds, Container Platforms or Hypervisors. The tutorials outline where to download and how to install the PubSub+ Software.
+* Follow [these instructions](https://docs.solace.com/Basics/Getting-Started-Try-Broker.htm) to start the Solace Event Broker Software in leading Clouds, Container Platforms or Hypervisors. The tutorials outline where to download and how to install the Solace Event Broker Software.
* The messaging connectivity information are the following:
* Host: (IP address assigned to the VMR in tutorial instructions)
* Message VPN: default
* Client Username: sampleUser (can be any value)
* Client Password: samplePassword (can be any value)
- Note: By default, the PubSub+ Software "default" message VPN has authentication disabled.
+ Note: By default, the Solace Event Broker Software "default" message VPN has authentication disabled.
-### Option 3: Get access to a PubSub+ Appliance
+### Option 3: Get access to a Solace Event Broker Appliance
-* Contact your PubSub+ appliance administrators and obtain the following:
- * A PubSub+ Message-VPN where you can produce and consume direct and persistent messages
+* Contact your Solace Event Broker Appliance administrators and obtain the following:
+ * A Solace Message-VPN where you can produce and consume direct and persistent messages
* The host name or IP address of the Solace appliance hosting your Message-VPN
* A username and password to access the Solace appliance
diff --git a/src/pages/tutorials/dotnet/persistence-with-queues.md b/src/pages/tutorials/dotnet/persistence-with-queues.md
index 68584cc8..1360aba3 100644
--- a/src/pages/tutorials/dotnet/persistence-with-queues.md
+++ b/src/pages/tutorials/dotnet/persistence-with-queues.md
@@ -54,7 +54,7 @@ Durable endpoints are not auto created on Solace message routers. However there
Using the Solace APIs to provision an endpoint can be a convenient way of getting started quickly without needing to become familiar with the management interface. This is why it is used in this tutorial. However it should be noted that the management interface provides more options to control the queue properties. So generally it becomes the preferred method over time.
-Provisioning an endpoint through the API requires the “Guaranteed Endpoint Create” permission in the client-profile. You can confirm this is enabled by looking at the client profile in PubSub+ Manager. If it is correctly set you will see the following:
+Provisioning an endpoint through the API requires the “Guaranteed Endpoint Create” permission in the client-profile. You can confirm this is enabled by looking at the client profile in Broker Manager. If it is correctly set you will see the following:
diff --git a/src/pages/tutorials/dotnet/publish-subscribe.md b/src/pages/tutorials/dotnet/publish-subscribe.md
index 24106a3d..53a72d03 100644
--- a/src/pages/tutorials/dotnet/publish-subscribe.md
+++ b/src/pages/tutorials/dotnet/publish-subscribe.md
@@ -85,7 +85,7 @@ using (ISession session = context.CreateSession(sessionProps, HandleMessage, nul
}
```
-At this point your client is connected to the Solace message router. You can use PubSub+ Manager to view the client connection and related details.
+At this point your client is connected to the Solace message router. You can use Broker Manager to view the client connection and related details.
## Receiving a message
diff --git a/src/pages/tutorials/dotnet/topic-to-queue-mapping.md b/src/pages/tutorials/dotnet/topic-to-queue-mapping.md
index 2bb391ac..0fe56ffa 100644
--- a/src/pages/tutorials/dotnet/topic-to-queue-mapping.md
+++ b/src/pages/tutorials/dotnet/topic-to-queue-mapping.md
@@ -146,7 +146,7 @@ using (IMessage message = ContextFactory.Instance.CreateMessage())
}
```
-These messages are now on your queue. You can validate this through PubSub+ Manager by inspecting the queue. Now receive the messages using a flow consumer as outlined in detail in previous tutorials.
+These messages are now on your queue. You can validate this through Broker Manager by inspecting the queue. Now receive the messages using a flow consumer as outlined in detail in previous tutorials.
```csharp
Flow = session.CreateFlow(new FlowProperties()
diff --git a/src/pages/tutorials/go/_howtos.yml b/src/pages/tutorials/go/_howtos.yml
index cabc5227..ee0db955 100644
--- a/src/pages/tutorials/go/_howtos.yml
+++ b/src/pages/tutorials/go/_howtos.yml
@@ -17,7 +17,7 @@
description: Sample code showing how to build a Direct Processor
link: https://github.com/SolaceSamples/solace-samples-go/blob/main/patterns/direct_processor.go
- title: Secure connection
- description: Sample code showing how to have a secure connection to Solace PubSub+ Broker
+ description: Sample code showing how to have a secure connection to Solace Event Broker
link: https://github.com/SolaceSamples/solace-samples-go/blob/main/howtos/secure_connection.go
- title: Update Service Properties - Oauth Token
description: Sample code showing how to change Oauth Tokens by updating the Service Properties
diff --git a/src/pages/tutorials/java-amqp-qpid-jms1/topic-to-queue-mapping.md b/src/pages/tutorials/java-amqp-qpid-jms1/topic-to-queue-mapping.md
index 38d78fdf..75bfff45 100644
--- a/src/pages/tutorials/java-amqp-qpid-jms1/topic-to-queue-mapping.md
+++ b/src/pages/tutorials/java-amqp-qpid-jms1/topic-to-queue-mapping.md
@@ -26,7 +26,7 @@ If you have a durable queue named “Q”, it will receive messages published di
JMS is a standard programmatic interface with a design goal of being messaging middleware agnostic. As such, the JMS interface does not provide a way for applications to directly take advantage of the Solace Topic to Queue Mapping feature. However JMS applications wishing to take advantage of this Solace feature have a few options.
-One option is to use a management interface to administratively configure the topic to queue mapping, by adding topic subscriptions to the queue. This can either be done through the CLI or PubSub+ Manager application; or the SEMP programmatic management API. The SEMP API enables applications to fully configure Solace messaging. Applications can use this API by logging into the Solace message router using a Message-VPN admin account. This concept is introduced in the [Technology – Messaging Platform Features](https://solace.com/products/tech/) and further details are available in the [Solace Message Router Product Documentation](https://docs.solace.com/SEMP/Using-Legacy-SEMP.htm).
+One option is to use a management interface to administratively configure the topic to queue mapping, by adding topic subscriptions to the queue. This can either be done through the CLI or Broker Manager application; or the SEMP programmatic management API. The SEMP API enables applications to fully configure Solace messaging. Applications can use this API by logging into the Solace message router using a Message-VPN admin account. This concept is introduced in the [Technology – Messaging Platform Features](https://solace.com/products/tech/) and further details are available in the [Solace Message Router Product Documentation](https://docs.solace.com/SEMP/Using-Legacy-SEMP.htm).
## Summary
diff --git a/src/pages/tutorials/java-amqp-qpid-jms2/durable-topic-subscriber.md b/src/pages/tutorials/java-amqp-qpid-jms2/durable-topic-subscriber.md
index 290262c2..2ef0c812 100644
--- a/src/pages/tutorials/java-amqp-qpid-jms2/durable-topic-subscriber.md
+++ b/src/pages/tutorials/java-amqp-qpid-jms2/durable-topic-subscriber.md
@@ -22,9 +22,9 @@ no consumer associated with it.
To create a durable subscription, you must first create a JMS connection as with all JMS samples. See the [publish/subscribe tutorial](../publish-subscribe/) for more details if you need.
-A durable subscription requires that you create a durable consumer given a subscription name and topic. The subscription name will be the name used for the Durable Topic Endpoint in the Solace PubSub+ messaging service and the topic name is what will attract the messages you wish to receive.
+A durable subscription requires that you create a durable consumer given a subscription name and topic. The subscription name will be the name used for the Durable Topic Endpoint in the Solace messaging service and the topic name is what will attract the messages you wish to receive.
-One aspect that is unusual with Qpid JMS is that a client ID is required to create a durable consumer. Therefore, you must set this on the context. Keep in mind that client IDs must be unique within the Solace PubSub+ messaging service.
+One aspect that is unusual with Qpid JMS is that a client ID is required to create a durable consumer. Therefore, you must set this on the context. Keep in mind that client IDs must be unique within the Solace messaging service.
The following code snippet outlines this.
diff --git a/src/pages/tutorials/java-amqp-qpid-jms2/topic-to-queue-mapping.md b/src/pages/tutorials/java-amqp-qpid-jms2/topic-to-queue-mapping.md
index cf9e6a57..f677ff33 100644
--- a/src/pages/tutorials/java-amqp-qpid-jms2/topic-to-queue-mapping.md
+++ b/src/pages/tutorials/java-amqp-qpid-jms2/topic-to-queue-mapping.md
@@ -26,7 +26,7 @@ If you have a durable queue named “Q”, it will receive messages published di
JMS is a standard programmatic interface with a design goal of being messaging middleware agnostic. As such, the JMS interface does not provide a way for applications to directly take advantage of the Solace Topic to Queue Mapping feature. However JMS applications wishing to take advantage of this Solace feature have a few options.
-One option is to use a management interface to administratively configure the topic to queue mapping, by adding topic subscriptions to the queue. This can either be done through the CLI or PubSub+ Manager application; or the SEMP programmatic management API. The SEMP API enables applications to fully configure Solace messaging. Applications can use this API by logging into Solace messaging using a Message-VPN admin account. This concept is introduced in the [Technology – Messaging Platform Features](https://solace.com/products/tech/) and further details are available in the [Solace Message Router Product Documentation](https://docs.solace.com/SEMP/Using-Legacy-SEMP.htm).
+One option is to use a management interface to administratively configure the topic to queue mapping, by adding topic subscriptions to the queue. This can either be done through the CLI or Broker Manager application; or the SEMP programmatic management API. The SEMP API enables applications to fully configure Solace messaging. Applications can use this API by logging into Solace messaging using a Message-VPN admin account. This concept is introduced in the [Technology – Messaging Platform Features](https://solace.com/products/tech/) and further details are available in the [Solace Message Router Product Documentation](https://docs.solace.com/SEMP/Using-Legacy-SEMP.htm).
## Summary
diff --git a/src/pages/tutorials/java-mqtt-paho/publish-subscribe.md b/src/pages/tutorials/java-mqtt-paho/publish-subscribe.md
index 01f8f614..9a7b6b2d 100644
--- a/src/pages/tutorials/java-mqtt-paho/publish-subscribe.md
+++ b/src/pages/tutorials/java-mqtt-paho/publish-subscribe.md
@@ -62,7 +62,7 @@ mqttClient.connect(connOpts);
A MQTT client can maintain state information between sessions. The state information is used to ensure delivery and receipt of messages, and include subscriptions created by an MQTT client. This tutorial sets the "clean session" flag to true, via the `MqttConnectOptions` class, to clear the state information after each session disconnect.
-At this point your client is connected to the Solace messaging. You can use PubSub+ Manager to view the client connection and related details.
+At this point your client is connected to the Solace messaging. You can use Broker Manager to view the client connection and related details.
## Receive a message
diff --git a/src/pages/tutorials/java/_howtos.yml b/src/pages/tutorials/java/_howtos.yml
index aa53f7cc..2656d57c 100644
--- a/src/pages/tutorials/java/_howtos.yml
+++ b/src/pages/tutorials/java/_howtos.yml
@@ -7,8 +7,8 @@
- title: Access API Metrics
description: Sample code showing how to access API metrics
link: https://github.com/SolaceSamples/solace-samples-java/blob/main/src/main/java/com/solace/samples/java/snippets/HowToAccessApiMetrics.java
-- title: Access PubSub+ Service
- description: Sample code showing how to access PubSub+ service
+- title: Access Solace Service
+ description: Sample code showing how to access Solace service
link: https://github.com/SolaceSamples/solace-samples-java/blob/main/src/main/java/com/solace/samples/java/snippets/HowToAccessPubSubPlusService.java
- title: Configure Authentication
description: Sample code showing how to configure authentication
diff --git a/src/pages/tutorials/javarto/publish-subscribe.md b/src/pages/tutorials/javarto/publish-subscribe.md
index c67175a8..d17f4ed7 100644
--- a/src/pages/tutorials/javarto/publish-subscribe.md
+++ b/src/pages/tutorials/javarto/publish-subscribe.md
@@ -136,7 +136,7 @@ sessionHandle.connect();
Similar to the creating a Context, a new instance of `SessionHandle` must be created first and then allocated using the previously created `contextHandle` instance. The bounded `SessionHandle`, session properties, the message callback, and the session callback functions are passed as parameters. The final call to `SessionHandle.connect` establishes the connection to the Solace message router which makes the session ready for use.
-At this point your client is connected to the Solace message router. You can use PubSub+ Manager to view the client connection and related details.
+At this point your client is connected to the Solace message router. You can use Broker Manager to view the client connection and related details.
## Receiving a message
diff --git a/src/pages/tutorials/javascript/confirmed-delivery.md b/src/pages/tutorials/javascript/confirmed-delivery.md
index 9ccc90b6..08e7b210 100644
--- a/src/pages/tutorials/javascript/confirmed-delivery.md
+++ b/src/pages/tutorials/javascript/confirmed-delivery.md
@@ -46,7 +46,7 @@ const correlationKey = {
## Implementing Confirmed Delivery
-This tutorial’s sample application will send guaranteed messages to a durable queue pre-configured on the Solace message router. You can use Solace PubSub+ Manager, SEMP or CLI to create a durable queue. This tutorial assumes that the queue named `tutorial/queue` has been created.
+This tutorial’s sample application will send guaranteed messages to a durable queue pre-configured on the Solace message router. You can use Broker Manager, SEMP or CLI to create a durable queue. This tutorial assumes that the queue named `tutorial/queue` has been created.
The structure of the code is similar to the Persistence with Queues tutorial's Queue Producer with the additions of several messages being sent and the acknowledgements logged for each message that comes back from the Solace message router.
diff --git a/src/pages/tutorials/javascript/dte-consumer.md b/src/pages/tutorials/javascript/dte-consumer.md
index da7887cd..98bf217f 100644
--- a/src/pages/tutorials/javascript/dte-consumer.md
+++ b/src/pages/tutorials/javascript/dte-consumer.md
@@ -17,7 +17,7 @@ The example code builds on the Consumer in the [QueueConsumer](../persistence-wi
A topic endpoint attracts messages published to a topic for which the topic endpoint has a matching topic subscription. The topic subscription for the topic endpoint is specified in the client request to bind a Flow to that topic endpoint.
-Durable queues and topic endpoints are provisioned objects on the message broker that have a life span independent of a particular client session. They also survive a message broker restart and are preserved as part of the message broker configuration for backup and restoration purposes. Administrators can provision durable queues and topic endpoints through the Solace CLI, SEMP, or PubSub+ Manager; client applications can dynamically provision durable endpoints through the Solace messaging APIs.
+Durable queues and topic endpoints are provisioned objects on the message broker that have a life span independent of a particular client session. They also survive a message broker restart and are preserved as part of the message broker configuration for backup and restoration purposes. Administrators can provision durable queues and topic endpoints through the Solace CLI, SEMP, or Broker Manager; client applications can dynamically provision durable endpoints through the Solace messaging APIs.
## Prerequisite
diff --git a/src/pages/tutorials/javascript/message-replay.md b/src/pages/tutorials/javascript/message-replay.md
index 9207b921..32f74110 100644
--- a/src/pages/tutorials/javascript/message-replay.md
+++ b/src/pages/tutorials/javascript/message-replay.md
@@ -25,11 +25,11 @@ It's important to note that when initiating replay, the message broker will disc
## Prerequisite
-A replay log must be created on the message broker for the Message VPN using [Message Replay CLI configuration](https://docs.solace.com/Configuring-and-Managing/Msg-Replay-Config.htm) or using [Solace PubSub+ Manager](https://docs.solace.com/Solace-PubSub-Manager/PubSub-Manager-Overview.htm) administration console. Another option for configuration is to use the [SEMP API](https://docs.solace.com/SEMP/Using-SEMP.htm).
+A replay log must be created on the message broker for the Message VPN using [Message Replay CLI configuration](https://docs.solace.com/Configuring-and-Managing/Msg-Replay-Config.htm) or using [Broker Manager](https://docs.solace.com/Solace-PubSub-Manager/PubSub-Manager-Overview.htm) administration console. Another option for configuration is to use the [SEMP API](https://docs.solace.com/SEMP/Using-SEMP.htm).
NOTE: Message Replay is supported on Solace PubSub+ 3530 and 3560 appliances running release 9.1 and greater, and on the Solace PubSub+ software message broker running release 9.1 and greater. Solace JavaScript API version 10.2.1 or later is required.
-
+
## Code
@@ -167,7 +167,7 @@ You can now run this sample and observe the following, particularly the "message
3. Now start a replay from the message broker. The "MessageReplay" flow event handler monitors for a replay start event. When the message broker initiates a replay, the flow will see a DOWN_ERROR event with cause REPLAY_STARTED. This means an administrator has initiated a replay, and the application must destroy and re-create the flow to receive the replayed messages.
This will replay all logged messages including the live one published in step 2.
-
+
## Learn More
diff --git a/src/pages/tutorials/javascript/persistence-with-queues.md b/src/pages/tutorials/javascript/persistence-with-queues.md
index fd59866d..312da4d7 100644
--- a/src/pages/tutorials/javascript/persistence-with-queues.md
+++ b/src/pages/tutorials/javascript/persistence-with-queues.md
@@ -37,7 +37,7 @@ The goal of this tutorial is to understand the following:
A difference with the publish/subscribe tutorial is that for guaranteed messaging a physical endpoint resource – a durable queue, associated with the queue destination – needs to be created on the Solace message router, which will persist the messages until consumed.
-You can use Solace PubSub+ Manager, SEMP or CLI to create a durable queue. This tutorial assumes that the queue named `tutorial/queue` has been created. Ensure the queue is enabled for both Incoming and Outgoing messages and set the Permission to at least "Consume".
+You can use Broker Manager, SEMP or CLI to create a durable queue. This tutorial assumes that the queue named `tutorial/queue` has been created. Ensure the queue is enabled for both Incoming and Outgoing messages and set the Permission to at least "Consume".
`markdown:loadAndInitSolaceApi.md`
@@ -74,7 +74,7 @@ try {
}
```
-At this point your JavaScript application is connected as a client to the Solace message router. You can use PubSub+ Manager to view this client connection and related details.
+At this point your JavaScript application is connected as a client to the Solace message router. You can use Broker Manager to view this client connection and related details.
#### Session Events
diff --git a/src/pages/tutorials/javascript/publish-subscribe.md b/src/pages/tutorials/javascript/publish-subscribe.md
index 8fedd3fd..2c9ac3ae 100644
--- a/src/pages/tutorials/javascript/publish-subscribe.md
+++ b/src/pages/tutorials/javascript/publish-subscribe.md
@@ -67,7 +67,7 @@ try {
subscriber.log(error.toString());
}
```
-At this point your browser is connected as a client to the Solace message router. You can use PubSub+ Manager to view this client connection and related details.
+At this point your browser is connected as a client to the Solace message router. You can use Broker Manager to view this client connection and related details.
## Session Events
diff --git a/src/pages/tutorials/jcsmp/active-flow-indication.md b/src/pages/tutorials/jcsmp/active-flow-indication.md
index 01f3b600..2be6a693 100644
--- a/src/pages/tutorials/jcsmp/active-flow-indication.md
+++ b/src/pages/tutorials/jcsmp/active-flow-indication.md
@@ -23,7 +23,7 @@ Using the Active Flow Indication, a client application can learn if it is the pr
The [Client Profile](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm) must be configured to [allow receiving guaranteed messages](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm#Allow-G-Msg-Receives).
-NOTE: This is the default configuration in PubSub+ Cloud messaging services.
+NOTE: This is the default configuration in Solace Cloud messaging services.
## Code
diff --git a/src/pages/tutorials/jcsmp/browsing-queues.md b/src/pages/tutorials/jcsmp/browsing-queues.md
index f220f35b..e2c14722 100644
--- a/src/pages/tutorials/jcsmp/browsing-queues.md
+++ b/src/pages/tutorials/jcsmp/browsing-queues.md
@@ -21,7 +21,7 @@ A Browser could be used by an application to pre-screen messages by detecting me
The [Client Profile](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm) must be configured to [allow receiving guaranteed messages](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm#Allow-G-Msg-Receives)
-NOTE: This is the default configuration in PubSub+ Cloud messaging services.
+NOTE: This is the default configuration in Solace Cloud messaging services.
## Code
diff --git a/src/pages/tutorials/jcsmp/message-replay.md b/src/pages/tutorials/jcsmp/message-replay.md
index 04284765..786d65a2 100644
--- a/src/pages/tutorials/jcsmp/message-replay.md
+++ b/src/pages/tutorials/jcsmp/message-replay.md
@@ -23,11 +23,11 @@ It's important to note that when initiating replay, the message broker will disc
## Prerequisite
-A replay log must be created on the message broker for the Message VPN using [Message Replay CLI configuration](https://docs.solace.com/Configuring-and-Managing/Msg-Replay-Config.htm) or using [Solace PubSub+ Manager](https://docs.solace.com/Solace-PubSub-Manager/PubSub-Manager-Overview.htm) administration console. Another option for configuration is to use the [SEMP API](https://docs.solace.com/SEMP/Using-SEMP.htm).
+A replay log must be created on the message broker for the Message VPN using [Message Replay CLI configuration](https://docs.solace.com/Configuring-and-Managing/Msg-Replay-Config.htm) or using [Broker Manager](https://docs.solace.com/Solace-PubSub-Manager/PubSub-Manager-Overview.htm) administration console. Another option for configuration is to use the [SEMP API](https://docs.solace.com/SEMP/Using-SEMP.htm).
NOTE: Message Replay is supported on Solace PubSub+ 3530 and 3560 appliances running release 9.1 and greater, and on the Solace PubSub+ software message broker running release 9.1 and greater. Solace Java API version 10.5 or later is required.
-
+
## Code
@@ -220,7 +220,7 @@ $ ./build/staged/bin/queueProducer @ [
3. Now start a replay from the message broker. The flow event handler monitors for a replay start event. When the message broker initiates a replay, the flow will see a DOWN_ERROR event with cause 'Replay Started'. This means an administrator has initiated a replay, and the application must destroy and re-create the flow to receive the replayed messages.
This will replay all logged messages including the live one published in step 2.
-
+
## Learn More
* Related Source Code: [MessageReplay.java](https://github.com/SolaceSamples/solace-samples-java-jcsmp/blob/master/src/main/java/com/solace/samples/jcsmp/features/MessageReplay.java)
diff --git a/src/pages/tutorials/jcsmp/message-selectors.md b/src/pages/tutorials/jcsmp/message-selectors.md
index 94014a30..2b1895b5 100644
--- a/src/pages/tutorials/jcsmp/message-selectors.md
+++ b/src/pages/tutorials/jcsmp/message-selectors.md
@@ -21,7 +21,7 @@ When a selector is used, a client only receives a message if the selector evalua
The [Client Profile](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm) must be configured to [allow receiving guaranteed messages](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm#Allow-G-Msg-Receives).
-NOTE: This is the default configuration in PubSub+ Cloud messaging services.
+NOTE: This is the default configuration in Solace Cloud messaging services.
## Code
diff --git a/src/pages/tutorials/jcsmp/persistence-with-queues.md b/src/pages/tutorials/jcsmp/persistence-with-queues.md
index 221401bb..630aee32 100644
--- a/src/pages/tutorials/jcsmp/persistence-with-queues.md
+++ b/src/pages/tutorials/jcsmp/persistence-with-queues.md
@@ -52,7 +52,7 @@ Durable endpoints are not auto created on Solace message routers. However there
Using the Solace APIs to provision an endpoint can be a convenient way of getting started quickly without needing to become familiar with the management interface. This is why it is used in this tutorial. However it should be noted that the management interface provides more options to control the queue properties. So generally it becomes the preferred method over time.
-Provisioning an endpoint through the API requires the “Guaranteed Endpoint Create” permission in the client-profile. You can confirm this is enabled by looking at the client profile in PubSub+ Manager. If it is correctly set you will see the following:
+Provisioning an endpoint through the API requires the “Guaranteed Endpoint Create” permission in the client-profile. You can confirm this is enabled by looking at the client profile in Broker Manager. If it is correctly set you will see the following:
diff --git a/src/pages/tutorials/jcsmp/publish-subscribe.md b/src/pages/tutorials/jcsmp/publish-subscribe.md
index 25c0e96d..b4b6fe6f 100644
--- a/src/pages/tutorials/jcsmp/publish-subscribe.md
+++ b/src/pages/tutorials/jcsmp/publish-subscribe.md
@@ -42,7 +42,7 @@ final JCSMPSession session = JCSMPFactory.onlyInstance().createSession(propertie
session.connect();
```
-At this point your client is connected to the Solace message router. You can use PubSub+ Manager to view the client connection and related details.
+At this point your client is connected to the Solace message router. You can use Broker Manager to view the client connection and related details.
## Receiving a message
diff --git a/src/pages/tutorials/jcsmp/schema-registry-serdes.md b/src/pages/tutorials/jcsmp/schema-registry-serdes.md
index bb9c154d..f90761b2 100644
--- a/src/pages/tutorials/jcsmp/schema-registry-serdes.md
+++ b/src/pages/tutorials/jcsmp/schema-registry-serdes.md
@@ -31,7 +31,7 @@ The Schema Registry SERDES library supports both JSON Schema and Apache Avro for
## Prerequisites
-* A Solace PubSub+ broker (version 10.5 or later) with Schema Registry deployed
+* A Solace Event Broker (version 10.5 or later) with Schema Registry deployed
* Access to the Schema Registry with appropriate credentials
* JSON Schema files uploaded to the Schema Registry
* There must be a suitable [Client Profile](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm) configured on your broker
diff --git a/src/pages/tutorials/jcsmp/topic-to-queue-mapping.md b/src/pages/tutorials/jcsmp/topic-to-queue-mapping.md
index 1ddee148..ed88051c 100644
--- a/src/pages/tutorials/jcsmp/topic-to-queue-mapping.md
+++ b/src/pages/tutorials/jcsmp/topic-to-queue-mapping.md
@@ -114,7 +114,7 @@ for (int i = 1; i <= count; i++) {
}
```
-These messages are now on your queue. You can validate this through PubSub+ Manager by inspecting the queue. Now receive the messages using a flow consumer as outlined in detail in previous tutorials.
+These messages are now on your queue. You can validate this through Broker Manager by inspecting the queue. Now receive the messages using a flow consumer as outlined in detail in previous tutorials.
```java
ConsumerFlowProperties flow_prop = new ConsumerFlowProperties();
diff --git a/src/pages/tutorials/jcsmp/transactions.md b/src/pages/tutorials/jcsmp/transactions.md
index 149c404c..51a5b228 100644
--- a/src/pages/tutorials/jcsmp/transactions.md
+++ b/src/pages/tutorials/jcsmp/transactions.md
@@ -23,7 +23,7 @@ This feature can be used to guarantee that a message is not removed from the mes
The [Client Profile](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm) must be configured to [allow transacted sessions](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm#Allow-Trans-Sess).
-NOTE: This is the default configuration in PubSub+ Cloud messaging services.
+NOTE: This is the default configuration in Solace Cloud messaging services.
## Code
diff --git a/src/pages/tutorials/jcsmp/ttl-and-dmq.md b/src/pages/tutorials/jcsmp/ttl-and-dmq.md
index 15c0edf1..8a669918 100644
--- a/src/pages/tutorials/jcsmp/ttl-and-dmq.md
+++ b/src/pages/tutorials/jcsmp/ttl-and-dmq.md
@@ -23,7 +23,7 @@ This feature is very useful in real-time applications where receiving a stale me
The [Client Profile](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm) must be configured to [allow receiving guaranteed messages](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm#Allow-G-Msg-Receives) and [allow creating guaranteed messages](https://docs.solace.com/Configuring-and-Managing/Configuring-Client-Profiles.htm#Allow-G-Msg-Creates).
-NOTE: This is the default configuration in PubSub+ Cloud messaging services.
+NOTE: This is the default configuration in Solace Cloud messaging services.
## Code
diff --git a/src/pages/tutorials/jms/publish-subscribe.md b/src/pages/tutorials/jms/publish-subscribe.md
index 87defcbe..560dfe66 100644
--- a/src/pages/tutorials/jms/publish-subscribe.md
+++ b/src/pages/tutorials/jms/publish-subscribe.md
@@ -81,7 +81,7 @@ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
This tutorial uses an auto acknowledgement session. This is the simplest to use. However, it often makes sense to customize the acknowledgement mode in JMS to suit your application needs. Solace supports all of the JMS acknowledgement modes and introduces an extension which allows applications to individually acknowledge each message which we believe is a significant improvement of the behaviour of the default JMS client acknowledgement. Learn more in the [Solace JMS Documentation - Managing Sessions](https://docs.solace.com/Solace-JMS-API/Managing-Sessions.htm).
-At this point your client is connected to Solace messaging. You can use PubSub+ Manager to view the client connection and related details.
+At this point your client is connected to Solace messaging. You can use Broker Manager to view the client connection and related details.
## Receiving a message
diff --git a/src/pages/tutorials/jms/topic-to-queue-mapping.md b/src/pages/tutorials/jms/topic-to-queue-mapping.md
index a31ec6f2..b451c392 100644
--- a/src/pages/tutorials/jms/topic-to-queue-mapping.md
+++ b/src/pages/tutorials/jms/topic-to-queue-mapping.md
@@ -22,7 +22,7 @@ If you have a durable queue named “Q”, it will receive messages published di
JMS is a standard programmatic interface with a design goal of being messaging middleware agnostic. As such, the JMS interface does not provide a way for applications to directly take advantage of the Solace Topic to Queue Mapping feature. However JMS applications wishing to take advantage of this Solace feature have a few options.
-One option is to use a management interface to administratively configure the topic to queue mapping, by adding topic subscriptions to the queue. This can either be done through the CLI or PubSub+ Manager application; or the SEMP programmatic management API. The SEMP API enables applications to fully configure Solace message routers. Applications can use this API by logging in to the Solace message router using a Message-VPN admin account. This concept is introduced in the [Technology – Messaging Platform Features](https://solace.com/products/tech/) and further details are available in the [Solace Message Router Product Documentation](https://docs.solace.com/SEMP/Using-Legacy-SEMP.htm).
+One option is to use a management interface to administratively configure the topic to queue mapping, by adding topic subscriptions to the queue. This can either be done through the CLI or Broker Manager application; or the SEMP programmatic management API. The SEMP API enables applications to fully configure Solace message routers. Applications can use this API by logging in to the Solace message router using a Message-VPN admin account. This concept is introduced in the [Technology – Messaging Platform Features](https://solace.com/products/tech/) and further details are available in the [Solace Message Router Product Documentation](https://docs.solace.com/SEMP/Using-Legacy-SEMP.htm).
A second option is to consider using a Solace Java API session directly for this part of your application. This is outlined in the [Java API version of this tutorial](/jcsmp/topic-to-queue-mapping/). This would involve opening a second client connection using a Java API Session and then mapping the required topics onto the desired queue. Then this Java API session can be closed.
diff --git a/src/pages/tutorials/jms/using-jndi.md b/src/pages/tutorials/jms/using-jndi.md
index 5ee02c25..a9e5c20c 100644
--- a/src/pages/tutorials/jms/using-jndi.md
+++ b/src/pages/tutorials/jms/using-jndi.md
@@ -88,7 +88,7 @@ There are several ways to manage Solace messaging including:
* Command Line Interface (CLI)
* the Solace Element Management Protocol (SEMP) RESTful API
-* the GUI-based PubSub+ Manager application.
+* the GUI-based Broker Manager application.
For simplicity in this tutorial, the following CLI script is provided. It will do the following:
@@ -157,7 +157,7 @@ Password:
See the [Solace Documentation - Solace Router CLI](https://docs.solace.com/Solace-CLI/Using-Solace-CLI.htm) for more details.
-To learn how to use the SEMP API, refer to the [Solace Element Management Protocol (SEMP) tutorials](https://docs.solace.com/SEMP/Using-SEMP.htm). To learn about the PubSub+ Manager application, refer to the [Solace Documentation - PubSub+ Manager Overview](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm) and the application's online Help.
+To learn how to use the SEMP API, refer to the [Solace Element Management Protocol (SEMP) tutorials](https://docs.solace.com/SEMP/Using-SEMP.htm). To learn about the Broker Manager application, refer to the [Solace Documentation - Broker Manager Overview](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm) and the application's online Help.
## Step 2: Obtaining a JMS ConnectionFactory object using JNDI
diff --git a/src/pages/tutorials/nodejs-amqp/topic-to-queue-mapping.md b/src/pages/tutorials/nodejs-amqp/topic-to-queue-mapping.md
index 1041c216..73695d69 100644
--- a/src/pages/tutorials/nodejs-amqp/topic-to-queue-mapping.md
+++ b/src/pages/tutorials/nodejs-amqp/topic-to-queue-mapping.md
@@ -24,7 +24,7 @@ If you have a durable queue named “Q”, it will receive messages published di
AMQP is a standard protocol with a design goal of being messaging middleware agnostic. As such, it does not provide a way for applications to directly take advantage of the Solace Topic to Queue Mapping feature.
-However Node.js applications wishing to take advantage of this Solace feature can use a management interface to administratively configure the topic to queue mapping, by adding topic subscriptions to the queue. This can either be done through the CLI or PubSub+ Manager application; or the SEMP programmatic management API. The SEMP API enables applications to fully configure Solace messaging.
+However Node.js applications wishing to take advantage of this Solace feature can use a management interface to administratively configure the topic to queue mapping, by adding topic subscriptions to the queue. This can either be done through the CLI or Broker Manager application; or the SEMP programmatic management API. The SEMP API enables applications to fully configure Solace messaging.
Applications can use this API by logging into Solace messaging using a Message-VPN admin account. This concept is introduced in the [Technology – Messaging Platform Features](https://solace.com/products/tech/) and further details are available in the [Solace Message Router Product Documentation](https://docs.solace.com/SEMP/Using-SEMP.htm).
diff --git a/src/pages/tutorials/nodejs/confirmed-delivery.md b/src/pages/tutorials/nodejs/confirmed-delivery.md
index 55ce1756..dbedc7e9 100644
--- a/src/pages/tutorials/nodejs/confirmed-delivery.md
+++ b/src/pages/tutorials/nodejs/confirmed-delivery.md
@@ -46,7 +46,7 @@ const correlationKey = {
## Implementing Confirmed Delivery
-This tutorial’s sample application will send guaranteed messages to a durable queue pre-configured on the Solace message router. You can use Solace PubSub+ Manager, SEMP or CLI to create a durable queue. This tutorial assumes that the queue named `tutorial/queue` has been created.
+This tutorial’s sample application will send guaranteed messages to a durable queue pre-configured on the Solace message router. You can use Broker Manager, SEMP or CLI to create a durable queue. This tutorial assumes that the queue named `tutorial/queue` has been created.
The structure of the code is similar to the Persistence with Queues tutorial's Queue Producer with the additions of several messages being sent and the acknowledgements logged for each message that comes back from the Solace message router.
diff --git a/src/pages/tutorials/nodejs/persistence-with-queues.md b/src/pages/tutorials/nodejs/persistence-with-queues.md
index 828852e1..7ec0dd63 100644
--- a/src/pages/tutorials/nodejs/persistence-with-queues.md
+++ b/src/pages/tutorials/nodejs/persistence-with-queues.md
@@ -32,7 +32,7 @@ The goal of this tutorial is to understand the following:
A difference with the publish/subscribe tutorial is that for guaranteed messaging a physical endpoint resource – a durable queue, associated with the queue destination – needs to be created on the Solace message router, which will persist the messages until consumed.
-You can use Solace PubSub+ Manager, SEMP or CLI to create a durable queue. This tutorial assumes that the queue named `tutorial/queue` has been created. Ensure the queue is enabled for both Incoming and Outgoing messages and set the Permission to at least "Consume".
+You can use Broker Manager, SEMP or CLI to create a durable queue. This tutorial assumes that the queue named `tutorial/queue` has been created. Ensure the queue is enabled for both Incoming and Outgoing messages and set the Permission to at least "Consume".
`markdown:loadAndInitSolaceApi.md`
@@ -69,7 +69,7 @@ try {
}
```
-At this point your Node.js application is connected as a client to the Solace message router. You can use PubSub+ Manager to view this client connection and related details.
+At this point your Node.js application is connected as a client to the Solace message router. You can use Broker Manager to view this client connection and related details.
#### Session Events
diff --git a/src/pages/tutorials/nodejs/publish-subscribe.md b/src/pages/tutorials/nodejs/publish-subscribe.md
index 6216bcfa..7372bfad 100644
--- a/src/pages/tutorials/nodejs/publish-subscribe.md
+++ b/src/pages/tutorials/nodejs/publish-subscribe.md
@@ -65,7 +65,7 @@ try {
}
```
-At this point your Node.js application is connected as a client to the Solace message router. You can use PubSub+ Manager to view this client connection and related details.
+At this point your Node.js application is connected as a client to the Solace message router. You can use Broker Manager to view this client connection and related details.
## Session Events
diff --git a/src/pages/tutorials/nodejs/topic-to-queue-mapping.md b/src/pages/tutorials/nodejs/topic-to-queue-mapping.md
index 5c1b16c5..26ac786c 100644
--- a/src/pages/tutorials/nodejs/topic-to-queue-mapping.md
+++ b/src/pages/tutorials/nodejs/topic-to-queue-mapping.md
@@ -266,9 +266,9 @@ The following is the output of the tutorial’s `GuaranteedConsumer.js` applicat
```bash
$ node GuaranteedConsumer.js ws://192.168.133.64 testuser@default passw
[16:08:25] *** Consumer to queue "tutorial/queue" is ready to connect ***
-[16:08:25] Connecting to Solace PubSub+ Event Broker using url: ws://localhost:8008
+[16:08:25] Connecting to Solace Event Broker using url: ws://localhost:8008
[16:08:25] Client username: default
-[16:08:25] Solace PubSub+ Event Broker VPN name: default
+[16:08:25] Solace Event Broker VPN name: default
[16:08:25] Press Ctrl-C to exit
[16:08:25] === Successfully connected and ready to start the message subscriber. ===
[16:08:25] Starting subscriber for queue: tutorial/queue
@@ -291,14 +291,14 @@ The following is the output of the tutorial’s `GuaranteedPublisher.js` applica
```bash
$ node GuaranteedPublisher.js ws://192.168.133.64 testuser@default passw
[16:09:20] *** publisher to topic "solace/samples/nodejs/pers" is ready to connect ***
-[16:09:20] Connecting to Solace PubSub+ Event Broker using url: ws://localhost:8008
+[16:09:20] Connecting to Solace Event Broker using url: ws://localhost:8008
[16:09:20] Client username: default
-[16:09:20] Solace PubSub+ Event Broker VPN name: default
+[16:09:20] Solace Event Broker VPN name: default
[16:09:20] === Successfully connected and ready to publish messages. ===
[16:09:20] Publishing message "Sample Message" to topic "solace/samples/nodejs/pers/1675939160521"...
[16:09:20] Message sent with correlation key: 1675939160521
-[16:09:21] Delivery of message to PubSub+ Broker with correlation key = 1675939160521 confirmed.
-[16:09:21] Disconnecting from Solace PubSub+ Event Broker...
+[16:09:21] Delivery of message to Solace Event Broker with correlation key = 1675939160521 confirmed.
+[16:09:21] Disconnecting from Solace Event Broker...
[16:09:21] Disconnected.
```
diff --git a/src/pages/tutorials/openmama/hello-world.md b/src/pages/tutorials/openmama/hello-world.md
index e05cc1ab..a4da1c60 100644
--- a/src/pages/tutorials/openmama/hello-world.md
+++ b/src/pages/tutorials/openmama/hello-world.md
@@ -275,7 +275,7 @@ int main(int argc, const char** argv)
}
```
-Now our program runs without any errors and it successfully connects to **Solace messaging**. If you sleep the main thread before the `mamaTransport_destroy(transport)` call, you can see use **PubSub+ Manager** to see this program as a client connected to **Solace messaging**.
+Now our program runs without any errors and it successfully connects to **Solace messaging**. If you sleep the main thread before the `mamaTransport_destroy(transport)` call, you can see use **Broker Manager** to see this program as a client connected to **Solace messaging**.
#### Create publisher
diff --git a/src/pages/tutorials/rest-messaging/publish-subscribe.md b/src/pages/tutorials/rest-messaging/publish-subscribe.md
index 30b8a587..155fbfda 100644
--- a/src/pages/tutorials/rest-messaging/publish-subscribe.md
+++ b/src/pages/tutorials/rest-messaging/publish-subscribe.md
@@ -1,7 +1,7 @@
---
layout: tutorials
title: Publish / Subscribe
-summary: Learn how to pub/sub using Solace REST Messaging with a Solace PubSub+ Broker.
+summary: Learn how to pub/sub using Solace REST Messaging with a Solace Event Broker.
icon: I_dev_P+S.svg
links:
- label: feedback
@@ -15,8 +15,8 @@ This tutorial will introduce you to the fundamentals of the Solace REST messagin
This tutorial assumes the following:
* You are familiar with Solace [core concepts](https://docs.solace.com/PubSub-Basics/Core-Concepts.htm).
-* You have access to a running Solace PubSub+ Broker with the following configuration:
- * Connectivity information for a Solace PubSub+ Broker
+* You have access to a running Solace Event Broker with the following configuration:
+ * Connectivity information for a Solace Event Broker
* Enabled client username and password
* Enabled guaranteed messaging support (needed for REST consumers)
* Client-profile enabled with guaranteed messaging permissions
@@ -36,7 +36,7 @@ The goal of this tutorial is to demonstrate the most basic messaging interaction
## Solace REST Messaging API Introduction
-As outlined in the [Online REST Messaging Documentation](https://docs.solace.com/Open-APIs-Protocols/REST-get-start.htm), the REST Messaging API enable users to send messages to, and asynchronously receive messages from a Solace PubSub+ Broker over HTTP using a RESTful API.
+As outlined in the [Online REST Messaging Documentation](https://docs.solace.com/Open-APIs-Protocols/REST-get-start.htm), the REST Messaging API enable users to send messages to, and asynchronously receive messages from a Solace Event Broker over HTTP using a RESTful API.
The Solace API uses HTTP POST requests to allow clients to publish message to a Message VPN. The Solace API follows the asynchronous notification pattern and uses an HTTP POST from a Message VPN to the client to deliver messages. This means that pub and sub messages are sent on different HTTP connections than they are received as shown in the following figure.
@@ -61,14 +61,14 @@ There is no API to obtain. The Solace REST messaging API is a wireline RESTful H
## Receiving a message
-Since Solace PubSub+ is a multi-protocol translation broker, messages can be received using any of the other Solace APIs (e.g., JMS or MQTT) which would be a lot less complicated to use when compared to REST Deliver point based setup.
+Since Solace is a multi-protocol translation broker, messages can be received using any of the other Solace APIs (e.g., JMS or MQTT) which would be a lot less complicated to use when compared to REST Deliver point based setup.
In this tutorial will show how to setup a subscriber to receive published messages.
-On the consumer side, the Solace REST messaging API depends on a guaranteed messaging queue. As such it is a requirement for REST consumers that Solace PubSub+ Broker support guaranteed messaging and have this feature configured as outlined in the [Assumptions](#Assumptions) section above.
+On the consumer side, the Solace REST messaging API depends on a guaranteed messaging queue. As such it is a requirement for REST consumers that Solace Event Broker support guaranteed messaging and have this feature configured as outlined in the [Assumptions](#Assumptions) section above.
In order to receive REST messages from Solace Message VPN, you must configure a Guaranteed messaging queue and a REST delivery point. The queue is used to attract messages to the consumer application. The REST delivery point is the Solace message router component that delivers the messages from the queue to the consumer application asynchronously through HTTP POST requests. This is explained in detail in the [REST Messaging Concepts](https://docs.solace.com/Open-APIs-Protocols/REST-get-start.htm). This tutorial will walk you through the required Solace Message VPN configuration required to create a queue and REST delivery point to connect to your REST consumer application.
@@ -105,7 +105,7 @@ Server running at http://:/
Again in your environment, the RC\_HOST and RC\_PORT will be the host/IP and port that your server is listening on. For example http://49.210.148.187
:10000/ or with a public DNS name http://myhost.mydomain.com:10000 (for example).
-If running Solace PubSub+ Broker locally, a “localhost” or a local DHCP IP for host name won’t work, since the PubSub+ Broker is usually run on a different subnet. You have to use your computer’s actual (local) IP address.
+If running Solace Event Broker locally, a “localhost” or a local DHCP IP for host name won’t work, since the Solace Event Broker is usually run on a different subnet. You have to use your computer’s actual (local) IP address.
**Note:** Even though this tutorial is illustrating how to publish direct messages, for REST delivery points, the messages are always consumed from a queue. Direct messages get promoted in the queue, and are delivered to the REST consumer as Guaranteed messages. For more information on this see the [Features – Topic Matching and Message Delivery Modes](https://docs.solace.com/PubSub-Basics/Topic-Matching-and-Delivery-Modes.htm).
@@ -160,11 +160,11 @@ In the script below, update VPNNAME to match that of your Solace Message VPN, an
The REST Delivery Point configuration can be affected on a Message VPN in different ways. Here is the list of options available for us.
- [Option 1: Using PubSub+ Broker Manager](#Option-1-Using-PubSub-Broker-Manager)
+ [Option 1: Using Solace Event Broker Manager](#Option-1-Using-PubSub-Broker-Manager)
[Option 2: Using SEMP and Postman](#Option-2-Using-SEMP-and-Postman)
[Option 3: Using SEMP and curl](#Option-3-Using-SEMP-and-codecurlcode)
[Option 4: Using Solace CLI](#Option-4-Using-Solace-CLI)
-### Option 1: Using PubSub+ Broker Manager
+### Option 1: Using Solace Event Broker Manager
- Create a Queue by name **Q/rdp1/input**
@@ -267,11 +267,11 @@ A final, configured RDP settings would look like this.
-To know more about PubSub+ Broker Manager check out [PubSub+ Broker Manager overview](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm).
+To know more about Solace Event Broker Manager check out [Solace Event Broker Manager overview](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm).
### Option 2: Using SEMP and Postman
-Solace Element Management Protocol version 2 (SEMP v2) is a RESTful API that you can use to configure Solace PubSub+ event brokers. It complements Solace's CLI and PubSub+ Manager, and provides a programmable way to configure Solace PubSub+ event brokers.
+Solace Element Management Protocol version 2 (SEMP v2) is a RESTful API that you can use to configure Solace event brokers. It complements Solace's CLI and Broker Manager, and provides a programmable way to configure Solace event brokers.
1. Download SEMP v2 specification
@@ -302,7 +302,7 @@ Where the CLOUD_BROKER_HOST is the host name of where the Cloud Broker is runnin
4. Note the SEMP v2 URL and access credentials
- **For PubSub+ Software Broker** - the SEMP requests can be posted to the following URL
+ **For Solace Event Broker Software Broker** - the SEMP requests can be posted to the following URL
```
http://:8080/SEMP/v2/config
```
@@ -313,7 +313,7 @@ Where the CLOUD_BROKER_HOST is the host name of where the Cloud Broker is runnin
- **For PubSub+ Cloud Broker** - select the Broker Service, Select the **Manage** tab and locate the *SEMP - REST API* section. Note the URL to SEMP spec
+ **For Solace Cloud Broker** - select the Broker Service, Select the **Manage** tab and locate the *SEMP - REST API* section. Note the URL to SEMP spec
```
https://CLOUD_BROKER_HOST:943/SEMP/v2/config
```
@@ -329,7 +329,7 @@ Where the CLOUD_BROKER_HOST is the host name of where the Cloud Broker is runnin
5. Execute the following SEMP POST requests to create resources associated with REST Delivery Point.
- The following steps demonstrate invoking SEMP REST API against a PubSub+ Cloud Broker as identified by the host CLOUD\_BROKER\_HOST and a Message VPN identified by VPN_NAME. For PubSub+ Software Broker, use the host on which the software Broker is running.
+ The following steps demonstrate invoking SEMP REST API against a Solace Cloud Broker as identified by the host CLOUD\_BROKER\_HOST and a Message VPN identified by VPN_NAME. For Solace Event Broker Software Broker, use the host on which the software Broker is running.
Ensure that the REST requests are appropriately updated with user credentials and the APIs are invoked as POST requests.
@@ -568,7 +568,7 @@ curl \
### Option 4: Using Solace CLI
-The Solace Command Line Interface (CLI) is a text-based, interactive shell for configuring and monitoring Solace event brokers (available for Solace PubSub+ Software and Appliance Brokers). It allows a user to perform event broker administration, configuration and provisioning, and network troubleshooting tasks. The CLI automatically starts after the event broker powers up.
+The Solace Command Line Interface (CLI) is a text-based, interactive shell for configuring and monitoring Solace event brokers (available for Solace Event Broker Software and Appliance Brokers). It allows a user to perform event broker administration, configuration and provisioning, and network troubleshooting tasks. The CLI automatically starts after the event broker powers up.
Reference guides to the Solace CLI can be found in these locations: [Appliance CLI Commands](https://docs.solace.com/Solace-CLI/CLI-Reference/APPL_CLI_Commands.html) and [Software Event Broker CLI Commands](https://docs.solace.com/Solace-CLI/CLI-Reference/VMR_CLI_Commands.html).
@@ -628,7 +628,7 @@ Password:
```
BROKER_HOST is the host name where the Broker is running.
-At this the REST delivery point is configured and should be operational and connected to your REST consumer application. You can verify this using PubSub+ Manager or through the following CLI command.
+At this the REST delivery point is configured and should be operational and connected to your REST consumer application. You can verify this using Broker Manager or through the following CLI command.
```
solace(configure)# show message-vpn VPNNAME rest rest-delivery-point *
@@ -675,7 +675,7 @@ To send a message you can use the following command.
$ curl -X POST -d "Hello World REST" http://BROKER_HOST:BROKER_REST_PORT/solace/samples/rest -H "content-type: text/plain"
```
-You will need to update HOST and PORT to match your Solace PubSub+ Broker HOST and configured REST service port. This will send a message with contents “Hello World REST” as a Solace text message using the direct delivery mode. The “content-type” headers and “Solace-delivery-mode” are optional. If they are omitted then the Solace REST messaging default delivery mode of “persistent” will be used and the message contents will be treated as binary.
+You will need to update HOST and PORT to match your Solace Event Broker HOST and configured REST service port. This will send a message with contents “Hello World REST” as a Solace text message using the direct delivery mode. The “content-type” headers and “Solace-delivery-mode” are optional. If they are omitted then the Solace REST messaging default delivery mode of “persistent” will be used and the message contents will be treated as binary.
You can also add credentials to the request by updating the cURL command to the following:
diff --git a/src/pages/tutorials/semp/messagevpn-with-queue-java.md b/src/pages/tutorials/semp/messagevpn-with-queue-java.md
index e9f6b89f..1956a948 100644
--- a/src/pages/tutorials/semp/messagevpn-with-queue-java.md
+++ b/src/pages/tutorials/semp/messagevpn-with-queue-java.md
@@ -69,7 +69,7 @@ Now we can start to implement the tasks as building blocks for the sample manage
### Create a new message-VPN
-The first task is to create a new message-VPN with a name. Consulting the Solace documentation by following above [Message-VPN](https://docs.solace.com/Configuring-and-Managing/Configuring-VPNs.htm) link, we determine that it shall be configured for basic internal authentication, have storage size increased for persistent message queues from default 0 and have it enabled. Tip: the [PubSub+ Manager](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm) GUI tool can be used to show the default values for new created objects.
+The first task is to create a new message-VPN with a name. Consulting the Solace documentation by following above [Message-VPN](https://docs.solace.com/Configuring-and-Managing/Configuring-VPNs.htm) link, we determine that it shall be configured for basic internal authentication, have storage size increased for persistent message queues from default 0 and have it enabled. Tip: the [Broker Manager](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm) GUI tool can be used to show the default values for new created objects.
To understand how to implement this, let’s consult the [SEMP online API documentation](https://docs.solace.com/SEMP/SEMP-API-Ref.htm):
- scrolling down to msgVPN and opening the `List Operations` link will show the color-coded options for all available operations. Clicking on `POST /msgVpns - Creates a Message VPN object` will open up the details. Scrolling down to `MsgVpn {`, here we can find the names of the attributes and we can derive the setter/getter Java method names. For example we look up the attribute `MaxMsgSpoolUsage` and derive the setter method to be `setMaxMsgSpoolUsage(int)`.
diff --git a/src/pages/tutorials/semp/messagevpn-with-queue-python.md b/src/pages/tutorials/semp/messagevpn-with-queue-python.md
index b9b26450..2ae07189 100644
--- a/src/pages/tutorials/semp/messagevpn-with-queue-python.md
+++ b/src/pages/tutorials/semp/messagevpn-with-queue-python.md
@@ -85,7 +85,7 @@ self.api_instance = semp_client.MsgVpnApi()
### Create a new message-VPN
-The first task is to create a new message-VPN with a name. Consulting the Solace documentation by following above [Message-VPN](https://docs.solace.com/Configuring-and-Managing/Configuring-VPNs.htm) link, we determine that it shall be configured for basic internal authentication, have the storage size increased for persistent message queues from default 0 and have it enabled. Tip: the [PubSub+ Manager](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm) GUI tool can be used to show the default values for new created objects.
+The first task is to create a new message-VPN with a name. Consulting the Solace documentation by following above [Message-VPN](https://docs.solace.com/Configuring-and-Managing/Configuring-VPNs.htm) link, we determine that it shall be configured for basic internal authentication, have the storage size increased for persistent message queues from default 0 and have it enabled. Tip: the [Broker Manager](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm) GUI tool can be used to show the default values for new created objects.
To understand how to implement this, let’s consult the [SEMP online API documentation](https://docs.solace.com/SEMP/SEMP-API-Ref.htm):
- scrolling down to msgVPN and opening the `List Operations` link will show the color-coded options for all available operations. Clicking on `POST /msgVpns - Creates a Message VPN object` will open up the details. Scrolling down to `MsgVpn {`, here we can find the names of the attributes and we can derive the Python instance variable names using the rule: lowercase with words separated by underscores. For example, we look up the attribute `maxMsgSpoolUsage (integer)` and determine the instance variable name to be `max_msg_spool_usage`.
diff --git a/src/pages/tutorials/semp/messagevpn-with-queue-ruby.md b/src/pages/tutorials/semp/messagevpn-with-queue-ruby.md
index 3f878460..473a152b 100644
--- a/src/pages/tutorials/semp/messagevpn-with-queue-ruby.md
+++ b/src/pages/tutorials/semp/messagevpn-with-queue-ruby.md
@@ -90,7 +90,7 @@ end
### Create a new message-VPN
-The first task is to create a new message-VPN with a name. Consulting the Solace documentation by following above [Message-VPN](https://docs.solace.com/Configuring-and-Managing/Configuring-VPNs.htm) link, we determine that it shall be configured for basic internal authentication, have the storage size increased for persistent message queues from default 0 and have it enabled. Tip: the [PubSub+ Manager](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm) GUI tool can be used to show the default values for new created objects.
+The first task is to create a new message-VPN with a name. Consulting the Solace documentation by following above [Message-VPN](https://docs.solace.com/Configuring-and-Managing/Configuring-VPNs.htm) link, we determine that it shall be configured for basic internal authentication, have the storage size increased for persistent message queues from default 0 and have it enabled. Tip: the [Broker Manager](https://docs.solace.com/Broker-Manager/PubSub-Manager-Overview.htm) GUI tool can be used to show the default values for new created objects.
To understand how to implement this, let’s consult the [SEMP online API documentation](https://docs.solace.com/SEMP/SEMP-API-Ref.htm):
- scrolling down to msgVPN and opening the `List Operations` link will show the color-coded options for all available operations. Clicking on `POST /msgVpns - Creates a Message VPN object` will open up the details. Scrolling down to `MsgVpn {`, here we can find the names of the attributes and we can derive the Ruby instance variable names using the rule: lowercase with words separated by underscores. For example, we look up the attribute `maxMsgSpoolUsage (integer)` and determine the instance variable name to be `max_msg_spool_usage`. Additionally, you can explore the SEMP Ruby Client Library specific documentation included in the `solace-sample-semp/ruby/docs` folder once you build the ruby project.
diff --git a/src/pages/tutorials/semp/tutorials.yml b/src/pages/tutorials/semp/tutorials.yml
index d192719a..3b54c7cf 100644
--- a/src/pages/tutorials/semp/tutorials.yml
+++ b/src/pages/tutorials/semp/tutorials.yml
@@ -1,5 +1,5 @@
- title: SEMP Tutorials
- summary: SEMP is a RESTful management API for configuring and administrating your Solace PubSub+ event broker.
+ summary: SEMP is a RESTful management API for configuring and administrating your Solace Event Broker.
icon: semp.svg
buttons:
doclink: https://docs.solace.com/SEMP/Using-SEMP.htm#mc-main-content
diff --git a/src/pages/tutorials/spring/spring-boot-autoconfigure.md b/src/pages/tutorials/spring/spring-boot-autoconfigure.md
index 2a62db54..cca0cade 100644
--- a/src/pages/tutorials/spring/spring-boot-autoconfigure.md
+++ b/src/pages/tutorials/spring/spring-boot-autoconfigure.md
@@ -57,7 +57,7 @@ In order for us to run our sender/receiver we need to first create the Queue tha
We will be creating a queue named "SpringTestQueue".
* If using Solace Cloud, create the queue by following these instructions: [Create Queue](https://solace.com/cloud-learning/group_getting_started/ggs_queue.html)
-* If using a local docker instance login to the PubSub+ Manager at localhost:8080/#/login. Once logged in choose your message VPN, click "Queues" on the left, and click the "+Queue" button on the top right to create your queue.
+* If using a local docker instance login to the Broker Manager at localhost:8080/#/login. Once logged in choose your message VPN, click "Queues" on the left, and click the "+Queue" button on the top right to create your queue.
* If using an appliance, ask your administrator to create the queue for you.
* You can also create a queue from the CLI. [Learn how to login to the cli here](https://docs.solace.com/Solace-CLI/Using-Solace-CLI.htm)
@@ -119,7 +119,7 @@ Sample code [is here](https://github.com/SolaceSamples/solace-samples-spring/tre
### SpringBootReceiver.java
Open a new console/terminal if needed.
Open the SpringBootReceiver.java file in the "spring-boot-autoconfig-receiver" project.
-This class shows how simple it is to create a Spring Boot app that receives events from a PubSub+ queue.
+This class shows how simple it is to create a Spring Boot app that receives events from a Solace queue.
The class will setup a JmsListener on the "SpringTestQueue" which should already be created.
A few things to take note of:
@@ -184,7 +184,7 @@ Sample code [is here](https://github.com/SolaceSamples/solace-samples-spring/tre
### SpringBootSender.java
Open a new console/terminal if needed.
Open the SpringBootSender.java file in the "spring-boot-autoconfig-sender" project.
-This class shows how simple it is to create a Spring Boot app that sends events to a PubSub+ queue.
+This class shows how simple it is to create a Spring Boot app that sends events to a Solace queue.
The class will send an event every 5 seconds
A few things to take note of:
diff --git a/src/pages/tutorials/spring/spring-cloud-stream.md b/src/pages/tutorials/spring/spring-cloud-stream.md
index 5299bacb..b60d14bd 100644
--- a/src/pages/tutorials/spring/spring-cloud-stream.md
+++ b/src/pages/tutorials/spring/spring-cloud-stream.md
@@ -15,7 +15,7 @@ links:
visible: true
---
-This tutorial will introduce you to the fundamentals of using Spring Cloud Stream with the Solace PubSub+ Binder. You will create a Source (sending app), a Sink (receiving app), and a Processor (combination of a source & a sink). The apps will exchange events using a PubSub+ Event Broker
+This tutorial will introduce you to the fundamentals of using Spring Cloud Stream with the Solace PubSub+ Binder. You will create a Source (sending app), a Sink (receiving app), and a Processor (combination of a source & a sink). The apps will exchange events using a Solace Event Broker
For more Spring Cloud Stream Tutorials checkout these codelabs:
* [Spring Cloud Stream - Basics](https://codelabs.solace.dev/codelabs/spring-cloud-stream-basics/#0)
diff --git a/src/pages/tutorials/tanzu/java-app.md b/src/pages/tutorials/tanzu/java-app.md
index 8bf280f6..0c5013b0 100644
--- a/src/pages/tutorials/tanzu/java-app.md
+++ b/src/pages/tutorials/tanzu/java-app.md
@@ -10,18 +10,18 @@ links:
## Overview
-This tutorial is part of a series of tutorials which aims to introduce users to Solace PubSub+ in Pivotal Cloud Foundry. Solace PubSub+ in Pivotal Cloud Foundry is delivered as a Tile on the [Pivotal Network](https://network.pivotal.io/). You can see the [Solace PubSub+ for Pivotal Cloud Foundry Documentation](https://docs.pivotal.io/solace-messaging) for full details.
+This tutorial is part of a series of tutorials which aims to introduce users to Solace PubSub+ in Pivotal Cloud Foundry. Solace PubSub+ in Pivotal Cloud Foundry is delivered as a Tile on the [Pivotal Network](https://network.pivotal.io/). You can see the [Solace for Pivotal Cloud Foundry Documentation](https://docs.pivotal.io/solace-messaging) for full details.
-This tutorial will introduce you to Solace PubSub+ for Pivotal Cloud Foundry by creating a Java application which connects to a Solace PubSub+ service instance.
+This tutorial will introduce you to Solace for Pivotal Cloud Foundry by creating a Java application which connects to a Solace service instance.
## Goals
-The goal of this tutorial is to demonstrate extracting the information from the application's Cloud Foundry Service Bindings and connect to the Solace PubSub+ service instance. This tutorial will show you:
+The goal of this tutorial is to demonstrate extracting the information from the application's Cloud Foundry Service Bindings and connect to the Solace service instance. This tutorial will show you:
-1. How to extract the Solace PubSub+ service credentials from the Cloud Foundry environment.
-1. How to establish a connection to the Solace PubSub+ service.
+1. How to extract the Solace service credentials from the Cloud Foundry environment.
+1. How to establish a connection to the Solace service.
1. How to publish, subscribe and receive messages.
## Assumptions
@@ -32,11 +32,11 @@ This tutorial assumes the following:
* You are familiar with [Spring RESTful Web Services](https://spring.io/guides/gs/rest-service).
* You are familiar with [Cloud Foundry](https://www.cloudfoundry.org/).
* You have access to a running Pivotal Cloud Foundry environment.
-* Solace PubSub+ for PCF has been installed in your Pivotal Cloud Foundry environment.
+* Solace for PCF has been installed in your Pivotal Cloud Foundry environment.
## Obtaining the Solace API
-This tutorial depends on you having the Solace PubSub+ API for Java (JCSMP). Here are a few easy ways to get the Java API. The instructions in the [Building](#building) section assume you're using Gradle and pulling the jars from maven central. If your environment differs then adjust the build instructions appropriately.
+This tutorial depends on you having the Solace Messaging API for Java (JCSMP). Here are a few easy ways to get the Java API. The instructions in the [Building](#building) section assume you're using Gradle and pulling the jars from maven central. If your environment differs then adjust the build instructions appropriately.
### Get the API: Using Gradle
@@ -69,11 +69,11 @@ The sample application contains the following source files :
| Source File | Description |
| ---------------- | ----------- |
| Application.java | The Sprint Boot application class |
-| SolaceController.java | The Application's REST controller which provides an interface to subscribe, publish and receive messages. This class also implements the initialization procedure which connects the application to the Solace PubSub+ Service. |
+| SolaceController.java | The Application's REST controller which provides an interface to subscribe, publish and receive messages. This class also implements the initialization procedure which connects the application to the Solace Service. |
| SimpleMessage.java | This class wraps the information to be stored in a message |
| SimpleSubscription.java | This class wraps the information describing a topic subscription |
-This tutorial will only cover the source code in `SolaceController.java` as the other files do not contain logic related to establishing a connection to the Solace PubSub+ Service.
+This tutorial will only cover the source code in `SolaceController.java` as the other files do not contain logic related to establishing a connection to the Solace Service.
### Obtaining the Solace Credentials in the Application
@@ -103,7 +103,7 @@ The Pivotal Cloud Foundry environment exposes any bound Service Instances in a J
}
```
-You can see the full structure of the Solace PubSub+ `VCAP_SERVICES` in the [Solace PubSub+ for PCF documentation](https://docs.pivotal.io/solace-messaging/credentials.html).
+You can see the full structure of the Solace PubSub+ `VCAP_SERVICES` in the [Solace for PCF documentation](https://docs.pivotal.io/solace-messaging/credentials.html).
The sample starts by extracting the JSON document from this environment variable, logging its content and confirming it contains useful information. This is done in the `init()` method:
diff --git a/src/pages/tutorials/tanzu/spring-cloud-autoconf-java.md b/src/pages/tutorials/tanzu/spring-cloud-autoconf-java.md
index b1ec5e0c..e02820c1 100644
--- a/src/pages/tutorials/tanzu/spring-cloud-autoconf-java.md
+++ b/src/pages/tutorials/tanzu/spring-cloud-autoconf-java.md
@@ -12,20 +12,20 @@ links:
## Overview
-This tutorial is part of a series of tutorials which aims to introduce users to Solace PubSub+ in Pivotal Cloud Foundry. Solace PubSub+ in Pivotal Cloud Foundry is delivered as a Tile on the [Pivotal Network](https://network.pivotal.io/). You can see the [Solace PubSub+ for Pivotal Cloud Foundry Documentation](https://docs.pivotal.io/solace-messaging) for full details.
+This tutorial is part of a series of tutorials which aims to introduce users to Solace PubSub+ in Pivotal Cloud Foundry. Solace PubSub+ in Pivotal Cloud Foundry is delivered as a Tile on the [Pivotal Network](https://network.pivotal.io/). You can see the [Solace for Pivotal Cloud Foundry Documentation](https://docs.pivotal.io/solace-messaging) for full details.
-This tutorial is similar to the [Spring Cloud](../spring-cloud/) tutorial. Like the Spring Cloud tutorial, it will introduce you to Solace PubSub+ for Pivotal Cloud Foundry by creating a Java application. In contrast to the [Spring Cloud](), this application uses [solace-java-spring-boot](https://github.com/SolaceProducts/solace-spring-boot/tree/master/solace-spring-boot-starters/solace-java-spring-boot-starter) which using the Java CFEnv library and Spring Auto Configuration can auto inject a [SpringJCSMPFactory](https://github.com/SolaceProducts/solace-spring-boot/blob/master/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solacesystems/jcsmp/SpringJCSMPFactory.java) directly into your application.
+This tutorial is similar to the [Spring Cloud](../spring-cloud/) tutorial. Like the Spring Cloud tutorial, it will introduce you to Solace for Pivotal Cloud Foundry by creating a Java application. In contrast to the [Spring Cloud](), this application uses [solace-java-spring-boot](https://github.com/SolaceProducts/solace-spring-boot/tree/master/solace-spring-boot-starters/solace-java-spring-boot-starter) which using the Java CFEnv library and Spring Auto Configuration can auto inject a [SpringJCSMPFactory](https://github.com/SolaceProducts/solace-spring-boot/blob/master/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solacesystems/jcsmp/SpringJCSMPFactory.java) directly into your application.
## Goals
-The goal of this tutorial is to demonstrate auto injecting a [SpringJCSMPFactory](https://github.com/SolaceProducts/solace-spring-boot/blob/master/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solacesystems/jcsmp/SpringJCSMPFactory.java) based on the application's Cloud Foundry Service Bindings and connect to the Solace PubSub+ service instance. This tutorial will show you:
+The goal of this tutorial is to demonstrate auto injecting a [SpringJCSMPFactory](https://github.com/SolaceProducts/solace-spring-boot/blob/master/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solacesystems/jcsmp/SpringJCSMPFactory.java) based on the application's Cloud Foundry Service Bindings and connect to the Solace service instance. This tutorial will show you:
1. How to Autowire a [SpringJCSMPFactory](https://github.com/SolaceProducts/solace-spring-boot/blob/master/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solacesystems/jcsmp/SpringJCSMPFactory.java) into your application
1. How to Autowire the [SolaceServiceCredentials](https://github.com/SolaceProducts/solace-services-info/blob/master/src/main/java/com/solace/services/core/model/SolaceServiceCredentials.java) provided by the Cloud Foundry environment using Java CFEnv.
1. How to Autowire [SpringJCSMPFactoryCloudFactory](https://github.com/SolaceProducts/solace-spring-boot/blob/master/solace-spring-boot-autoconfigure/solace-java-spring-boot-autoconfigure/src/main/java/com/solacesystems/jcsmp/SpringJCSMPFactory.java) which you can use to access other Cloud Available Solace PubSub+ Instances and create other instances of SpringJCSMPFactory.
-1. How to establish a connection to the Solace PubSub+ service.
+1. How to establish a connection to the Solace service.
1. How to publish, subscribe and receive messages.
## Assumptions
@@ -36,11 +36,11 @@ This tutorial assumes the following:
* You are familiar with [Spring RESTful Web Services](https://spring.io/guides/gs/rest-service).
* You are familiar with [Cloud Foundry](https://www.cloudfoundry.org/).
* You have access to a running Pivotal Cloud Foundry environment.
-* Solace PubSub+ for PCF has been installed in your Pivotal Cloud Foundry environment.
+* Solace for PCF has been installed in your Pivotal Cloud Foundry environment.
## Obtaining the Solace API
-This tutorial depends on you having the Solace PubSub+ API for Java (JCSMP). Here are a few easy ways to get the Java API. The instructions in the [Building](#building) section assume you're using Gradle and pulling the jars from maven central. If your environment differs then adjust the build instructions appropriately.
+This tutorial depends on you having the Solace Messaging API for Java (JCSMP). Here are a few easy ways to get the Java API. The instructions in the [Building](#building) section assume you're using Gradle and pulling the jars from maven central. If your environment differs then adjust the build instructions appropriately.
### Get the API: Using Gradle
@@ -73,11 +73,11 @@ The sample application contains the following source files :
| Source File | Description |
| ---------------- | ----------- |
| Application.java | The Sprint Boot application class |
-| SolaceController.java | The Application's REST controller which provides an interface to subscribe, publish and receive messages. This class also implements the initialization procedure which connects the application to the Solace PubSub+ Service. |
+| SolaceController.java | The Application's REST controller which provides an interface to subscribe, publish and receive messages. This class also implements the initialization procedure which connects the application to the Solace Service. |
| SimpleMessage.java | This class wraps the information to be stored in a message |
| SimpleSubscription.java | This class wraps the information describing a topic subscription |
-This tutorial will only cover the source code in `SolaceController.java` and the necessary project dependencies as the other files do not contain logic related to establishing a connection to the Solace PubSub+ Service.
+This tutorial will only cover the source code in `SolaceController.java` and the necessary project dependencies as the other files do not contain logic related to establishing a connection to the Solace Service.
### Obtaining the Solace Credentials in the Application
@@ -107,20 +107,20 @@ The Pivotal Cloud Foundry environment exposes any bound Service Instances in a J
}
```
-You can see the full structure of the Solace PubSub+ `VCAP_SERVICES` in the [Solace PubSub+ for PCF documentation](https://docs.pivotal.io/solace-messaging/credentials.html).
+You can see the full structure of the Solace PubSub+ `VCAP_SERVICES` in the [Solace for PCF documentation](https://docs.pivotal.io/solace-messaging/credentials.html).
-This sample uses the [solace-java-spring-boot](https://github.com/SolaceProducts/solace-spring-boot/tree/master/solace-spring-boot-starters/solace-java-spring-boot-starter) which can auto detect and auto wire the available Solace PubSub+ Services from the Cloud Foundry environment into your application.
+This sample uses the [solace-java-spring-boot](https://github.com/SolaceProducts/solace-spring-boot/tree/master/solace-spring-boot-starters/solace-java-spring-boot-starter) which can auto detect and auto wire the available Solace Services from the Cloud Foundry environment into your application.
Spring provided `@Autowire` is used to access all auto configuration available beans which include an auto selected Factory.
```java
-// A JCSMP Factory for the auto selected Solace PubSub+ service,
+// A JCSMP Factory for the auto selected Solace service,
// This is used to create JCSMPSession(s)
// This is the only required bean to run this application.
@Autowired
private SpringJCSMPFactory solaceFactory;
-// The auto selected Solace PubSub+ service for the matching SpringJCSMPFactory,
+// The auto selected Solace service for the matching SpringJCSMPFactory,
// the relevant information provided by this bean have already been injected
// into the SpringJCSMPFactory
// This bean is for information only, it can be used to discover more about
@@ -131,27 +131,27 @@ SolaceServiceCredentials solaceServiceCredentials;
// A Factory of Factories
// Has the ability to create SpringJCSMPFactory(s) for any available
// SolaceServiceCredentials
-// Can be used in case there are multiple Solace PubSub+ Services to
+// Can be used in case there are multiple Solace Services to
// select from.
@Autowired
SpringJCSMPFactoryCloudFactory springJCSMPFactoryCloudFactory;
```
-The `init()` method retrieves and shows the autowired Solace PubSub+ Service Instance details as follows:
+The `init()` method retrieves and shows the autowired Solace Service Instance details as follows:
```java
logger.info(String.format("SpringJCSMPFactoryCloudFactory discovered %s solace-pubsub service(s)",
springJCSMPFactoryCloudFactory.getSolaceServiceCredentials().size()));
-// Log what Solace PubSub+ Services were discovered
+// Log what Solace Services were discovered
for (SolaceServiceCredentials discoveredSolaceMessagingService : springJCSMPFactoryCloudFactory.getSolaceServiceCredentials()) {
- logger.info(String.format("Discovered Solace PubSub+ service '%s': HighAvailability? ( %s ), Message VPN ( %s )",
+ logger.info(String.format("Discovered Solace service '%s': HighAvailability? ( %s ), Message VPN ( %s )",
discoveredSolaceMessagingService.getId(), discoveredSolaceMessagingService.isHA(),
discoveredSolaceMessagingService.getMsgVpnName()));
}
```
-### Connecting to the Solace PubSub+ Service
+### Connecting to the Solace Service
The `SpringJCSMPFactory solaceFactory` was already autowired, you can use it to connect the Solace Session in the conventional way as outlined in the [Publish/Subscribe tutorial](../../jcsmp/publish-subscribe/). Use the `solaceFactory` to create a `Session`:
@@ -258,7 +258,7 @@ cd solace-samples-cloudfoundry-java
## Cloud Foundry Setup
-The sample application specifies a dependency on a service instance named `solace-pubsub-sample-instance` in its manifiest (See `spring-cloud-autoconf/manifest.yml`). This must be an instance of the Solace PubSub+ Service which can be created with this command:
+The sample application specifies a dependency on a service instance named `solace-pubsub-sample-instance` in its manifiest (See `spring-cloud-autoconf/manifest.yml`). This must be an instance of the Solace Service which can be created with this command:
```
cf create-service solace-pubsub enterprise-shared solace-pubsub-sample-instance
diff --git a/src/pages/tutorials/tanzu/spring-cloud.md b/src/pages/tutorials/tanzu/spring-cloud.md
index ffb8743d..7bc37612 100644
--- a/src/pages/tutorials/tanzu/spring-cloud.md
+++ b/src/pages/tutorials/tanzu/spring-cloud.md
@@ -10,18 +10,18 @@ links:
## Overview
-This tutorial is part of a series of tutorials which aims to introduce users to Solace PubSub+ in Pivotal Cloud Foundry. Solace PubSub+ in Pivotal Cloud Foundry is delivered as a Tile on the [Pivotal Network](https://network.pivotal.io/). You can see the [Solace PubSub+ for Pivotal Cloud Foundry Documentation](https://docs.pivotal.io/solace-messaging) for full details.
+This tutorial is part of a series of tutorials which aims to introduce users to Solace PubSub+ in Pivotal Cloud Foundry. Solace PubSub+ in Pivotal Cloud Foundry is delivered as a Tile on the [Pivotal Network](https://network.pivotal.io/). You can see the [Solace for Pivotal Cloud Foundry Documentation](https://docs.pivotal.io/solace-messaging) for full details.
-This tutorial is similar to the [Java App](../java-app/) tutorial. Like the Java App tutorial, it will introduce you to Solace PubSub+ for Pivotal Cloud Foundry by creating a Java application. In contrast to the Java App, this application uses the Spring Cloud Connectors library to simplify the parsing of the `VCAP_SERVICES` environment variable.
+This tutorial is similar to the [Java App](../java-app/) tutorial. Like the Java App tutorial, it will introduce you to Solace for Pivotal Cloud Foundry by creating a Java application. In contrast to the Java App, this application uses the Spring Cloud Connectors library to simplify the parsing of the `VCAP_SERVICES` environment variable.
## Goals
-The goal of this tutorial is to demonstrate extracting the information from the application's Cloud Foundry Service Bindings and connect to the Solace PubSub+ service instance. This tutorial will show you:
+The goal of this tutorial is to demonstrate extracting the information from the application's Cloud Foundry Service Bindings and connect to the Solace service instance. This tutorial will show you:
-1. How to extract the Solace PubSub+ service credentials from the Cloud Foundry environment using Spring Cloud Connectors.
-1. How to establish a connection to the Solace PubSub+ service.
+1. How to extract the Solace service credentials from the Cloud Foundry environment using Spring Cloud Connectors.
+1. How to establish a connection to the Solace service.
1. How to publish, subscribe and receive messages.
## Assumptions
@@ -32,11 +32,11 @@ This tutorial assumes the following:
* You are familiar with [Spring RESTful Web Services](https://spring.io/guides/gs/rest-service).
* You are familiar with [Cloud Foundry](https://www.cloudfoundry.org/).
* You have access to a running Pivotal Cloud Foundry environment.
-* Solace PubSub+ for PCF has been installed in your Pivotal Cloud Foundry environment.
+* Solace for PCF has been installed in your Pivotal Cloud Foundry environment.
## Obtaining the Solace API
-This tutorial depends on you having the Solace PubSub+ API for Java (JCSMP). Here are a few easy ways to get the Java API. The instructions in the [Building](#building) section assume you're using Gradle and pulling the jars from maven central. If your environment differs then adjust the build instructions appropriately.
+This tutorial depends on you having the Solace Messaging API for Java (JCSMP). Here are a few easy ways to get the Java API. The instructions in the [Building](#building) section assume you're using Gradle and pulling the jars from maven central. If your environment differs then adjust the build instructions appropriately.
### Get the API: Using Gradle
@@ -69,11 +69,11 @@ The sample application contains the following source files :
| Source File | Description |
| ---------------- | ----------- |
| Application.java | The Sprint Boot application class |
-| SolaceController.java | The Application's REST controller which provides an interface to subscribe, publish and receive messages. This class also implements the initialization procedure which connects the application to the Solace PubSub+ Service. |
+| SolaceController.java | The Application's REST controller which provides an interface to subscribe, publish and receive messages. This class also implements the initialization procedure which connects the application to the Solace Service. |
| SimpleMessage.java | This class wraps the information to be stored in a message |
| SimpleSubscription.java | This class wraps the information describing a topic subscription |
-This tutorial will only cover the source code in `SolaceController.java` as the other files do not contain logic related to establishing a connection to the Solace PubSub+ Service.
+This tutorial will only cover the source code in `SolaceController.java` as the other files do not contain logic related to establishing a connection to the Solace Service.
### Obtaining the Solace Credentials in the Application
@@ -103,11 +103,11 @@ The Pivotal Cloud Foundry environment exposes any bound Service Instances in a J
}
```
-You can see the full structure of the Solace PubSub+ `VCAP_SERVICES` in the [Solace PubSub+ for PCF documentation](https://docs.pivotal.io/solace-messaging/credentials.html).
+You can see the full structure of the Solace PubSub+ `VCAP_SERVICES` in the [Solace for PCF documentation](https://docs.pivotal.io/solace-messaging/credentials.html).
This sample use the [Spring Cloud Connectors](https://cloud.spring.io/spring-cloud-connectors) project to retrieve the `VCAP_SERVICES` information in the form of a `ServiceInfo` object. For Solace PubSub+ in Cloud Foundry, there is a Spring Cloud Connectors extension in GitHub called [sl-spring-cloud-connectors](https://github.com/SolaceProducts/sl-spring-cloud-connectors). This library parses the `VCAP_SERVICES` environment variable and exposes the information by implementing the `ServiceInfo` interface in the `SolaceMessagingInfo` object.
-The `init()` method retrieves the Solace PubSub+ Service Instance details for the service named `solace-pubsub-sample-instance` as follows:
+The `init()` method retrieves the Solace Service Instance details for the service named `solace-pubsub-sample-instance` as follows:
```java
CloudFactory cloudFactory = new CloudFactory();
@@ -123,7 +123,7 @@ if (solaceServiceCredentials == null) {
}
```
-### Connecting to the Solace PubSub+ Service
+### Connecting to the Solace Service
Once you have the `SolaceServiceCredentials`, you can create and then connect the Solace Session in the conventional way as outlined in the [Publish/Subscribe tutorial](../../jcsmp/publish-subscribe/). You set the JCSMP properties and then use the `JCSMPFactory` to create a `Session`:
@@ -239,7 +239,7 @@ cd solace-samples-cloudfoundry-java
## Cloud Foundry Setup
-The sample application specifies a dependency on a service instance named `solace-pubsub-sample-instance` in its manifiest (See `spring-cloud/manifest.yml`). This must be an instance of the Solace PubSub+ Service which can be created with this command:
+The sample application specifies a dependency on a service instance named `solace-pubsub-sample-instance` in its manifiest (See `spring-cloud/manifest.yml`). This must be an instance of the Solace Service which can be created with this command:
```
cf create-service solace-pubsub enterprise-shared solace-pubsub-sample-instance