Merge branch 'SDAP-8' into SDAP-10 Project: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/commit/1cf5b3a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/tree/1cf5b3a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/diff/1cf5b3a7
Branch: refs/heads/master Commit: 1cf5b3a7237daf06a76434d267bc9252ddcac0cf Parents: e240b98 0c83a10 Author: fgreg <[email protected]> Authored: Wed Jan 10 17:06:02 2018 -0800 Committer: GitHub <[email protected]> Committed: Wed Jan 10 17:06:02 2018 -0800 ---------------------------------------------------------------------- data-access/nexustiles/config/datastores.ini | 13 +- data-access/nexustiles/dao/CassandraProxy.pyx | 4 + data-access/nexustiles/dao/DynamoProxy.pyx | 135 ++++++++++++ data-access/nexustiles/dao/S3Proxy.pyx | 129 ++++++++++++ data-access/nexustiles/dao/SolrProxy.pyx | 4 + data-access/nexustiles/nexustiles.py | 66 +++--- .../developer-box/data/grace/dataseturl.txt | 2 +- nexus-ingest/developer-box/nexus | 1 + nexus-ingest/nexus-sink/build.gradle | 19 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- nexus-ingest/nexus-sink/nexus-sink.ipr | 102 +++++++++ nexus-ingest/nexus-sink/nexus-sink.iws | 207 +++++++++++++++++++ .../ingest/nexussink/CassandraStore.groovy | 40 ++++ .../nexus/ingest/nexussink/NexusService.groovy | 152 +------------- .../jpl/nexus/ingest/nexussink/SolrStore.groovy | 143 +++++++++++++ .../jpl/nexus/ingest/nexussink/DataStore.java | 17 ++ .../ingest/nexussink/DataStoreException.java | 24 +++ .../jpl/nexus/ingest/nexussink/DynamoStore.java | 57 +++++ .../nexussink/InfrastructureConfiguration.java | 133 +++++++++--- .../nexussink/IntegrationConfiguration.java | 34 +-- .../nexus/ingest/nexussink/MetadataStore.java | 17 ++ .../nexussink/NexusSinkOptionsMetadata.java | 110 +++++++++- .../jpl/nexus/ingest/nexussink/S3Store.java | 68 ++++++ .../nexussink/NexusSinkIntegrationTest.groovy | 138 +++++++++++-- .../ingest/nexussink/SolrStoreUnitTest.groovy | 68 ++++++ .../NexusSinkOptionsIntegrationTest.java | 9 +- .../TestInfrastructureConfiguration.java | 31 +++ 27 files changed, 1460 insertions(+), 265 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/blob/1cf5b3a7/data-access/nexustiles/dao/SolrProxy.pyx ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-sdap-nexus/blob/1cf5b3a7/data-access/nexustiles/nexustiles.py ----------------------------------------------------------------------
