You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/04/08 01:21:02 UTC
[1/7] git commit: Ignore Netbeans project files.
Repository: incubator-usergrid
Updated Branches:
refs/pull/92/head c082e9eda -> 131c3cab5
refs/pull/92/merge 90e60ecb2 -> 416f0a55a (forced update)
Ignore Netbeans project files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/778511b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/778511b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/778511b7
Branch: refs/pull/92/head
Commit: 778511b710df15b53a21db98b6a0f6aa0b393883
Parents: 1b4038a
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Apr 4 09:59:56 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Apr 4 09:59:56 2014 -0400
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/778511b7/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0da9432..1d8935a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ stack/corepersistence/queryindex/nbactions.xml
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
+/portal/nbproject/private/
\ No newline at end of file
[7/7] git commit: Merge 131c3cab55ed7f29e7b11a7b8b83d5e98c4fb593 into
778511b710df15b53a21db98b6a0f6aa0b393883
Posted by sn...@apache.org.
Merge 131c3cab55ed7f29e7b11a7b8b83d5e98c4fb593 into 778511b710df15b53a21db98b6a0f6aa0b393883
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/416f0a55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/416f0a55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/416f0a55
Branch: refs/pull/92/merge
Commit: 416f0a55af4706e63c63c4a59b3b77c15e374e34
Parents: 778511b 131c3ca
Author: GERey <gr...@apigee.com>
Authored: Mon Apr 7 23:10:16 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Mon Apr 7 23:10:16 2014 +0000
----------------------------------------------------------------------
.../usergrid/persistence/entities/Export.java | 70 --
.../organizations/OrganizationResource.java | 108 ++
.../applications/ApplicationResource.java | 27 -
.../rest/management/ExportResourceIT.java | 651 ++++++++++++
.../rest/management/ManagementResourceIT.java | 734 +++----------
.../usergrid/management/export/ExportJob.java | 1 +
.../management/export/ExportService.java | 5 +-
.../management/export/ExportServiceImpl.java | 348 +++---
.../usergrid/management/export/S3Export.java | 6 +-
.../management/export/S3ExportImpl.java | 8 +-
.../resources/usergrid-services-context.xml | 2 -
.../usergrid/ConcurrentServiceITSuite.java | 3 +-
.../management/cassandra/ExportServiceIT.java | 1004 ++++++++++++++++++
.../cassandra/ManagementServiceIT.java | 946 +----------------
.../management/cassandra/MockS3ExportImpl.java | 33 +-
.../security/tokens/TokenServiceIT.java | 3 +-
16 files changed, 2141 insertions(+), 1808 deletions(-)
----------------------------------------------------------------------
[5/7] git commit: Merge remote-tracking branch 'origin/master' into
Export_Persistance_Integration
Posted by sn...@apache.org.
Merge remote-tracking branch 'origin/master' into Export_Persistance_Integration
Conflicts:
.gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/131c3cab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/131c3cab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/131c3cab
Branch: refs/pull/92/merge
Commit: 131c3cab55ed7f29e7b11a7b8b83d5e98c4fb593
Parents: c082e9e 778511b
Author: grey <gr...@apigee.com>
Authored: Mon Apr 7 16:10:12 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Apr 7 16:10:12 2014 -0700
----------------------------------------------------------------------
.gitignore | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[2/7] git commit: Added ignore to some auto generated files in
intelliJ. Cleans up source tree commits. Removed commented out mocking code.
Posted by sn...@apache.org.
Added ignore to some auto generated files in intelliJ. Cleans up source tree commits.
Removed commented out mocking code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/721d7625
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/721d7625
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/721d7625
Branch: refs/pull/92/merge
Commit: 721d7625a4dce54b9baae7c09f2f9f6d8c85cfd1
Parents: 9aeb66b
Author: grey <gr...@apigee.com>
Authored: Mon Apr 7 10:59:42 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Apr 7 10:59:42 2014 -0700
----------------------------------------------------------------------
.gitignore | 2 ++
.../management/cassandra/MockS3ExportImpl.java | 23 --------------------
2 files changed, 2 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/721d7625/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0da9432..f99c690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@ stack/corepersistence/queryindex/nbactions.xml
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterLexer.java
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/query/tree/QueryFilterParser.java
+sdks/android/usergrid-android-client.iml
+sdks/java/usergrid-java-client.iml
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/721d7625/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
index e765aea..b3ec1cb 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
@@ -47,29 +47,6 @@ public class MockS3ExportImpl implements S3Export {
catch ( IOException e ) {
e.printStackTrace();
}
-
-
- // Logger logger = LoggerFactory.getLogger( MockS3ExportImpl.class );
-// int read = 0;
-// byte[] bytes = new byte[1024];
-// OutputStream outputStream = null;
-//
-// try {
-// outputStream = new FileOutputStream( new File( this.filename ) );
-// }
-// catch ( FileNotFoundException e ) {
-// e.printStackTrace();
-// }
-//
-//
-// try {
-// while ( ( read = ( inputStream.read( bytes ) ) ) != -1 ) {
-// outputStream.write( bytes, 0, read );
-// }
-// }
-// catch ( IOException e ) {
-// e.printStackTrace();
-// }
}
@Override
[3/7] git commit: Added delete on exit to ephemeral file.
Posted by sn...@apache.org.
Added delete on exit to ephemeral file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/537e8c5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/537e8c5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/537e8c5a
Branch: refs/pull/92/merge
Commit: 537e8c5a1aa6282dcd75656ea387fe0066e4a4a9
Parents: 721d762
Author: grey <gr...@apigee.com>
Authored: Mon Apr 7 11:06:07 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Apr 7 11:06:07 2014 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/management/export/ExportServiceImpl.java | 1 +
.../java/org/apache/usergrid/management/export/S3ExportImpl.java | 1 -
.../org/apache/usergrid/management/cassandra/MockS3ExportImpl.java | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/537e8c5a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
index 61a416d..effacf0 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
@@ -566,6 +566,7 @@ public class ExportServiceImpl implements ExportService {
Map<String, Object> metadata = em.getApplicationCollectionMetadata();
long starting_time = System.currentTimeMillis();
File ephemeral = new File( "tempExport" + UUID.randomUUID() );
+ ephemeral.deleteOnExit();
JsonGenerator jg = getJsonGenerator( ephemeral );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/537e8c5a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
index 24130db..4399ad7 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
@@ -99,7 +99,6 @@ public class S3ExportImpl implements S3Export {
logger.info( "Uploaded file etag=" + futureETag.get() );
- ephemeral.delete();
}
catch ( Exception e ) {
logger.error( "Error uploading to blob store", e );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/537e8c5a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
index b3ec1cb..932d1f8 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/MockS3ExportImpl.java
@@ -42,7 +42,6 @@ public class MockS3ExportImpl implements S3Export {
File verfiedData = new File( this.filename );
try {
FileUtils.copyFile(ephemeral,verfiedData);
- ephemeral.delete();
}
catch ( IOException e ) {
e.printStackTrace();
[6/7] git commit: Merge remote-tracking branch 'origin/master' into
Export_Persistance_Integration
Posted by sn...@apache.org.
Merge remote-tracking branch 'origin/master' into Export_Persistance_Integration
Conflicts:
.gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/131c3cab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/131c3cab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/131c3cab
Branch: refs/pull/92/head
Commit: 131c3cab55ed7f29e7b11a7b8b83d5e98c4fb593
Parents: c082e9e 778511b
Author: grey <gr...@apigee.com>
Authored: Mon Apr 7 16:10:12 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Apr 7 16:10:12 2014 -0700
----------------------------------------------------------------------
.gitignore | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[4/7] git commit: Changed the content type to application/json
without any errors occurring.
Posted by sn...@apache.org.
Changed the content type to application/json without any errors occurring.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c082e9ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c082e9ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c082e9ed
Branch: refs/pull/92/merge
Commit: c082e9edae203c7a56ba113b9c0ed8c6692af906
Parents: 537e8c5
Author: grey <gr...@apigee.com>
Authored: Mon Apr 7 15:10:59 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Apr 7 15:10:59 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/usergrid/management/export/S3ExportImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c082e9ed/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
index 4399ad7..9236cbb 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
@@ -90,7 +90,7 @@ public class S3ExportImpl implements S3Export {
try {
AsyncBlobStore blobStore = context.getAsyncBlobStore();
BlobBuilder blobBuilder =
- blobStore.blobBuilder( fn ).payload( ephemeral ).calculateMD5().contentType( "text/plain" );
+ blobStore.blobBuilder( fn ).payload( ephemeral ).calculateMD5().contentType( "application/json" );
Blob blob = blobBuilder.build();