Skip to content

Commit

Permalink
Fixed references to Yahoo pages (apache#591)
Browse files Browse the repository at this point in the history
  • Loading branch information
merlimat authored Jul 24, 2017
1 parent 92610d1 commit 422a68f
Show file tree
Hide file tree
Showing 22 changed files with 86 additions and 81 deletions.
4 changes: 2 additions & 2 deletions pulsar-client-cpp/docs/MainPage.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The Pulsar C++ client

Welcome to the Doxygen documentation for [Pulsar](https://github.com/yahoo/pulsar).
Welcome to the Doxygen documentation for [Pulsar](https://pulsar.incubator.apache.org/).

## Supported platforms

Expand All @@ -23,7 +23,7 @@ You need to have the following installed to use the C++ client:
There are separate compilation instructions for [MacOS](#macos) and [Linux](#linux). For both systems, start by cloning the Pulsar repository:

```shell
$ git clone https://github.com/yahoo/pulsar
$ git clone https://github.com/apache/incubator-pulsar
```

### Linux
Expand Down
2 changes: 1 addition & 1 deletion site/_data/config/broker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -279,5 +279,5 @@ configs:
default: '60'
description: How often broker checks for inactive topics to be deleted (topics with no subscriptions and no one connected)
- name: loadManagerClassName
default: com.yahoo.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl
default: org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl
description: Name of load manager to use
2 changes: 1 addition & 1 deletion site/_includes/explanations/admin-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ You can find documentation for the REST API exposed by Pulsar {% popover brokers

### Java admin client

To use the Java admin API, instantiate a {% javadoc PulsarAdmin admin com.yahoo.pulsar.client.admin.PulsarAdmin %} object, specifying a URL for a Pulsar {% popover broker %} and a {% javadoc ClientConfiguration admin com.yahoo.pulsar.client.admin.ClientConfiguration %}. Here's a minimal example using `localhost`:
To use the Java admin API, instantiate a {% javadoc PulsarAdmin admin org.apache.pulsar.client.admin.PulsarAdmin %} object, specifying a URL for a Pulsar {% popover broker %} and a {% javadoc ClientConfiguration admin org.apache.pulsar.client.admin.ClientConfiguration %}. Here's a minimal example using `localhost`:

```java
URL url = new URL("http://localhost:8080");
Expand Down
2 changes: 1 addition & 1 deletion site/_includes/explanations/broker-admin.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Pulsar brokers consist of two components:

* The [`brokers`](../../reference/CliTools#pulsar-admin-brokers) command of the [`pulsar-admin`](../../reference/CliTools#pulsar-admin) tool
* The `/admin/brokers` endpoint of the admin [REST API](../../reference/RestApi)
* The `brokers` method of the {% javadoc PulsarAdmin admin com.yahoo.pulsar.client.admin.PulsarAdmin %} object in the [Java API](../../applications/JavaClient)
* The `brokers` method of the {% javadoc PulsarAdmin admin org.apache.pulsar.client.admin.PulsarAdmin %} object in the [Java API](../../applications/JavaClient)

In addition to being configurable when you start them up, brokers can also be [dynamically configured](#dynamic-broker-configuration).

Expand Down
2 changes: 1 addition & 1 deletion site/_includes/explanations/cluster-admin.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Clusters can be managed via:

* The [`clusters`](../../reference/CliTools#pulsar-admin-clusters) command of the [`pulsar-admin`](../../reference/CliTools#pulsar-admin) tool
* The `/admin/clusters` endpoint of the admin [REST API](../../reference/RestApi)
* The `clusters` method of the {% javadoc PulsarAdmin admin com.yahoo.pulsar.client.admin.PulsarAdmin %} object in the [Java API](../../applications/JavaClient)
* The `clusters` method of the {% javadoc PulsarAdmin admin org.apache.pulsar.client.admin.PulsarAdmin %} object in the [Java API](../../applications/JavaClient)

### Provision

Expand Down
20 changes: 10 additions & 10 deletions site/_includes/explanations/install-package.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% capture binary_release_url %}https://github.com/yahoo/pulsar/releases/download/v{{ site.current_version }}/pulsar-{{ site.current_version }}-bin.tar.gz{% endcapture %}
{% capture source_release_url %}https://github.com/yahoo/pulsar/releases/download/v{{ site.current_version }}/pulsar-{{ site.current_version }}-src.tar.gz{% endcapture %}
{% capture binary_release_url %}https://github.com/apache/incubator-pulsar/releases/download/v{{ site.current_version }}/pulsar-{{ site.current_version }}-bin.tar.gz{% endcapture %}
{% capture source_release_url %}https://github.com/apache/incubator-pulsar/releases/download/v{{ site.current_version }}/pulsar-{{ site.current_version }}-src.tar.gz{% endcapture %}

## System requirements

Expand All @@ -15,7 +15,7 @@ To get started running Pulsar, download a binary tarball release in one of the f
<a href="{{ binary_release_url }}" class="download-btn btn btn-lg" role="button" aria-pressed="true">Pulsar {{ site.current_version }} binary release</a>

* from the Pulsar [downloads page](/download)
* from the Pulsar [releases page](https://github.com/yahoo/pulsar/releases/latest)
* from the Pulsar [releases page](https://github.com/apache/incubator-pulsar/releases/latest)
* using [wget](https://www.gnu.org/software/wget):

```shell
Expand All @@ -40,10 +40,10 @@ $ cd pulsar-{{ site.latest }}

## What your package contains

Directory | Contains
:---------|:--------
`bin` | Pulsar's [command-line tools](../../reference/CliTools), such as [`pulsar`](../../reference/CliTools#pulsar) and [`pulsar-admin`](../../reference/CliTools#pulsar-admin)
`conf` | Configuration files for Pulsar, including for [broker configuration](../../reference/Configuration#broker), [ZooKeeper configuration](../../reference/Configuration#zookeeper), and more
`data` | The data storage directory used by {% popover ZooKeeper %} and {% popover BookKeeper %}.
`lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar.
`logs` | Logs created by the installation.
| Directory | Contains |
|:----------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `bin` | Pulsar's [command-line tools](../../reference/CliTools), such as [`pulsar`](../../reference/CliTools#pulsar) and [`pulsar-admin`](../../reference/CliTools#pulsar-admin) |
| `conf` | Configuration files for Pulsar, including for [broker configuration](../../reference/Configuration#broker), [ZooKeeper configuration](../../reference/Configuration#zookeeper), and more |
| `data` | The data storage directory used by {% popover ZooKeeper %} and {% popover BookKeeper %}. |
| `lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar. |
| `logs` | Logs created by the installation. |
2 changes: 1 addition & 1 deletion site/_includes/explanations/namespace-admin.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Namespaces can be managed via:

* The [`namespaces`](../../reference/CliTools#pulsar-admin-clusters) command of the [`pulsar-admin`](../../reference/CliTools#pulsar-admin) tool
* The `/admin/namespaces` endpoint of the admin [REST API](../../reference/RestApi)
* The `namespaces` method of the {% javadoc PulsarAdmin admin com.yahoo.pulsar.client.admin.PulsarAdmin %} object in the [Java API](../../applications/JavaClient)
* The `namespaces` method of the {% javadoc PulsarAdmin admin org.apache.pulsar.client.admin.PulsarAdmin %} object in the [Java API](../../applications/JavaClient)

### Create

Expand Down
12 changes: 6 additions & 6 deletions site/_includes/explanations/partitioned-topics.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ The diagram below illustrates this:

With partitioned topics, the *routing mode* determines which partition---that is, which internal topic---a message will be published to. There are three routing modes available by default:

Mode | Description | Ordering guarantee
:----|:------------|:------------------
Key hash | If a key property has been specified on the message, the partitioned producer will hash the key and assign it to a particular partition. | Per-key-bucket ordering
Single default partition | If no message is provided, each producer's message will be routed to a dedicated partition, initially random selected | Per-producer ordering
Round robin distribution | If no message is provided, all messages will be routed to different partitions in round-robin fashion to achieve maximum throughput. | None
| Mode | Description | Ordering guarantee |
|:-------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------|:------------------------|
| Key hash | If a key property has been specified on the message, the partitioned producer will hash the key and assign it to a particular partition. | Per-key-bucket ordering |
| Single default partition | If no message is provided, each producer's message will be routed to a dedicated partition, initially random selected | Per-producer ordering |
| Round robin distribution | If no message is provided, all messages will be routed to different partitions in round-robin fashion to achieve maximum throughput. | None |

In addition to these default modes, you can also create a custom routing mode if you're using the [Java client](../../applications/JavaClient) by implementing the {% javadoc MessageRouter client com.yahoo.pulsar.client.api.MessageRouter %} interface.
In addition to these default modes, you can also create a custom routing mode if you're using the [Java client](../../applications/JavaClient) by implementing the {% javadoc MessageRouter client org.apache.pulsar.client.api.MessageRouter %} interface.
6 changes: 3 additions & 3 deletions site/api/cpp/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

<!-- iframe showing the search results (closed by default) -->
<div id="MSearchResultsWindow">
<iframe src="javascript:void(0)" frameborder="0"
<iframe src="javascript:void(0)" frameborder="0"
name="MSearchResults" id="MSearchResults">
</iframe>
</div>
Expand All @@ -62,7 +62,7 @@
<div class="title">The Pulsar C++ client </div> </div>
</div><!--header-->
<div class="contents">
<div class="textblock"><p>Welcome to the Doxygen documentation for <a href="https://github.com/yahoo/pulsar">Pulsar</a>.</p>
<div class="textblock"><p>Welcome to the Doxygen documentation for <a href="https://github.com/apache/incubator-pulsar">Pulsar</a>.</p>
<h2>Supported platforms</h2>
<p>The Pulsar C++ client has been successfully tested on <b>MacOS</b> and <b>Linux</b>.</p>
<h2>System requirements</h2>
Expand All @@ -78,7 +78,7 @@ <h2>System requirements</h2>
</ul>
<h2>Compilation</h2>
<p>There are separate compilation instructions for <a href="#macos">MacOS</a> and <a href="#linux">Linux</a>. For both systems, start by cloning the Pulsar repository:</p>
<div class="fragment"><div class="line">$ git clone https://github.com/yahoo/pulsar</div></div><!-- fragment --><h3>Linux</h3>
<div class="fragment"><div class="line">$ git clone https://github.com/apache/incubator-pulsar</div></div><!-- fragment --><h3>Linux</h3>
<p>First, install all of the necessary dependencies:</p>
<div class="fragment"><div class="line">$ apt-get install cmake libssl-dev libcurl4-openssl-dev liblog4cxx-dev \</div><div class="line"> libprotobuf-dev libboost-all-dev libgtest-dev libjsoncpp-dev</div></div><!-- fragment --><p>Then compile and install <a href="https://github.com/google/googletest">Google Test</a>:</p>
<div class="fragment"><div class="line">$ git clone https://github.com/google/googletest.git &amp;&amp; cd googletest</div><div class="line">$ sudo cmake .</div><div class="line">$ sudo make</div><div class="line">$ sudo cp *.a /usr/lib</div></div><!-- fragment --><p>Finally, compile the Pulsar client library for C++ inside the Pulsar repo:</p>
Expand Down
8 changes: 4 additions & 4 deletions site/docs/latest/admin/Authz.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ tlsTrustCertsFilePath=/path/to/cacert.pem
# Enable the TLS auth provider
authenticationEnabled=true
authorizationEnabled=true
authenticationProviders=com.yahoo.pulsar.broker.authentication.AuthenticationProviderTls
authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
```

{% include message.html id="broker_conf_doc" %}
Expand Down Expand Up @@ -136,7 +136,7 @@ You'll need to add the following authentication parameters to that file to use T

```properties
serviceUrl=https://broker.example.com:8443/
authPlugin=com.yahoo.pulsar.client.impl.auth.AuthenticationTls
authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls
authParams=tlsCertFile:/path/to/client-cert.pem,tlsKeyFile:/path/to/client-key.pem
useTls=true
tlsAllowInsecureConnection=false
Expand Down Expand Up @@ -187,7 +187,7 @@ In the `conf/broker.conf` configuration file in your Pulsar installation, you ne
# Add the Athenz auth provider
authenticationEnabled=true
authorizationEnabled=true
authenticationProviders=com.yahoo.pulsar.broker.authentication.AuthenticationProviderAthenz
authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
athenzDomainNames=pulsar

# Enable TLS
Expand Down Expand Up @@ -215,7 +215,7 @@ You’ll need to add the following authentication parameters to that file to use
serviceUrl=https://broker.example.com:8443/

# Set Athenz auth plugin and its parameters
authPlugin=com.yahoo.pulsar.client.impl.auth.AuthenticationAthenz
authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
authParams=tenantDomain:shopping,tenantService:some_app,providerDomain:pulsar,privateKeyPath:/path/to/private.pem,keyId:v1

# Enable TLS
Expand Down
2 changes: 1 addition & 1 deletion site/docs/latest/admin/GeoReplication.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Once you've created a global namespace, any topics that producers or consumers c

By default, messages are replicated to all clusters configured for the namespace. You can restrict replication selectively by specifying a replication list for a message. That message will then be replicated only to the subset in the replication list.

Below is an example for the [Java API](../../applications/JavaClient). Note the use of the `setReplicationClusters` method when constructing the {% javadoc Message client com.yahoo.pulsar.client.api.Message %} object:
Below is an example for the [Java API](../../applications/JavaClient). Note the use of the `setReplicationClusters` method when constructing the {% javadoc Message client org.apache.pulsar.client.api.Message %} object:

```java
List<String> restrictReplicationTo = new ArrayList<>;
Expand Down
Loading

0 comments on commit 422a68f

Please sign in to comment.