Merge branch 'master' into branch-0.1.0

Author: tuteng

CONTRIBUTING.md

@@ -17,7 +17,7 @@ Node 10.15 | https://nodejs.org/en/
 
 ### Fork pulsar-manager repository
 
-Fork the [pulsar-manager](https://github.com/streamnative/pulsar-manager) repository to your GitHub repository.
+Fork the [pulsar-manager](https://github.com/apache/pulsar-manager) repository to your GitHub repository.
 
 ### Install pulsar-manager dependency 
 
@@ -62,14 +62,14 @@ Follow the instructions [here](https://howtodoinjava.com/automation/lombok-eclip
 1. Add a remote repository.
 
     ```bash
-    $ git remote add streamnative [email protected]:streamnative/pulsar-manager.git
+    $ git remote add apache [email protected]:apache/pulsar-manager.git
     ```
 
 2. Sync you local repository with the remote repository.
 
     ```bash
     $ git checkout master
-    $ git pull streamnative master
+    $ git pull apache master
     ```
 
 3. Create your PR and commit code changes.

README.md

@@ -1,7 +1,5 @@
 # Apache Pulsar manager
 
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fstreamnative%2Fpulsar-manager.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fstreamnative%2Fpulsar-manager?ref=badge_shield)
-
 Apache Pulsar manager is a web-based GUI management tool for managing and monitoring Pulsar.
 
 ## Feature
@@ -67,7 +65,7 @@ The pulsar-manager can monitor topics and subscriptions.
 
 
 ## Prerequisites
-* Java 8 or later
+* Java JDK 1.8
 * Node 10.15.3 or later
 * Npm 6.4.1 or later
 * Pulsar 2.4.0 or later
@@ -92,17 +90,17 @@ The pulsar-manager can monitor topics and subscriptions.
             
         * `REDIRECT_PORT`: the port of the front-end server.
 
-        * `DRIVER_CLASS_NAME`: the driver class name of MySQL.
+        * `DRIVER_CLASS_NAME`: the driver class name of PostgreSQL.
 
-        * `URL`: the url of MySQL jdbc, example: jdbc:mysql://localhost:3306/pulsar_manager?useSSL=false
+        * `URL`: the url of PostgreSQL jdbc, example: jdbc:postgresql://127.0.0.1:5432/pulsar_manager
 
-        * `USERNAME`: the username of MySQL
+        * `USERNAME`: the username of PostgreSQL
 
-        * `PASSWORD`: the password of MySQL
+        * `PASSWORD`: the password of PostgreSQL
 
         ```
-        docker pull streamnative/pulsar-manager
-        docker run -it -p 9527:9527 -e REDIRECT_HOST=front-end-ip -e REDIRECT_PORT=front-end-port -e DRIVER_CLASS_NAME=com.mysql.jdbc.Driver -e URL='jdbc-url' -e USERNAME=root -e PASSWORD=pulsar pulsar-manager /bin/sh
+        docker pull apache/pulsar-manager
+        docker run -it -p 9527:9527 -e REDIRECT_HOST=front-end-ip -e REDIRECT_PORT=front-end-port -e DRIVER_CLASS_NAME=org.postgresql.Driver -e URL='jdbc-url' -e USERNAME=root -e PASSWORD=pulsar pulsar-manager /bin/sh
         ```
 
         This is an example:
@@ -116,14 +114,16 @@ The pulsar-manager can monitor topics and subscriptions.
         (1) Download the source code.
 
         ```
-        git clone https://github.com/streamnative/pulsar-manager
+        git clone https://github.com/apache/pulsar-manager
         ```
 
         (2) Build and start the backend.
         ```
         cd pulsar-manager
         ./gradlew build -x test
-        java -jar ./build/libs/pulsar-manager.jar
+        cd build/distributions
+        unzip pulsar-manager.zip or tar -zxvf pulsar-manager.tar
+        ./pulsar-manager/bin/pulsar-manager
         ```
 
         (3) Build and start the front end.
@@ -150,7 +150,7 @@ Pulsar Manager bundles JDBC Drivers for [HerdDB](https://github.com/diennea/herd
 The default confguration starts and embedded in-memory only HerdDB database.
 
 HerdDB can be used in production, you just have to use the  correct JDBC URL.
-Follow the instructions in [application.properties](https://github.com/streamnative/pulsar-manager/blob/master/src/main/resources/application.properties) to switch the connection to a standalone HerdDB service or cluster.
+Follow the instructions in [application.properties](https://github.com/apache/pulsar-manager/blob/master/src/main/resources/application.properties) to switch the connection to a standalone HerdDB service or cluster.
 
 The JDBC URL will look like this:
 jdbc:herddb:server:localhost:7000
@@ -164,14 +164,10 @@ In order to start and setup an HerdDB database follow the instructions on the [H
 
 ## Back end
 
-For more information about the back end, see [pulsar-manager-backend](https://github.com/streamnative/pulsar-manager/blob/master/src/README.md).
+For more information about the back end, see [pulsar-manager-backend](https://github.com/apache/pulsar-manager/blob/master/src/README.md).
 
 
 ## Front end
 
-For more information about the front end, see [pulsar-manager-frontend](https://github.com/streamnative/pulsar-manager/blob/master/front-end/README.md).
-
-
+For more information about the front end, see [pulsar-manager-frontend](https://github.com/apache/pulsar-manager/blob/master/front-end/README.md).
 
-## License
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fstreamnative%2Fpulsar-manager.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fstreamnative%2Fpulsar-manager?ref=badge_large)

docker/Dockerfile

@@ -24,10 +24,10 @@ ARG VERSION
 LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.name="Apache Pulsar Manager" \
       org.label-schema.description="An Apache Pulsar Manager for management Pulsar clusters" \
-      org.label-schema.url="https://github.com/streamnative/pulsar-manager" \
+      org.label-schema.url="https://github.com/apache/pulsar-manager" \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/streamnative/pulsar-manager" \
-      org.label-schema.vendor="StreamNative Limited" \
+      org.label-schema.vcs-url="https://github.com/apache/pulsar-manager" \
+      org.label-schema.vendor="Apache Software Foundation" \
       org.label-schema.version=$VERSION \
       org.label-schema.schema-version="1.0"
 
@@ -43,7 +43,9 @@ RUN mkdir -p /run/nginx
 
 WORKDIR /pulsar-manager
 
-COPY build/libs/*.jar pulsar-manager.jar
+COPY build/distributions/pulsar-manager.tar .
+
+RUN tar -zxvf pulsar-manager.tar
 
 COPY docker/supervisord.conf /etc/
 

docker/supervisord.conf

@@ -28,5 +28,5 @@ minfds=1024
 minprocs=200
 
 [program:pulsar-manager-backend]
-command = /usr/bin/java -jar /pulsar-manager/pulsar-manager.jar  --redirect.host=%(ENV_REDIRECT_HOST)s --redirect.port=%(ENV_REDIRECT_PORT)s --spring.datasource.driver-class-name=%(ENV_DRIVER_CLASS_NAME)s --spring.datasource.url=%(ENV_URL)s --spring.datasource.username=%(ENV_USERNAME)s --spring.datasource.password=%(ENV_PASSWORD)s --spring.datasource.initialization-mode=never
+command = /pulsar-manager/pulsar-manager/bin/pulsar-manager  --redirect.host=%(ENV_REDIRECT_HOST)s --redirect.port=%(ENV_REDIRECT_PORT)s --spring.datasource.driver-class-name=%(ENV_DRIVER_CLASS_NAME)s --spring.datasource.url=%(ENV_URL)s --spring.datasource.username=%(ENV_USERNAME)s --spring.datasource.password=%(ENV_PASSWORD)s --spring.datasource.initialization-mode=never
 user = root 

docs/developer-guide.md

@@ -20,8 +20,8 @@ The code structure of the backend is shown below.
 
 ![backend-code](img/pulsar-manager-backend-code.png)
 
-* The backend configuration file is [here](https://github.com/streamnative/pulsar-manager/blob/master/src/main/resources/application.properties).
-* The database schema is defined [here](https://github.com/streamnative/pulsar-manager/blob/master/src/main/resources/META-INF/sql/mysql-schema.sql)
+* The backend configuration file is [here](https://github.com/apache/pulsar-manager/blob/master/src/main/resources/application.properties).
+* The database schema is defined [here](https://github.com/apache/pulsar-manager/blob/master/src/main/resources/META-INF/sql/mysql-schema.sql)
 
 ### Add new RESTful API
 
@@ -74,7 +74,7 @@ In the following class you can add some description information, error response,
 ## Frontend
 
 The frontend is developed based on [vue-element-admi](https://panjiachen.github.io/vue-element-admin-site/guide/) and [Element](https://element.eleme.cn/#/en-US).
-The development of the frontend is [here](https://github.com/streamnative/pulsar-manager/tree/master/front-end/src/views/management).
+The development of the frontend is [here](https://github.com/apache/pulsar-manager/tree/master/front-end/src/views/management).
 
 ![frontend-code](img/frontend-code.png)
 
@@ -95,8 +95,8 @@ The RESTful interface is defined in the `api` folder.
 
 2. Add a new page.
 
-Add a new page [here](https://github.com/streamnative/pulsar-manager/tree/master/front-end/src/views/management). 
-For example, [this](https://github.com/streamnative/pulsar-manager/blob/master/front-end/src/views/management/tenants/index.vue) is a tenant page. )
+Add a new page [here](https://github.com/apache/pulsar-manager/tree/master/front-end/src/views/management). 
+For example, [this](https://github.com/apache/pulsar-manager/blob/master/front-end/src/views/management/tenants/index.vue) is a tenant page. )
 
 3. Localization
 

front-end/README.md

@@ -7,7 +7,7 @@
 The pulsar-manager is tested with Chrome browser.
 
 ### Set cross domain
-Add [proxyTable](https://github.com/streamnative/pulsar-manager/blob/master/front-end/config/index.js).
+Add [proxyTable](https://github.com/apache/pulsar-manager/blob/master/front-end/config/index.js).
 For localhost debug
 ```bash
     proxyTable: {
@@ -28,7 +28,7 @@ For localhost debug
 
 ## Deploy production environment
 
-* Add the following parameters to the Nginx server configuration file [prod.env.js](https://github.com/streamnative/pulsar-manager/blob/master/front-end/config/prod.env.js).
+* Add the following parameters to the Nginx server configuration file [prod.env.js](https://github.com/apache/pulsar-manager/blob/master/front-end/config/prod.env.js).
 ```
 module.exports = {
   NODE_ENV: '"production"',

front-end/package.json

@@ -28,10 +28,10 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/streamnative/pulsar-manager.git"
+    "url": "git+https://github.com/apache/pulsar-manager.git"
   },
   "bugs": {
-    "url": "https://github.com/streamnative/pulsar-manager/issues"
+    "url": "https://github.com/apache/pulsar-manager/issues"
   },
   "dependencies": {
     "axios": "0.18.1",

src/README.md

@@ -21,16 +21,16 @@ Pulsar manager backend is a supplement and improvement to Pulsar broker.
 ### How to set parameters when starting back-end services
 
 ```
-java -jar ./build/libs/pulsar-manager.jar --redirect.host=http://localhost --redirect.port=9527 insert.stats.interval=600000
+./build/distributions/pulsar-manager/bin/pulsar-manager --redirect.host=http://localhost --redirect.port=9527 insert.stats.interval=600000
 ```
 
 ### Use custom databases
 
 If you have a large amount of data, you can use a custom database. The following is an example of PostgreSQL.   
 
-1. Initialize database and table structures using [file](https://github.com/streamnative/pulsar-manager/tree/master/src/main/resources/META-INF/sql/postgresql-schema.sql).
+1. Initialize database and table structures using [file](https://github.com/apache/pulsar-manager/tree/master/src/main/resources/META-INF/sql/postgresql-schema.sql).
 
-2. Modify the [configuration file](https://github.com/streamnative/pulsar-manager/blob/master/src/main/resources/application.properties) and add PostgreSQL configuration
+2. Modify the [configuration file](https://github.com/apache/pulsar-manager/blob/master/src/main/resources/application.properties) and add PostgreSQL configuration
 
 ```
 spring.datasource.driver-class-name=org.postgresql.Driver
@@ -60,7 +60,7 @@ For more information, see [Apache Pulsar](http://pulsar.apache.org/docs/en/secur
 * Method 1: Use command-line tool
 
 ```
-java -jar ./build/libs/pulsar-manager.jar --redirect.host=http://localhost --redirect.port=9527 insert.stats.interval=600000 --backend.jwt.token=token --jwt.broker.token.mode=PRIVATE --jwt.broker.private.key=file:///path/broker-private.key --jwt.broker.public.key=file:///path/broker-public.key
+./build/distributions/pulsar-manager/bin/pulsar-manager --redirect.host=http://localhost --redirect.port=9527 insert.stats.interval=600000 --backend.jwt.token=token --jwt.broker.token.mode=PRIVATE --jwt.broker.private.key=file:///path/broker-private.key --jwt.broker.public.key=file:///path/broker-public.key
 ```
 
 * Method 2. Configure the application.properties file