Skip to content

Commit 0419502

Browse files
s-gromovs-gromov
committed
HH-55803 merge back the SubScribe fork [i.garanina]
1 parent 0311a43 commit 0419502

File tree

321 files changed

+9324
-8011
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

321 files changed

+9324
-8011
lines changed

‎.gitignore‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
21
# Eclipse specific settings
3-
42
.classpath
53
.project
64
.settings
75

86
# IntelliJ Idea settings
9-
107
.idea
11-
scribe.iml
8+
*.iml
129

13-
# Binaries
10+
# Netbeans settings
11+
nb-configuration.xml
12+
nbproject
1413

15-
target
14+
# Binaries
15+
target

‎.travis.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎LICENSE.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
The MIT License
22

3+
Copyright (c) 2013 hh.ru
34
Copyright (c) 2010 Pablo Fernandez
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy

‎README.md‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
# Welcome to the home of Scribe, the simple OAuth Java lib!
1+
# Welcome to the home of ScribeJava, the simple OAuth Java lib!
22

3-
![travis ci](https://secure.travis-ci.org/fernandezpablo85/scribe-java.png?branch=master)
4-
[![codecov.io](https://codecov.io/github/fernandezpablo85/scribe-java/coverage.svg?branch=master)](https://codecov.io/github/fernandezpablo85/scribe-java?branch=master)
5-
6-
### Before submitting a pull request [please read this](https://github.com/fernandezpablo85/scribe-java/wiki/Scribe-scope-revised)
7-
8-
# Why use Scribe?
3+
# Why use ScribeJava?
94

105
### Dead Simple
116

12-
Who said OAuth was difficult? Configuring scribe is __so easy your grandma can do it__! check it out:
7+
Who said OAuth/OAuth2 was difficult? Configuring scribe is __so easy your grandma can do it__! check it out:
138

149
```java
1510
OAuthService service = new ServiceBuilder()
@@ -23,7 +18,11 @@ That **single line** (added newlines for readability) is the only thing you need
2318

2419
### Threadsafe
2520

26-
Hit Scribe as hard and with many threads as you like.
21+
Hit ScribeJava as hard and with many threads as you like.
22+
23+
### Async
24+
25+
You can user ning async http client out-of-box, just use ServiceBuilderAsync
2726

2827
### Supports all major 1.0a and 2.0 OAuth APIs out-of-the-box
2928

@@ -45,11 +44,22 @@ Hit Scribe as hard and with many threads as you like.
4544

4645
* Windows Live
4746

48-
* and many more! check the [examples folder](http://github.com/fernandezpablo85/scribe-java/tree/master/src/test/java/org/scribe/examples)
47+
* Odnoklassniki
48+
49+
* Mail.ru
50+
51+
* LinkedIn2.0
52+
53+
* Google2.0
54+
55+
* GitHub
56+
57+
* and many more! check the [examples folder](http://github.com/scribejava/scribejava/tree/master/src/test/java/com/github/scribejava/apis/examples)
4958

5059
### Small and modular
5160

52-
Scribe's code is small (about 1k LOC) and simple to understand. No smart-ass or "clever" hacks here.
61+
ScribeJava's code is small (about 1k LOC) and simple to understand. No smart-ass or "clever" hacks here.
62+
You can use only 'core' or 'with apis' maven modules
5363

5464
### Android-Ready
5565

@@ -59,52 +69,41 @@ Works out of the box with android(TM) applications.
5969

6070
Good test coverage to keep you safe from harm.
6171

62-
When something bad actually happens, Scribe's meaningful error messages will tell you exactly what went wrong, when and where.
72+
When something bad actually happens, ScribeJava's meaningful error messages will tell you exactly what went wrong, when and where.
6373

64-
### Pull it from Maven!
74+
### Pull it from Maven Central!
6575

66-
You can pull scribe from my maven repository, just add these to your __pom.xml__ file:
76+
You can pull ScribeJava from the central maven repository, just add these to your __pom.xml__ file:
6777

6878
```xml
79+
<dependency>
80+
<groupId>com.github.scribejava</groupId>
81+
<artifactId>scribejava-apis</artifactId>
82+
<version>2.0</version>
83+
</dependency>
84+
```
6985

70-
<!-- repository -->
71-
<repositories>
72-
<repository>
73-
<id>scribe-java-mvn-repo</id>
74-
<url>https://raw.github.com/fernandezpablo85/scribe-java/mvn-repo/</url>
75-
<snapshots>
76-
<enabled>true</enabled>
77-
<updatePolicy>always</updatePolicy>
78-
</snapshots>
79-
</repository>
80-
</repositories>
81-
82-
<!-- dependency -->
86+
And in case you need just core classes (that's it, without any external API (FB, VK, GitHub, Google etc) specific code), you could pull just 'core' artifact.
87+
```xml
8388
<dependency>
84-
<groupId>org.scribe</groupId>
85-
<artifactId>scribe</artifactId>
86-
<version>1.3.6</version>
89+
<groupId>com.github.scribejava</groupId>
90+
<artifactId>scribejava-core</artifactId>
91+
<version>2.0</version>
8792
</dependency>
8893
```
8994

9095
## Getting started in less than 2 minutes
9196

92-
Check the [Getting Started](http://wiki.github.com/fernandezpablo85/scribe-java/getting-started) page and start rocking! Please Read the [FAQ](http://wiki.github.com/fernandezpablo85/scribe-java/faq) before creating an issue :)
97+
Check the [Getting Started](https://github.com/scribejava/scribejava/wiki/getting-started) page and start rocking! Please Read the [FAQ](https://github.com/scribejava/scribejava/wiki/faq) before creating an issue :)
9398

9499
Also, remember to read the [fantastic tutorial](http://akoskm.github.io/2015/07/31/twitter-sign-in-for-web-apps.html) that [@akoskm](https://twitter.com/akoskm) wrote to easily integrate a server side app with an API (twitter in this case).
95100

96101
## Questions?
97102

98-
Feel free to drop me an email, but there's already a [StackOverflow](http://stackoverflow.com) tag for [scribe](http://stackoverflow.com/questions/tagged/scribe) you should use. I'm subscribed to it so I'll pick the question immediately.
103+
Feel free to drop us an email or create issue right here on github.com
99104

100105
## Forks
101106

102-
Looking for a scribe variation? check the [Fork List](https://github.com/fernandezpablo85/scribe-java/wiki/Forks)
103-
104-
If you have a useful fork that should be listed there please contact me (see About me).
105-
106-
## About me
107-
108-
[LinkedIn profile](http://www.linkedin.com/in/fernandezpablo85)
107+
Looking for a ScribeJava variation? check the [Fork List](https://github.com/scribejava/scribejava/wiki/Forks)
109108

110-
Follow me: [@fernandezpablo](http://twitter.com/fernandezpablo)
109+
If you have a useful fork that should be listed there please contact us

‎bundle‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎changelog‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[2.0]
2+
* merge back SubScribe fork to the ScribeJava
3+
4+
for previous changes see
5+
v1-changelog - changelog for 1.x version
6+
v2pre-changelog - changelog for SubScribe fork
7+

0 commit comments

Comments
 (0)