Skip to content

Commit

Permalink
Merge pull request ballerina-platform#108 from Thimuth/sync_prod
Browse files Browse the repository at this point in the history 
Sync prod
  • Loading branch information
@Samallama
Samallama committed Feb 13, 2020
2 parents 9362d15 + 33bb0e4 commit d687a93
Show file tree
Hide file tree
Showing 11 changed files with 309 additions and 70 deletions.
2 changes: 1 addition & 1 deletion _config.yml
View file
Expand Up @@ -36,7 +36,7 @@ breadcrumbs:
image: false # Show image or title text
github_username: ballerina-platform
git_repo: ballerina-platform.github.io

latest_version: v1-1
# Exclude from processing.
# The following items will not be processed, by default. Create a custom list
# to override the default setting.
Expand Down
52 changes: 30 additions & 22 deletions code-of-conduct.md
View file
@@ -1,7 +1,7 @@
---
layout: ballerina-inner-page
title: The Ballerina Code of Conduct
permalink: /code-of-conduct/
permalink: /code-of-conduct
---

# Contributor Covenant Code of Conduct
Expand Down Expand Up @@ -54,48 +54,56 @@ Project/Community leaders will follow the below Community Impact Guidelines in d

**1. Correction**

<table border=1>
<th> Community Impact </th>
<th> Consequence </th>
<tr border=1>
<td width=50% border=1> Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community. </td>
<td width=50% border=1> A private, written warning from project/community leaders providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
<table border="1">
<tr>
<td style="font-weight:bold"> Community Impact </td>
<td style="font-weight:bold"> Consequence </td>
</tr>
<tr border="1">
<td width="50%" border="1"> Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community. </td>
<td width="50%" border="1"> A private, written warning from project/community leaders providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
</td>
</tr>
</table>

**2. Warning**

<table border=1>
<th> Community Impact </th>
<th> Consequence </th>
<table border="1">
<tr>
<td style="font-weight:bold"> Community Impact </td>
<td style="font-weight:bold"> Consequence </td>
</tr>
<tr>
<td width=50%> A violation through a single incident or series of actions. </td>
<td width=50%> A warning with consequences for continued behavior. No interaction with the people involved including unsolicited interaction with those enforcing the code of conduct for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
<td width="50%" border="1"> A violation through a single incident or series of actions. </td>
<td width="50%" border="1"> A warning with consequences for continued behavior. No interaction with the people involved including unsolicited interaction with those enforcing the code of conduct for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
</td>
</tr>
</table>

**3. Temporary ban**

<table border=1>
<th> Community Impact </th>
<th> Consequence </th>
<table border="1">
<tr>
<td width=50%> A serious violation of community standards including sustained inappropriate behavior. </td>
<td width=50%> A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved including unsolicited interaction with those enforcing the code of conduct is allowed during this period. Violating these terms may lead to a permanent ban.
<td style="font-weight:bold"> Community Impact </td>
<td style="font-weight:bold"> Consequence </td>
</tr>
<tr>
<td width="50%" border="1"> A serious violation of community standards including sustained inappropriate behavior. </td>
<td width="50%" border="1"> A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved including unsolicited interaction with those enforcing the code of conduct is allowed during this period. Violating these terms may lead to a permanent ban.
</td>
</tr>
</table>

**4. Permanent ban**

<table border=1>
<th> Community Impact </th>
<th> Consequence </th>
<table border="1">
<tr>
<td style="font-weight:bold"> Community Impact </td>
<td style="font-weight:bold"> Consequence </td>
</tr>
<tr>
<td width=50%> Demonstrating a pattern of violation of community standards including sustained inappropriate behavior, harassment of an individual, or aggression towards or disparagement of classes of individuals. </td>
<td width=50%> A permanent ban from any sort of public interaction within the project community.
<td width="50%" border="1"> Demonstrating a pattern of violation of community standards including sustained inappropriate behavior, harassment of an individual, or aggression towards or disparagement of classes of individuals. </td>
<td width="50%" border="1"> A permanent ban from any sort of public interaction within the project community.
</td>
</tr>
</table>
Expand Down
5 changes: 2 additions & 3 deletions community.md
View file
Expand Up @@ -54,7 +54,7 @@ Hit a bump on the road? Report an issue in the relevant repo out of the GitHub r
- Compiler, runtime, standard library, or tooling: <a href="https://github.com/ballerina-platform/ballerina-lang/issues">ballerina-lang</a> repo
- Language specification: <a href="https://github.com/ballerina-platform/ballerina-spec/issues">ballerina-spec</a> repo
- Website: <a href="https://github.com/ballerina-platform/ballerina-dev-website/issues">ballerina-dev-website</a> repo
- Security flaw: send an email to security@ballerina.io. For details, see the <a href="https://ballerina.io/security/">security policy</a>.
- Security flaw: send an email to security@ballerina.io. For details, see the <a href="/security">security policy</a>.

