Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a JNDI ObjectFactory for Datastore instances #90

Closed
wants to merge 219 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
c79887b
Automatically invoke gcd for testing
aozarov Jan 3, 2015
12d00ef
Merge branch 'master' of https://github.com/aozarov/git-demo
aozarov Jan 3, 2015
e03e416
minor change
aozarov Jan 3, 2015
1ee59da
replace sh with bash
aozarov Jan 3, 2015
5e5a143
cleanup
aozarov Jan 5, 2015
7bc7ce1
more cleanup
aozarov Jan 5, 2015
66f062a
more cleanup
aozarov Jan 6, 2015
3c80071
minor fix
aozarov Jan 7, 2015
8a45fb2
revert wrong formatting
aozarov Jan 7, 2015
eb88c65
revert wrong formatting
aozarov Jan 7, 2015
a0825e7
even more cleanup
aozarov Jan 8, 2015
c1bd6fa
Merge remote-tracking branch 'origin/master'
aozarov Jan 8, 2015
cff6d8f
revert wrong formatting
aozarov Jan 9, 2015
cc001fe
Provide an option for an add with auto-id allocation.
aozarov Jan 10, 2015
e6eda06
add git-demo.iml
aozarov Jan 10, 2015
797af85
removing git-demo.iml
aozarov Jan 10, 2015
64a1929
batch/transaction submit/commit returns generated keys
aozarov Jan 12, 2015
d27b2de
Provide an option for an add with auto-id allocation.
aozarov Jan 13, 2015
e68feca
replace local gcd hack with a fixed version of gcd
aozarov Jan 14, 2015
e262b76
replace local gcd hack with a fixed version of gcd
aozarov Jan 14, 2015
fa60bc9
Adding copyright and README and CONTRIBUTIONS files.
aozarov Jan 20, 2015
acb92fc
adding contributing
aozarov Jan 20, 2015
4b0bd41
adding travis config file
aozarov Jan 20, 2015
7a79f5d
Make travis run verify instead of test
aozarov Jan 21, 2015
9e21d2b
change maven group information
aozarov Jan 21, 2015
c18cf24
adding travis credentials
aozarov Feb 9, 2015
beac379
apply changes from git-demo
aozarov Feb 9, 2015
0ae2558
return the datastore service from Batch and Transation
aozarov Feb 10, 2015
fdbd594
Delete .project
aozarov Feb 10, 2015
9b469f7
Delete .classpath
aozarov Feb 10, 2015
44ac26c
Update README.md
aozarov Feb 10, 2015
c4d258c
Update index.apt
aozarov Feb 10, 2015
bc3330a
Update index.apt
aozarov Feb 10, 2015
af6e3e8
Update site.xml
aozarov Feb 10, 2015
56b6455
Fixes #6
aozarov Feb 11, 2015
395b212
Merge branch 'master' of https://github.com/GoogleCloudPlatform/gclou…
aozarov Feb 11, 2015
363af63
adding more tests
aozarov Feb 12, 2015
54b76d3
Update README.md
aozarov Feb 13, 2015
bf68d87
more tests
aozarov Feb 14, 2015
6ea67c0
Merge branch 'master' of https://github.com/GoogleCloudPlatform/gclou…
aozarov Feb 14, 2015
946090c
Create LICENSE
aozarov Feb 17, 2015
083acf4
Syntax highlight Java code snippet.
mbrukman Feb 17, 2015
69ba166
Value tests
aozarov Feb 18, 2015
b3dd822
Merge pull request #10 from mbrukman/readme-syntax-highlight
aozarov Feb 18, 2015
002df6b
more tests
aozarov Feb 18, 2015
897084e
update readme
aozarov Feb 18, 2015
8eba6b4
Fixes #6
aozarov Feb 19, 2015
4d05f3b
update maven
aozarov Feb 23, 2015
3556298
disable signing for CI
aozarov Feb 23, 2015
21521f6
fix license URL
aozarov Feb 25, 2015
547b3f3
Add version info in site and jar
aozarov Feb 25, 2015
57ead04
Use ServiceLoader for default RPC implementation
aozarov Feb 27, 2015
a3e2139
update imports
aozarov Feb 27, 2015
94c8f5b
update copyright
aozarov Feb 27, 2015
0613f53
storage work in progress
aozarov Mar 2, 2015
125d6e9
wip
aozarov Mar 3, 2015
10fcf98
Update Query Javadoc regarding projection type
aozarov Mar 3, 2015
c253ea5
Make DatastoreHelper internal
aozarov Mar 4, 2015
40e9739
wip
aozarov Mar 4, 2015
7346207
Datastore team code review changes
aozarov Mar 6, 2015
a1deabb
rename PartialKey to IncompleteKey
aozarov Mar 6, 2015
6952d86
datastore entity change (remove partialentity)
aozarov Mar 11, 2015
8679736
add FullQuery/FullQueryBuilder and move builder methods to Query
aozarov Mar 12, 2015
f594ca3
Rename Entity<K> to FullEntity<K> and provide an Entity as a shorthan…
aozarov Mar 14, 2015
d133a36
Remove StructuredQuery subclasses and allocateId from KeyFactory
aozarov Mar 15, 2015
10e67b4
rename projectQueryBuilder method to projectionEntityQueryBuilder for…
aozarov Mar 16, 2015
79215c4
wip
aozarov Mar 18, 2015
a6cae12
Providing a default app credentials
aozarov Mar 18, 2015
b45d00f
minor rename and version bump
aozarov Mar 18, 2015
3a8e7f8
move sign to deploy stage
aozarov Mar 19, 2015
d15a682
work in progress
aozarov Mar 20, 2015
3ba30dd
adding examples
aozarov Mar 20, 2015
7b24f4d
examples
aozarov Mar 21, 2015
fab0360
Update .travis.yml
aozarov Mar 23, 2015
8e05dbe
Update DatastoreExample.java
ludoch Mar 31, 2015
ea035fa
Update GqlQuery.java
aozarov Mar 31, 2015
2350dd3
Update StructuredQuery.java
aozarov Mar 31, 2015
312ddfb
Update StructuredQuery.java
aozarov Mar 31, 2015
55fc3bd
Update README.md
aozarov Apr 1, 2015
e3aa320
Update README.md
aozarov Apr 1, 2015
6fe8161
Update README.md
aozarov Apr 1, 2015
1188ac6
work in progress
aozarov Apr 1, 2015
c9611f2
work in progress
aozarov Apr 1, 2015
43d0761
work in progress
aozarov Apr 2, 2015
7dcee4b
wip
aozarov Apr 3, 2015
515edb6
Improving datastore example to include all CRUD operations and query
aozarov Apr 7, 2015
aea58fc
some refactoring, fix class-loading issue and more example enhancments
aozarov Apr 8, 2015
cbc567d
pushing 0.0.4
aozarov Apr 8, 2015
16be4d8
Update README.md
aozarov Apr 8, 2015
8e0c9d3
Update pom.xml
aozarov Apr 8, 2015
59f0d85
work in progress
aozarov Apr 9, 2015
a7b661a
Merge remote-tracking branch 'upstream/master'
aozarov Apr 9, 2015
126b043
work in progress
aozarov Apr 9, 2015
4f65b2d
work in progress
aozarov Apr 10, 2015
a3cf907
work in progress
aozarov Apr 10, 2015
2cdc4e3
work in progress
aozarov Apr 11, 2015
24f8a0b
work in progress
aozarov Apr 14, 2015
4836863
work in progress
aozarov Apr 14, 2015
fcb3dcd
work in progress
aozarov Apr 14, 2015
d3f0356
work in progress
aozarov Apr 14, 2015
3171d8c
work in progress
aozarov Apr 16, 2015
f88107c
work in progress
aozarov Apr 18, 2015
7e932b7
fix retry helper for datastore and change the way we get a default in…
aozarov Apr 21, 2015
42c11d0
Update README.md
aozarov Apr 21, 2015
b8c2da8
s/retriable/retryable/g
aozarov Apr 21, 2015
7fd6df1
Merge branch 'master' of https://github.com/GoogleCloudPlatform/gclou…
aozarov Apr 21, 2015
8ef30c8
work in progress
aozarov Apr 21, 2015
89a5024
work in progress
aozarov Apr 21, 2015
2841929
work in progress
aozarov Apr 22, 2015
803527d
work in progress
aozarov Apr 22, 2015
f327dad
work in progress
aozarov Apr 23, 2015
c92f2ea
make AuthCredentials serializable
aozarov Apr 24, 2015
d504256
work in progress
aozarov Apr 24, 2015
c148817
work in progress
aozarov Apr 24, 2015
09a890f
work in progress
aozarov Apr 24, 2015
a4076b7
work in progress
aozarov Apr 25, 2015
9cb77fa
work in progress
aozarov Apr 29, 2015
acff3c1
add default content type to compose
aozarov Apr 29, 2015
ad396b7
work in progress
aozarov Apr 30, 2015
6df1164
adding batch
aozarov May 1, 2015
a4ee293
work in progress
aozarov May 2, 2015
2ed5ce1
work in progress
aozarov May 2, 2015
4c2f40e
complete batch
aozarov May 4, 2015
59410ab
add multi info to example
aozarov May 4, 2015
f0920d0
work in progress
aozarov May 4, 2015
64da673
find project-id from env
aozarov May 4, 2015
e3222e5
update ini hanlding
aozarov May 4, 2015
9b751ae
implement Serializable reader
aozarov May 4, 2015
2d279f4
work in progress
aozarov May 5, 2015
4260e8e
work in progress
aozarov May 5, 2015
e830ad3
work in progress
aozarov May 6, 2015
a964351
work in progress
aozarov May 6, 2015
cbe93b9
add jar with dependencies
aozarov May 6, 2015
6d4ac35
work in progress
aozarov May 6, 2015
d2c6344
complete output writer
aozarov May 7, 2015
251ac25
Merge pull request #43 from aozarov/master
aozarov May 7, 2015
45bd602
remove leftover
aozarov May 7, 2015
ac239d9
change get to download
aozarov May 7, 2015
ae4b0c6
fix build
aozarov May 7, 2015
9ef71e3
Merge pull request #44 from aozarov/master
aozarov May 7, 2015
b28b8f4
replace dataset with projectId
aozarov May 8, 2015
89e4d1a
update datastore example
aozarov May 8, 2015
2e22d5b
javadoc
aozarov May 8, 2015
d50ccf6
fix example
aozarov May 8, 2015
19f155b
work in progress
aozarov May 8, 2015
1f6cefe
Merge pull request #47 from aozarov/master
aozarov May 8, 2015
c87bd8d
change sourceOptions
aozarov May 9, 2015
92c6df8
some doc
aozarov May 9, 2015
72bb3ee
Merge pull request #48 from aozarov/master
aozarov May 9, 2015
6e4a2e4
complete package-info and make get return null on 404
aozarov May 11, 2015
4481a4a
add another shortcut for CopyRequest
aozarov May 11, 2015
535b0a1
add another shortcut for ComposeRequest
aozarov May 11, 2015
9761b3c
make batch gets return null as well on 404
aozarov May 12, 2015
76776e3
Merge pull request #53 from aozarov/master
aozarov May 12, 2015
6c59a54
add metadata update to example and fix builder user-settable fields
aozarov May 12, 2015
17ec594
add serialization test
aozarov May 13, 2015
4b8bd32
add comments to example
aozarov May 13, 2015
96b3ada
Replace given null values with Apiary nulls and provide doesNotExists…
aozarov May 13, 2015
0299172
add apiary references to all example actions
aozarov May 14, 2015
3fdecb6
acl test
aozarov May 14, 2015
05e3f0a
Merge pull request #58 from aozarov/master
jboynes May 14, 2015
faab59d
adding BatchRequestTest
aozarov May 14, 2015
56ceb52
Merge remote-tracking branch 'upstream/master' into temp
aozarov May 14, 2015
b941c08
work in progress
aozarov May 15, 2015
ed351d4
basic tests
aozarov May 15, 2015
ccd84c3
make Project constructor public
aozarov May 15, 2015
28c9010
s/junit.framework.TestCase/org.junit.Assert/g
aozarov May 15, 2015
8f08f2d
add tests for bucket and blob
aozarov May 15, 2015
ce107b2
adding an option to page from ListResult
aozarov May 16, 2015
87792ed
fix test and add some javadoc
aozarov May 16, 2015
8fec7f3
extract reader/writer impl, increase their default buffer and minimiz…
aozarov May 18, 2015
e0c03c9
Merge pull request #64 from aozarov/temp
ludoch May 18, 2015
b9b4383
Merge remote-tracking branch 'upstream/master' into temp2
aozarov May 18, 2015
636476b
Merge remote-tracking branch 'upstream/master' into temp1
aozarov May 18, 2015
8cfb286
fix merge conflict
aozarov May 18, 2015
bc98058
Merge remote-tracking branch 'upstream/master'
aozarov May 18, 2015
2cd8108
Merge pull request #67 from aozarov/master
aozarov May 18, 2015
57c4242
Merge remote-tracking branch 'upstream/master' into temp1
aozarov May 18, 2015
c120b68
Merge pull request #68 from aozarov/temp1
aozarov May 19, 2015
3c91299
Merge remote-tracking branch and fix conflict
aozarov May 19, 2015
7738e54
Merge pull request #69 from aozarov/temp2
aozarov May 19, 2015
384113e
make chunk size configurable
aozarov May 20, 2015
1ba5cb4
work on signURL
aozarov May 21, 2015
3e79f7c
initial work on modules
aozarov May 22, 2015
6d361df
fix index.apt
aozarov May 26, 2015
2d84ef2
update pom descriptions
aozarov May 26, 2015
25f86f3
remove StorageRpcProvider and add Javadoc to RPC factory interfaces
aozarov May 26, 2015
55936ee
fix typo
aozarov May 26, 2015
b0220b5
Merge pull request #74 from aozarov/temp
ludoch May 26, 2015
a771c12
make chunk size configurable
aozarov May 26, 2015
8881beb
Merge pull request #75 from aozarov/temp
ludoch May 26, 2015
ee47724
Revert changes that were applied on a different branch.
aozarov May 26, 2015
ebe8587
Merge branch 'master' of https://github.com/aozarov/gcloud-java
aozarov May 26, 2015
cc489e5
Merge branch 'master' of git://github.com/GoogleCloudPlatform/gcloud-…
aozarov May 26, 2015
8c5d0db
add HttpMethod which was removed by the merge
aozarov May 26, 2015
7385fb5
initial work on removing gcd as a resource
aozarov May 26, 2015
7093b4b
continue work on replacing local gcd.sh with a remote version
aozarov May 27, 2015
fc73469
add some comments describing how the LocalGcdHelper works
aozarov May 27, 2015
1616f63
display stderr of gcd create
aozarov May 27, 2015
f25b08c
work on sign url
aozarov May 27, 2015
7f03b07
replace GCD_VERSION with GCD
aozarov May 27, 2015
8352ecd
add a checksum verification
aozarov May 27, 2015
2fef9bf
Merge pull request #76 from aozarov/temp
ludoch May 27, 2015
df2b350
sign url - work in progress
aozarov May 28, 2015
1f28b34
sign url - work in progress
aozarov May 28, 2015
81e5efe
complete work on signURL
aozarov May 28, 2015
0b1b82c
enforce minium Java and Maven requirements
aozarov May 29, 2015
c0ee15d
rename XXXService, XXXServiceFactory, XXXServiceException and XXXServ…
aozarov May 29, 2015
e77e0bb
Merge pull request #77 from aozarov/master
ludoch May 29, 2015
6081b74
Merge branch 'master' of git://github.com/GoogleCloudPlatform/gcloud-…
aozarov May 29, 2015
19f3350
fix merge conflicts
aozarov May 29, 2015
930a52d
Merge pull request #79 from aozarov/temp1
ludoch May 29, 2015
0201796
Merge branch 'master' of git://github.com/GoogleCloudPlatform/gcloud-…
aozarov May 29, 2015
f85b3d6
rename Bucket to BucketInfo and Blob to BlobInfo
aozarov May 29, 2015
0ad1cbd
Merge pull request #78 from aozarov/temp
ludoch May 29, 2015
857077c
Merge pull request #86 from aozarov/master
ludoch May 29, 2015
5896432
rename load to readAllBytes
aozarov Jun 3, 2015
0cd6f98
Merge pull request #89 from aozarov/temp
jboynes Jun 3, 2015
c2f548d
Add a JNDI ObjectFactory for Datastore instances
jboynes Jun 3, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix merge conflicts
aozarov committed May 29, 2015
commit 19f33507f2cf0aa97cd59825cf5b4d91a3d54836
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ private static abstract class StorageAction<T> {

abstract void run(Storage storage, T request) throws Exception;

abstract T parse(String... args) throws IllegalArgumentException, IOException;
abstract T parse(String... args) throws Exception;

protected String params() {
return "";
@@ -406,7 +406,7 @@ public String params() {
*/
private static class ComposeAction extends StorageAction<ComposeRequest> {
@Override
public void run(StorageService storage, ComposeRequest request) {
public void run(Storage storage, ComposeRequest request) {
Blob composedBlob = storage.compose(request);
System.out.println("Composed " + composedBlob);
}
@@ -490,12 +490,12 @@ private static class SignUrlAction extends
private static final char[] PASSWORD = "notasecret".toCharArray();

@Override
public void run(StorageService storage, Tuple<ServiceAccountAuthCredentials, Blob> tuple)
public void run(Storage storage, Tuple<ServiceAccountAuthCredentials, Blob> tuple)
throws Exception {
run(storage, tuple.x(), tuple.y());
}

private void run(StorageService storage, ServiceAccountAuthCredentials cred, Blob blob)
private void run(Storage storage, ServiceAccountAuthCredentials cred, Blob blob)
throws IOException {
Calendar cal = Calendar.getInstance();
cal.add(Calendar.DATE, 1);
Original file line number Diff line number Diff line change
@@ -279,7 +279,7 @@ class ComposeRequest implements Serializable {

private final List<SourceBlob> sourceBlobs;
private final Blob target;
private final List<StorageService.BlobTargetOption> targetOptions;
private final List<BlobTargetOption> targetOptions;

public static class SourceBlob implements Serializable {