You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/03/20 00:26:49 UTC
[32/50] [abbrv] incubator-usergrid git commit: Merge branch
'USERGRID-405' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into USERGRID-405
Merge branch 'USERGRID-405' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-405
Conflicts:
stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/aa01d736
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/aa01d736
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/aa01d736
Branch: refs/heads/USERGRID-480
Commit: aa01d736c2d0e31c73c10d96e7d683468f7c02a0
Parents: ade9714 b635113
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Mar 9 13:36:45 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Mar 9 13:36:45 2015 -0600
----------------------------------------------------------------------
.../Client/IUsergridClient.cs | 2 +-
.../Usergrid.Notifications/Client/PushClient.cs | 24 +++
.../Usergrid.Notifications/MainPage.xaml | 1 +
.../Usergrid.Notifications/MainPage.xaml.cs | 29 ++-
.../main/dist/init_instance/init_rest_server.sh | 3 -
.../src/main/groovy/configure_usergrid.groovy | 6 +-
stack/awscluster/ugcluster-cf.json | 8 +
.../corepersistence/CpEntityManager.java | 109 +++++++++-
.../corepersistence/CpEntityManagerFactory.java | 152 ++++++--------
.../corepersistence/CpRelationManager.java | 39 +++-
.../corepersistence/OrgApplicationCache.java | 67 +++++++
.../OrgApplicationCacheImpl.java | 181 +++++++++++++++++
.../corepersistence/results/EntityVerifier.java | 4 +-
.../results/FilteringLoader.java | 2 +-
.../cassandra/CassandraPersistenceUtils.java | 2 +-
.../main/resources/usergrid-core-context.xml | 14 +-
.../cassandra/EntityManagerFactoryImplIT.java | 1 +
.../impl/migration/GraphMigrationPlugin.java | 1 -
.../persistence/index/IndexBufferProducer.java | 10 +-
.../usergrid/persistence/index/IndexFig.java | 12 +-
.../index/impl/EsEntityIndexBatchImpl.java | 15 +-
.../index/impl/EsEntityIndexFactoryImpl.java | 9 +-
.../index/impl/EsEntityIndexImpl.java | 199 +++++++++++++++----
.../index/impl/EsIndexBufferConsumerImpl.java | 39 +++-
.../index/impl/EsIndexBufferProducerImpl.java | 30 ++-
.../persistence/index/impl/IndexingUtils.java | 7 +-
.../persistence/index/impl/EntityIndexTest.java | 2 +-
.../datagenerators/EntityDataGenerator.scala | 25 +++
.../datagenerators/FeederGenerator.scala | 18 +-
.../usergrid/scenarios/EntityScenarios.scala | 8 +-
.../org/apache/usergrid/settings/Settings.scala | 4 +-
.../simulations/PutCustomEntitySimulation.scala | 75 +++++++
.../org/apache/usergrid/rest/IndexResource.java | 19 ++
.../services/notifications/wns/WNSAdapter.java | 39 ++++
.../resources/usergrid-services-context.xml | 8 +-
35 files changed, 949 insertions(+), 215 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa01d736/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------