## Help us grow

Expand All @@ -78,8 +78,7 @@ We run an announcement-only, no-marketing-spam mailing list that we will use to

## Contribute to Ballerina

Join us and contribute to the source code to make Ballerina better! To be aware of the ground rules as you start, see the <a href="https://ballerina.io/contribution-guide">Contribution Guide</a>. Happy contributing!

Join us and contribute to the source code to make Ballerina better! To be aware of the ground rules as you start, see the <a href="/contribution-guide">Contribution Guide</a>. Happy contributing!

<style>
.nav > li.cVersionItem {
Expand Down
35 changes: 4 additions & 31 deletions contribution-guide.md
View file
@@ -1,7 +1,7 @@
---
layout: ballerina-inner-page
title: The Ballerina Contribution Guide
permalink: /contribution-guide/
permalink: /contribution-guide
---

# The Ballerina Contribution Guide
Expand Down Expand Up @@ -63,38 +63,11 @@ We appreciate your help!

## Set up the prerequisites
1. Download [Ballerina](https://ballerina.io) and go through the [learning resources](https://ballerina.io/learn).
2. Read the [Ballerina Code of Conduct](https://ballerina.io/code-of-conduct).
3. Download the Java SE Development Kit (JDK) version 8 from one of the following locations and install it.
- [Oracle](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
- [OpenJDK](http://openjdk.java.net/install/index.html)
>**Note:** Set the `JAVA_HOME` environment variable to the path name of the directory into which you installed JDK.
4. Download [Node.js](https://nodejs.org/en/download/) (version 8.9.x or the latest LTS release) and install it.
5. Download [npm](https://www.npmjs.com/get-npm) (version 5.6.0 or later) and install it.
2. Read the <a href="/code-of-conduct">Ballerina Code of Conduct</a>.

## Obtain the source code
## Build the source code

1. Execute the below command to clone the ballerina-lang Git repo.
```bash
git clone --recursive https://github.com/ballerina-platform/ballerina-lang.git
```
>**Tip:** If you have already forked the repository to your GitHub account, then execute the below command replacing `<YOUR-GITHUB-USERNAME>` with your Git username.
```bash
git clone --recursive https://github.com/<YOUR-GITHUB-USERNAME>/ballerina-lang.git
```
2. Execute the below command to update the Git submodules.
```bash
git submodule update --init
```
## Build the project

1. Navigate to the root directory of the Ballerina project (i.e., `<BALLERINA_PROJECT_ROOT>`) and execute the below Gradle command.
```bash
./gradlew clean build
```
2. Extract the built Ballerina distributions in the below locations.
- **runtime only:** `<BALLERINA_PROJECT_ROOT>/distribution/zip/jballerina/build/distributions/jballerina-<version>-SNAPSHOT.zip`
- **runtime and tools (e.g., Ballerina Language Server):** `<BALLERINA_PROJECT_ROOT>/distribution/zip/jballerina-tools/build/distributions/jballerina-tools-<version>-SNAPSHOT.zip`
>**Note:** If you face an IOException error stating "Too many open files", this is due to the default number of possible open files being set to a lower number on your operating system than required for Ballerina to be compiled. You may have to increase the number of open files/file descriptors (FD) on your operating system to 1000000 (or higher).
For instructions, see [Installing from source](https://ballerina.io/learn/installing-ballerina/installing-from-source).

## Set up the development environment

Expand Down
20 changes: 20 additions & 0 deletions events.md
View file
Expand Up @@ -43,6 +43,16 @@ redirect_from:
<b>Anjana Fernando,</b> Director of Developer Relations, WSO2
</td>
<td class="cEventURL"><a class="cEventRegistration" href="https://www.developerweek.com/conference/conference-schedule/" target="_blank">More Info</a></td>
</tr>
<tr class="event-expiry" style="display:none" data-expiry="March 10, 2020 12:00:00">
<td class="cEventDateContainer"><span class="cEventDate">March 10, 2020</span>
<p class="cEventLocation">San Jose, California, USA</p>
</td>
<td class="cEventDetail"><a target="_blank" href="https://www.meetup.com/Kubernetes-for-Developers"><h4>Kubernetes for Developers Meetup</h4></a>
<h5>Ballerinas & Zebras in Kubernetes</h5>
<b>Lakmal Warusawithana,</b> Senior Director of Developer Relations, WSO2
</td>
<td class="cEventURL"><a class="cEventRegistration" href="https://www.meetup.com/Kubernetes-for-Developers/events/268523459/" target="_blank">More Info</a></td>
</tr>
<tr class="event-expiry" style="display:none" data-expiry="March 26, 2020 12:00:00">
<td class="cEventDateContainer"><span class="cEventDate">March 24 - 26, 2020</span>
Expand Down Expand Up @@ -85,6 +95,16 @@ redirect_from:
</td>
<td class="cEventURL"><a class="cEventRegistration" href="https://qconsp.com/schedule/sp2020/tabular" target="_blank">More Info</a></td>
</tr>
<tr class="event-expiry" style="display:none" data-expiry="May 28, 2020 12:00:00">
<td class="cEventDateContainer"><span class="cEventDate">May 28, 2020</span>
<p class="cEventLocation">San Diego, California, USA</p>
</td>
<td class="cEventDetail"><a target="_blank" href="https://www.meetup.com/San-Diego-Cloud-Native-Computing-Meetup"><h4>San Diego Cloud Native Computing Meetup</h4></a>
<h5>Ballerina – An Open-Source, Cloud-Native Programming Language for Microservices</h5>
<b>Anjana Fernando,</b> Director of Developer Relations, WSO2
</td>
<td class="cEventURL"><a class="cEventRegistration" href="https://www.meetup.com/San-Diego-Cloud-Native-Computing-Meetup/events/268618473/" target="_blank">More Info</a></td>
</tr>

</table>
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Expand Up @@ -24,7 +24,7 @@ <h1>Ballerina is an open source programming language and platform for cloud-era
Download Ballerina
<p>Distributions available for <br>Linux, OS X, and Windows</p>
</a>
<a class="cBallerina-io-Home-main-download-button cBBEButton" href="/learn/by-example/">
<a class="cBallerina-io-Home-main-download-button cBBEButton" href="/{{ site.latest_version }}/learn/by-example/">
<img src="/img/ballerina-bbe-logo.svg"/>
<p>Commented examples to learn <br>and cut-n-paste from</p>
</a>
Expand Down
62 changes: 61 additions & 1 deletion learn/installing-ballerina.md
View file
Expand Up @@ -8,6 +8,13 @@ redirect_from:

# Installing Ballerina

- [Downloading the Ballerina distribution](#downloading-the-ballerina-distribution)
- [Installing Ballerina via installers](#installing-ballerina-via-installers)
- [Installing from source](#installing-from-source)
- [Uninstalling Ballerina](#uninstalling-ballerina)
- [Getting help](#getting-help)
- [What's next](#what's-next)

## Downloading the Ballerina distribution

[Download](https://ballerina.io/downloads/) a Ballerina distribution based on your operating system.
Expand All @@ -17,7 +24,7 @@ redirect_from:
- Ubuntu Linux 12.04 x64 - LTS and above
- OS X 10.8.3 x64 and above

If a binary distribution is not available for your combination of operating system and architecture, try [installing from source](https://github.com/ballerina-platform/ballerina-lang#install-from-source).
If a binary distribution is not available for your combination of operating system and architecture, try [installing from source](#installing-from-source).

## Installing Ballerina via installers

Expand Down Expand Up @@ -46,6 +53,59 @@ The installer should put the `C:\Program Files\Ballerina\<ballerina-directory>\b
dpkg -i <ballerina-binary>.deb
```

## Installing from source

Alternatively, follow the instructions below to install Ballerina from the source.

### Setting up the prerequisites

You need to download and install the below to build the Ballerina modules.
1. Java SE Development Kit (JDK) version 8 (from one of the following locations)
- [Oracle](https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html)
- [OpenJDK](http://openjdk.java.net/install/index.html)

>**Note:** Set the JAVA_HOME environment variable to the path name of the directory into which you installed JDK.
2. [Node.js (version 8.9.x or the latest LTS release)](https://nodejs.org/en/download/)
3. [npm (version 5.6.0 or later)](https://www.npmjs.com/get-npm)
4. [Docker](https://www.docker.com/get-started)

### Obtaining the source code
Follow the steps below to obtain the Ballerina source code.

1. Execute the below command to clone the ['ballerina-lang'](https://github.com/ballerina-platform/ballerina-lang) source repository.

```
git clone --recursive https://github.com/ballerina-platform/ballerina-lang.git
```
>**Tip:** If you have already forked the repository to your GitHub account, then execute the below command replacing <YOUR-GITHUB-USERNAME> with your Git username.
```
git clone --recursive https://github.com/<YOUR-GITHUB-USERNAME>/ballerina-lang.git
```

2. Execute the below command to update the Git submodules.

```
git submodule update --init
```

### Building the source

Follow the steps below to build the project of the obtained source.

1. Navigate to the root directory of the Ballerina repo (i.e., <BALLERINA_PROJECT_ROOT>) and execute one of the below Gradle commands to build the project using Gradle.

- **On Unix/Mac OS:** ```./gradlew build ```
- **Windows:** ```gradlew build ```

2. Extract the built Ballerina distributions created in the below locations:

- **runtime only:** <BALLERINA_PROJECT_ROOT>/distribution/zip/jballerina/build/distributions/jballerina-<version>-SNAPSHOT.zip
- **runtime and tools (e.g., Ballerina Language Server):** <BALLERINA_PROJECT_ROOT>/distribution/zip/jballerina-tools/build/distributions/jballerina-tools-<version>-SNAPSHOT.zip

>**Note:** If you face an IOException error stating “Too many open files”, this is due to the default number of possible open files being set to a lower number on your operating system than required for Ballerina to be compiled. You may have to increase the number of open files/file descriptors (FD) on your operating system to 1000000 (or higher).
## Uninstalling Ballerina

To remove an existing Ballerina installation, go to the Ballerina installation location and delete the Ballerina directory.
Expand Down
14 changes: 7 additions & 7 deletions security.md
View file
Expand Up @@ -15,21 +15,21 @@ Ballerina project maintainers take security issues very seriously and all the vu

Ensure you are using the latest Ballerina version before you run an automated security scan or perform a penetration test against it.

Based on the ethics of responsible disclosure, you must only use the **[security@ballerina.io](mailto:security@ballerina.io)** mailing list to report security vulnerabilities and any other concerns regarding the security aspects of the source code or any other resource in this repo.
Based on the ethics of responsible disclosure, you must **only use the [security@ballerina.io](mailto:security@ballerina.io) mailing list** to report security vulnerabilities and any other concerns regarding the security aspects of the source code or any other resource in this repo.

**Warning:** To protect the end-user security, please do not use any other medium to report security vulnerabilities. Also, kindly refrain from disclosing the vulnerability details you come across with other individuals, in any forums, sites, or other groups - public or private before it’s mitigation actions and disclosure process are completed.
> **WARNING:** To protect the end-user security, **please do not use any other medium to report security vulnerabilities**. Also, kindly refrain from disclosing the vulnerability details you come across with other individuals, in any forums, sites, or other groups - public or private before it’s mitigation actions and disclosure process are completed.
Use the following key to send secure messages to security@ballerina.io:

> security@ballerina.io: 0168 DA26 2989 0DB9 4ACD 8367 E683 061E 2F85 C381 [pgp.mit.edu](https://pgp.surfnet.nl/pks/lookup?op=vindex&fingerprint=on&search=0xE683061E2F85C381)
Also, use the following template when reporting vulnerabilities so that it contains all the required information and helps expedite the analysis and mitigation process.

- Vulnerable Ballerina artifact(s) and version(s)
- Overview: High-level overview of the issue and self-assessed severity
- Description: Include the steps to reproduce
- Impact: Self-assessed impact
- Solution: Any proposed solution
- **Vulnerable Ballerina artifact(s) and version(s):** list of the Ballerina artifacts/versions that are considered as vulnerable
- **Overview:** high-level overview of the issue and self-assessed severity
- **Description:** include the steps to reproduce
- **Impact:** self-assessed impact
- **Solution:** any proposed solution

We will keep you informed of the progress towards a fix and disclosure of the vulnerability if the reported issue is identified as a true positive.

Expand Down

0 comments on commit d687a93

Please sign in to comment.