Skip to content

Commit 9a50383

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 1885 b: refs/heads/pubsub-alpha c: f4c3a32 h: refs/heads/master i: 1883: 5e0f947
1 parent cd310e8 commit 9a50383

79 files changed

Lines changed: 47 additions & 14325 deletions

File tree

Some content is hidden

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

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
33
refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
44
refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
55
refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
6-
refs/heads/pubsub-alpha: 433c2869ef6d8d50516acfe4f7d8f632023ad9e4
6+
refs/heads/pubsub-alpha: f4c3a327ca0030fed4326a004e717bb62e0e969e
77
refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
88
refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
99
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

‎branches/pubsub-alpha/README.md‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,14 @@ This client supports the following Google Cloud Platform services:
2020
2121
Quickstart
2222
----------
23-
If you are using Maven, add this to your pom.xml file
23+
Add this to your pom.xml file
2424
```xml
2525
<dependency>
2626
<groupId>com.google.gcloud</groupId>
2727
<artifactId>gcloud-java</artifactId>
2828
<version>0.0.10</version>
2929
</dependency>
3030
```
31-
If you are using Gradle, add this to your dependencies
32-
```Groovy
33-
compile 'com.google.gcloud:gcloud-java:jar:0.0.10'
34-
```
35-
If you are using SBT, add this to your dependencies
36-
```Scala
37-
libraryDependencies += "com.google.gcloud" % "gcloud-java" % "0.0.10"
38-
```
3931

4032
Example Applications
4133
--------------------
@@ -52,9 +44,19 @@ There are multiple ways to authenticate to use Google Cloud services.
5244

5345
1. When using `gcloud-java` libraries from within Compute/App Engine, no additional authentication steps are necessary.
5446
2. When using `gcloud-java` libraries elsewhere, there are two options:
55-
* [Generate a JSON service account key](https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts). Supply a path to the downloaded JSON credentials file when building the options supplied to datastore/storage constructor.
47+
* [Generate a JSON service account key](https://cloud.google.com/storage/docs/authentication?hl=en#service_accounts). After downloading that key, you must do one of the following:
48+
* Define the environment variable GOOGLE_APPLICATION_CREDENTIALS to be the location of the key. For example, `export GOOGLE_APPLICATION_CREDENTIALS=/path/to/my/key.json`
49+
* Supply the downloaded JSON credentials file when building the options supplied to datastore/storage constructor. For example, `StorageOptions.builder().authCredentials(AuthCredentials.createForJson(new FileInputStream("/path/to/my/key.json")).build().service()` returns a `Storage` object that has the necessary permissions.
5650
* If running locally for development/testing, you can use use [Google Cloud SDK](https://cloud.google.com/sdk/?hl=en). To use the SDK authentication, [download the SDK](https://cloud.google.com/sdk/?hl=en) if you haven't already. Then login using the SDK (`gcloud auth login` in command line), and set your current project using `gcloud config set project PROJECT_ID`.
5751

52+
`gcloud-java` looks for credentials in the following order, stopping once it finds credentials:
53+
54+
1. Credentials supplied to the `DatastoreOptions`/`ServiceOptions` builder
55+
2. App Engine credentials
56+
3. Key file pointed to by the GOOGLE_APPLICATION_CREDENTIALS environment variable
57+
4. Google SDK credentials
58+
5. Compute Engine credentials
59+
5860
Google Cloud Datastore
5961
----------------------
6062

‎branches/pubsub-alpha/gcloud-java-bigquery/README.md‎

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

‎branches/pubsub-alpha/gcloud-java-bigquery/pom.xml‎

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

0 commit comments

Comments
 (0)