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/03 23:25:44 UTC
[5/7] git commit: Removed integration test by ignoring it. Removed
commented out code.
Removed integration test by ignoring it.
Removed commented out 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/e3b79e86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e3b79e86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e3b79e86
Branch: refs/pull/92/merge
Commit: e3b79e867e179a27d3257089936ca7f68cc13766
Parents: f65c800
Author: grey <gr...@apigee.com>
Authored: Thu Apr 3 13:57:55 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Apr 3 13:57:55 2014 -0700
----------------------------------------------------------------------
.../management/export/ExportServiceImpl.java | 30 ++------------------
.../management/cassandra/ExportServiceIT.java | 4 +--
2 files changed, 4 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e3b79e86/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 a61659e..ac0eb20 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
@@ -192,8 +192,6 @@ public class ExportServiceImpl implements ExportService {
Object s3PlaceHolder = jobExecution.getJobData().getProperty( "s3Export" ) ;
S3Export s3Export = null;
-
-// UUID scopedAppId = ( UUID ) config.get( "applicationId" );
if ( config == null ) {
logger.error( "Export Information passed through is null" );
return;
@@ -342,15 +340,6 @@ public class ExportServiceImpl implements ExportService {
ByteArrayOutputStream baos = collectionExportAndQuery(application.getKey(),config,export,jobExecution);
fileTransfer( export,appFileName,baos,config, s3Export );
-
-// InputStream is = new ByteArrayInputStream( baos.toByteArray() );
-// try {
-// s3Export.copyToS3( is, config, appFileName );
-// }
-// catch ( Exception e ) {
-// export.setState( Export.State.FAILED );
-// return;
-// }
}
}
@@ -383,15 +372,7 @@ public class ExportServiceImpl implements ExportService {
ByteArrayOutputStream baos = collectionExportAndQuery(applicationId,config,export,jobExecution);
fileTransfer( export,appFileName,baos,config, s3Export );
- //sets up the Inputstream for copying the method to s3.
-// InputStream is = new ByteArrayInputStream( baos.toByteArray() );
-// try {
-// s3Export.copyToS3( is, config, appFileName );
-// }
-// catch ( Exception e ) {
-// export.setState( Export.State.FAILED );
-// return;
-// }
+
}
@@ -417,14 +398,7 @@ public class ExportServiceImpl implements ExportService {
InputStream is = new ByteArrayInputStream( baos.toByteArray() );
fileTransfer( export,appFileName,baos,config, s3Export );
-// try {
-// s3Export.copyToS3( is, config, appFileName );
-// }
-// catch ( Exception e ) {
-// export.setErrorMessage( e.getMessage() );
-// export.setState( Export.State.FAILED );
-// return;
-// }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e3b79e86/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
index e7c7b2f..9c92a29 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
@@ -787,8 +787,8 @@ public class ExportServiceIT {
blobStore.deleteContainer( bucketName );
}
- //@Ignore
- @Test
+ @Ignore
+ // @Test
public void testIntegration100EntitiesForAllApps() throws Exception {
S3Export s3Export = new S3ExportImpl();