Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into 744
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/org/takes/facets/fork/FkHitRefresh.java
  • Loading branch information
skapral committed Feb 15, 2018
2 parents b1d75be + f355160 commit 64f11eb
Show file tree
Hide file tree
Showing 474 changed files with 3,843 additions and 1,805 deletions.
4 changes: 4 additions & 0 deletions .0pdd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ errors:
# alerts:
# github:
# - yegor256

tags:
- pdd
- bug
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Make sure the title of the issue explains the problem you are having. Also, the description of the issue must clearly explain what is broken, not what you want us to implement. Go through this checklist and make sure you answer "YES" to all points:

- You have all pre-requisites listed in README.md installed
- You are sure that you are not reporting a duplicate (search all issues)
- You say "is broken" or "doesn't work" in the title
- You tell us what you are trying to do
- You explain the results you are getting
- You suggest an alternative result you would like to see

This article will help you understand what we are looking for: http://www.yegor256.com/2014/11/24/principles-of-bug-tracking.html

Thank you for your contribution!
11 changes: 11 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Many thanks for your contribution, we truly appreciate it. We will appreciate it even more, if you make sure that you can say "YES" to each point in this short checklist:

- You made a small amount of changes (less than 100 lines, less than 10 files)
- You made changes related to only one bug (create separate PRs for separate problems)
- You are ready to defend your changes (there will be a code review)
- You don't touch what you don't understand
- You ran the build locally and it passed

This article will help you understand what we are looking for: http://www.yegor256.com/2015/02/09/serious-code-reviewer.html

Thank you for your contribution!
5 changes: 4 additions & 1 deletion .rultor.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
docker:
image: yegor256/java8
assets:
settings.xml: zerocracy/home#assets/takes/settings.xml
pubring.gpg: zerocracy/home#assets/pubring.gpg
Expand All @@ -16,6 +18,7 @@ install: |
export LANGUAGE=en_US.UTF-8
sudo gem install --no-rdoc --no-ri pdd
sudo gem install --no-rdoc --no-ri est
sudo gem install --no-rdoc --no-ri xcop
architect:
- yegor256
- davvd
Expand Down Expand Up @@ -64,6 +67,6 @@ release:
script: |-
mvn versions:set "-DnewVersion=${tag}"
git commit -am "${tag}"
mvn clean deploy -Ptakes -Psonatype --errors --settings ../settings.xml
mvn clean deploy -Ptakes -Psonar -Psonatype -Pqulice -Dinvoker.skip --errors --settings ../settings.xml
commanders:
- yegor256
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ before_install:
install:
- gem install pdd
- gem install est
- gem install xcop
env:
global:
- MAVEN_OPTS="-Xmx256m"
- JAVA_OPTS="-Xmx256m"
jdk:
- oraclejdk8
- oraclejdk7
#- openjdk6 - jcabi-http doesn't work with JDK 6
after_success:
- "bash <(curl -s https://codecov.io/bash)"
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2017 Yegor Bugayenko
Copyright (c) 2014-2018 Yegor Bugayenko

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
35 changes: 31 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
<img src="http://www.takes.org/logo.png" width="96px" height="96px"/>

[![Managed by Zerocracy](http://www.zerocracy.com/badge.svg)](http://www.zerocracy.com)
[![Managed by Zerocracy](http://www.0crat.com/badge/C3FFK3YAY.svg)](http://www.0crat.com/p/C3FFK3YAY)
[![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/takes)](http://www.rultor.com/p/yegor256/takes)
[![We recommend IntelliJ IDEA](http://img.teamed.io/intellij-idea-recommend.svg)](https://www.jetbrains.com/idea/)

[![Build Status](https://img.shields.io/travis/yegor256/takes/master.svg)](https://travis-ci.org/yegor256/takes)
[![Build status](https://img.shields.io/appveyor/ci/yegor256/takes/master.svg)](https://ci.appveyor.com/project/yegor256/takes/branch/master)
[![Javadoc](https://javadoc-emblem.rhcloud.com/doc/org.takes/takes/badge.svg?color=blue&prefix=v)](http://www.javadoc.io/doc/org.takes/takes)
[![Test Coverage](https://img.shields.io/codecov/c/github/yegor256/takes.svg)](https://codecov.io/github/yegor256/takes?branch=master)
[![Javadoc](http://www.javadoc.io/badge/org.takes/takes.svg)](http://www.javadoc.io/doc/org.takes/takes)
[![codebeat badge](https://codebeat.co/badges/5721bba4-59cd-44ea-a60f-6043734187f7)](https://codebeat.co/projects/github-com-yegor256-takes)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/938e7683fcfa4db9bff362c2b4a9b78e)](https://www.codacy.com/app/github_90/takes?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=yegor256/takes&amp;utm_campaign=Badge_Grade)
[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/takes/blob/master/LICENSE.txt)

[![jpeek report](http://i.jpeek.org/org.takes/takes/badge.svg)](http://i.jpeek.org/org.takes/takes/)
[![Test Coverage](https://img.shields.io/codecov/c/github/yegor256/takes.svg)](https://codecov.io/github/yegor256/takes?branch=master)
[![SonarQube](https://img.shields.io/badge/sonar-ok-green.svg)](https://sonarcloud.io/dashboard?id=org.takes%3Atakes)

[![Maven Central](https://img.shields.io/maven-central/v/org.takes/takes.svg)](https://maven-badges.herokuapp.com/maven-central/org.takes/takes)
[![Dependencies](https://www.versioneye.com/user/projects/561a9c5ca193340f2f00110d/badge.svg?style=flat)](https://www.versioneye.com/user/projects/561a9c5ca193340f2f00110d)
[![PDD status](http://www.0pdd.com/svg?name=yegor256/takes)](http://www.0pdd.com/p?name=yegor256/takes)
Expand Down Expand Up @@ -48,7 +51,7 @@ These two web systems use Takes, and they are open source:
## Contents

- [Quick Start](#quick-start)
- [Build and Run With Maven](#build-a-run-with-maven)
- [Build and Run With Maven](#build-and-run-with-maven)
- [Unit Testing](#unit-testing)
- [Integration Testing](#integration-testing)
- [A Bigger Example](#a-bigger-example)
Expand All @@ -64,6 +67,7 @@ These two web systems use Takes, and they are open source:
- [RsJSON](#rsjson)
- [RsXembly](#rsxembly)
- [GZIP Compression](#gzip-compression)
- [SSL Configuration](#ssl-configuration)
- [Authentication](#authentication)
- [Command Line Arguments](#command-line-arguments)
- [Logging](#logging)
Expand Down Expand Up @@ -756,6 +760,29 @@ public final class TkIndex implements Take {
}
}
```
## SSL Configuration

First of all, setup your keystore settings, for example

```java
final String file = this.getClass().getResource("/org/takes/http/keystore").getFile();
final String password = "abc123";
System.setProperty("javax.net.ssl.keyStore", file);
System.setProperty("javax.net.ssl.keyStorePassword", password);
System.setProperty("javax.net.ssl.trustStore", file);
System.setProperty("javax.net.ssl.trustStorePassword", password);
```

Then simple create exemplar of class [FtSecure](src/main/java/org/takes/http/FtSecure.java) with socket factory

```java
final ServerSocket skt = SSLServerSocketFactory.getDefault().createServerSocket(0);
new FtRemote(
new FtSecure(new BkBasic(new TkFixed("hello, world")), skt),
skt,
true
);
```

## Authentication

Expand Down
17 changes: 0 additions & 17 deletions TEAM.md

This file was deleted.

Loading

0 comments on commit 64f11eb

Please sign in to comment.