usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [57/65] [abbrv] git commit: merged upstream
Date Wed, 22 Oct 2014 16:23:28 GMT
merged upstream


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/702f468d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/702f468d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/702f468d

Branch: refs/heads/two-dot-o
Commit: 702f468d1d1683e7e74151f8f38be35855137f02
Parents: 8dd993a 27db106
Author: amuramoto <amuramoto@apigee.com>
Authored: Tue Oct 14 16:01:05 2014 -0700
Committer: amuramoto <amuramoto@apigee.com>
Committed: Tue Oct 14 16:01:05 2014 -0700

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 portal/js/global/ug-service.js                  | 1100 +++--
 portal/js/libs/usergrid.sdk.js                  | 4264 +++++++++---------
 sdks/java/pom.xml                               |   33 +-
 stack/.gitignore                                |    4 +-
 .../main/dist/init_instance/init_rest_server.sh |   38 +-
 .../dist/init_instance/install_cassandra.sh     |   14 +-
 .../dist/init_instance/install_elasticsearch.sh |   32 +-
 .../main/dist/init_instance/install_yourkit.sh  |   14 +-
 stack/awscluster/ugcluster-cf.json              |    3 +-
 stack/config/README.txt                         |    4 +-
 .../main/resources/usergrid-default.properties  |    2 +-
 stack/core/pom.xml                              |   25 +-
 .../corepersistence/CpEntityDeleteListener.java |    2 +-
 .../CpEntityIndexDeleteListener.java            |   26 +-
 .../corepersistence/CpEntityManager.java        |  596 ++-
 .../corepersistence/CpEntityManagerFactory.java |  533 ++-
 .../corepersistence/CpEntityMapUtils.java       |  323 --
 .../corepersistence/CpManagerCache.java         |   43 +-
 .../corepersistence/CpRelationManager.java      |  614 +--
 .../usergrid/corepersistence/CpSetup.java       |   55 +-
 .../usergrid/corepersistence/CpVisitor.java     |   32 +
 .../usergrid/corepersistence/CpWalker.java      |  167 +
 .../usergrid/corepersistence/GuiceModule.java   |   12 +-
 .../HybridEntityManagerFactory.java             |   20 +
 .../corepersistence/results/EntityVerifier.java |  127 +
 .../results/FilteringLoader.java                |  249 +
 .../corepersistence/results/IdsVerifier.java    |   46 +
 .../corepersistence/results/RefsVerifier.java   |   42 +
 .../corepersistence/results/ResultsLoader.java  |   43 +
 .../results/ResultsLoaderFactory.java           |   39 +
 .../results/ResultsLoaderFactoryImpl.java       |   67 +
 .../results/ResultsVerifier.java                |   54 +
 .../results/VersionVerifier.java                |   81 +
 .../corepersistence/util/CpEntityMapUtils.java  |  323 ++
 .../corepersistence/util/CpNamingUtils.java     |  106 +
 .../apache/usergrid/metrics/MetricsFactory.java |   18 +-
 .../usergrid/mq/cassandra/QueueManagerImpl.java |   18 +-
 .../mq/cassandra/io/AbstractSearch.java         |  208 +-
 .../mq/cassandra/io/ConsumerTransaction.java    |   19 +-
 .../usergrid/persistence/EntityManager.java     |    7 +
 .../persistence/EntityManagerFactory.java       |   12 +
 .../apache/usergrid/persistence/Results.java    |    6 +-
 .../persistence/cassandra/CassandraService.java |    5 -
 .../cassandra/EntityManagerFactoryImpl.java     |   21 +
 .../cassandra/EntityManagerImpl.java            |   12 +
 .../persistence/entities/Notification.java      |   13 +
 .../usergrid/persistence/entities/Receipt.java  |   20 +-
 .../main/resources/usergrid-core-context.xml    |   13 +-
 .../java/org/apache/usergrid/Application.java   |    7 +
 .../org/apache/usergrid/CoreApplication.java    |    8 +
 .../usergrid/batch/job/SchedulerRuntime8IT.java |    3 +
 .../CpEntityDeleteListenerTest.java             |    2 +-
 .../CpEntityIndexDeleteListenerTest.java        |   19 +-
 .../corepersistence/CpEntityMapUtilsTest.java   |    2 +
 .../corepersistence/StaleIndexCleanupTest.java  |  249 +
 .../usergrid/persistence/CollectionIT.java      |    3 -
 .../org/apache/usergrid/persistence/GeoIT.java  |    2 +-
 .../persistence/PerformanceEntityReadTest.java  |  173 +
 .../PerformanceEntityRebuildIndexTest.java      |  283 ++
 .../persistence/PerformanceEntityWriteTest.java |  170 +
 .../cassandra/EntityManagerFactoryImplIT.java   |   10 +-
 .../cassandra/QueryProcessorTest.java           |    2 -
 .../query/AbstractIteratingQueryIT.java         |    3 +
 stack/core/src/test/resources/log4j.properties  |   12 +-
 .../collection/EntityCollectionManager.java     |   33 +-
 .../persistence/collection/EntitySet.java       |   47 +
 .../persistence/collection/MvccEntity.java      |   68 +
 .../persistence/collection/MvccLogEntry.java    |   94 +
 .../persistence/collection/VersionSet.java      |   67 +
 .../collection/event/EntityDeleted.java         |   42 +
 .../collection/event/EntityVersionCreated.java  |   42 +
 .../collection/event/EntityVersionDeleted.java  |   46 +
 .../exception/CollectionRuntimeException.java   |    2 +-
 .../exception/WriteCommitException.java         |    4 +-
 .../WriteOptimisticVerifyException.java         |    4 +-
 .../exception/WriteStartException.java          |    4 +-
 .../exception/WriteUniqueVerifyException.java   |    3 +-
 .../collection/guice/CollectionModule.java      |   35 +-
 .../guice/CollectionTaskExecutor.java           |   35 +
 .../collection/impl/CollectionScopeImpl.java    |    6 +-
 .../impl/EntityCollectionManagerImpl.java       |  259 +-
 .../impl/EntityVersionCleanupTask.java          |  198 +
 .../mvcc/MvccEntitySerializationStrategy.java   |   20 +-
 .../mvcc/MvccLogEntrySerializationStrategy.java |   17 +-
 .../collection/mvcc/changelog/ChangeLog.java    |   68 +
 .../mvcc/changelog/ChangeLogEntry.java          |  104 -
 .../mvcc/changelog/ChangeLogGenerator.java      |   16 +-
 .../mvcc/changelog/ChangeLogGeneratorImpl.java  |  138 +-
 .../mvcc/changelog/ChangeLogImpl.java           |  135 +
 .../collection/mvcc/entity/MvccEntity.java      |   68 -
 .../collection/mvcc/entity/MvccLogEntry.java    |   93 -
 .../mvcc/entity/MvccValidationUtils.java        |    4 +
 .../mvcc/entity/impl/MvccEntityDeleteEvent.java |    2 +-
 .../mvcc/entity/impl/MvccEntityEvent.java       |    2 +-
 .../mvcc/entity/impl/MvccEntityImpl.java        |    2 +-
 .../mvcc/entity/impl/MvccEntityWriteEvent.java  |    3 +-
 .../mvcc/entity/impl/MvccLogEntryImpl.java      |    2 +-
 .../mvcc/event/PostProcessObserver.java         |   39 -
 .../mvcc/stage/EntityUpdateEvent.java           |    1 -
 .../mvcc/stage/delete/MarkCommit.java           |  157 +-
 .../collection/mvcc/stage/delete/MarkStart.java |    4 +-
 .../collection/mvcc/stage/load/Load.java        |   98 -
 .../mvcc/stage/write/EntityVersion.java         |   64 -
 .../stage/write/EntityVersionSerializer.java    |   71 -
 .../mvcc/stage/write/FieldSerializer.java       |  107 -
 .../mvcc/stage/write/RollbackAction.java        |    9 +-
 .../mvcc/stage/write/UniqueValue.java           |   39 -
 .../mvcc/stage/write/UniqueValueImpl.java       |  124 -
 .../write/UniqueValueSerializationStrategy.java |   66 -
 .../UniqueValueSerializationStrategyImpl.java   |  194 -
 .../mvcc/stage/write/WriteCommit.java           |   18 +-
 .../mvcc/stage/write/WriteOptimisticVerify.java |   52 +-
 .../collection/mvcc/stage/write/WriteStart.java |   17 +-
 .../mvcc/stage/write/WriteUniqueVerify.java     |  209 +-
 .../collection/serialization/EntityRepair.java  |   38 +
 .../serialization/OptimisticUpdate.java         |    2 +-
 .../serialization/SerializationFig.java         |   51 +-
 .../collection/serialization/UniqueValue.java   |   49 +
 .../UniqueValueSerializationStrategy.java       |   68 +
 .../serialization/UniqueValueSet.java           |   32 +
 .../serialization/impl/EntityRepairImpl.java    |  149 +
 .../serialization/impl/EntitySetImpl.java       |   62 +
 .../serialization/impl/EntityVersion.java       |   64 +
 .../impl/EntityVersionSerializer.java           |   81 +
 .../serialization/impl/FieldSerializer.java     |  118 +
 .../serialization/impl/LogEntryIterator.java    |  114 +
 .../MvccEntitySerializationStrategyImpl.java    |  175 +-
 .../MvccLogEntrySerializationStrategyImpl.java  |  129 +-
 .../serialization/impl/SerializationModule.java |    3 +-
 .../serialization/impl/UniqueValueImpl.java     |  114 +
 .../UniqueValueSerializationStrategyImpl.java   |  229 +
 .../serialization/impl/UniqueValueSetImpl.java  |   85 +
 .../serialization/impl/VersionSetImpl.java      |   80 +
 .../persistence/collection/util/RepairUtil.java |  138 -
 .../collection/EntityCollectionManagerIT.java   |  431 +-
 .../EntityCollectionManagerStressTest.java      |    2 +
 .../impl/EntityVersionCleanupTaskTest.java      |  690 +++
 .../changelog/ChangeLogGeneratorImplTest.java   |  375 +-
 .../mvcc/entity/impl/MvccEntityImplTest.java    |    2 +-
 .../mvcc/entity/impl/MvccLogEntryImplTest.java  |    2 +-
 .../mvcc/stage/AbstractMvccEntityStageTest.java |    2 +-
 .../mvcc/stage/TestEntityGenerator.java         |    2 +-
 .../mvcc/stage/delete/MarkCommitTest.java       |   12 +-
 .../mvcc/stage/delete/MarkStartTest.java        |    4 +-
 .../collection/mvcc/stage/load/LoadTest.java    |  361 --
 .../write/EntityVersionSerializerTest.java      |    2 +
 .../mvcc/stage/write/FieldSerializerTest.java   |    1 +
 ...niqueValueSerializationStrategyImplTest.java |  119 +-
 .../mvcc/stage/write/WriteCommitTest.java       |    5 +-
 .../stage/write/WriteOptimisticVerifyTest.java  |   35 +-
 .../mvcc/stage/write/WriteStartTest.java        |    4 +-
 .../stage/write/WriteUniqueVerifyStageTest.java |   48 -
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |   58 +-
 .../serialization/EntityRepairImplTest.java     |  147 +
 .../impl/LogEntryIteratorTest.java              |  131 +
 ...MvccEntitySerializationStrategyImplTest.java |   40 +-
 .../impl/MvccLESSTransientTest.java             |    7 +-
 ...ccLogEntrySerializationStrategyImplTest.java |   19 +-
 .../util/InvalidMvccEntityGenerator.java        |    2 +-
 .../util/InvalidValueGeneratorTest.java         |    2 +-
 .../collection/util/LogEntryMock.java           |  150 +
 .../core/astyanax/AstyanaxKeyspaceProvider.java |    2 +
 .../persistence/core/astyanax/CassandraFig.java |    4 +-
 .../persistence/core/guice/CommonModule.java    |    2 +
 .../core/migration/MigrationManagerImpl.java    |    6 +
 .../core/scope/ApplicationScopeImpl.java        |    6 +-
 .../core/task/NamedTaskExecutorImpl.java        |  167 +
 .../usergrid/persistence/core/task/Task.java    |   31 +
 .../persistence/core/task/TaskExecutor.java     |   23 +
 .../core/task/NamedTaskExecutorImplTest.java    |  227 +
 .../core/util/AvailablePortFinder.java          |  188 -
 .../usergrid/persistence/graph/GraphFig.java    |    2 +
 .../persistence/graph/event/EdgeDeleted.java    |    8 +
 .../persistence/graph/guice/GraphModule.java    |   16 +
 .../graph/guice/GraphTaskExecutor.java          |   33 +
 .../graph/impl/GraphManagerImpl.java            |    6 +-
 .../impl/shard/impl/NodeShardCacheImpl.java     |   12 +-
 .../shard/impl/ShardGroupCompactionImpl.java    |  175 +-
 .../graph/GraphManagerStressTest.java           |    1 +
 .../serialization/EdgeSerializationTest.java    |    3 +
 .../impl/shard/NodeShardCacheTest.java          |    7 +-
 .../impl/shard/ShardGroupCompactionTest.java    |    5 +-
 stack/corepersistence/map/pom.xml               |   81 +
 .../usergrid/persistence/map/MapManager.java    |   68 +
 .../persistence/map/MapManagerFactory.java      |   30 +
 .../usergrid/persistence/map/MapScope.java      |   40 +
 .../persistence/map/guice/MapModule.java        |   61 +
 .../persistence/map/impl/MapManagerImpl.java    |   90 +
 .../persistence/map/impl/MapScopeImpl.java      |   90 +
 .../persistence/map/impl/MapSerialization.java  |   64 +
 .../map/impl/MapSerializationImpl.java          |  337 ++
 .../persistence/map/MapManagerTest.java         |  206 +
 .../persistence/map/guice/TestMapModule.java    |   16 +
 .../persistence/model/field/AbstractField.java  |    4 +
 .../persistence/model/field/ArrayField.java     |    3 +
 .../persistence/model/field/BooleanField.java   |    6 +
 .../persistence/model/field/ByteArrayField.java |    6 +
 .../persistence/model/field/DoubleField.java    |    6 +
 .../model/field/EntityObjectField.java          |    6 +
 .../usergrid/persistence/model/field/Field.java |    8 +
 .../persistence/model/field/FieldTypeName.java  |   42 +
 .../persistence/model/field/FloatField.java     |    6 +
 .../persistence/model/field/IntegerField.java   |    6 +
 .../persistence/model/field/ListField.java      |    7 +
 .../persistence/model/field/LocationField.java  |    6 +
 .../persistence/model/field/LongField.java      |    6 +
 .../persistence/model/field/SetField.java       |    6 +
 .../persistence/model/field/StringField.java    |    6 +
 .../persistence/model/field/UUIDField.java      |    6 +
 .../persistence/model/field/value/Location.java |   12 +-
 stack/corepersistence/pom.xml                   |   22 +-
 .../usergrid/persistence/index/EntityIndex.java |   40 +-
 .../persistence/index/EntityIndexBatch.java     |   74 +
 .../persistence/index/EntityIndexFactory.java   |    4 +-
 .../usergrid/persistence/index/IndexFig.java    |    7 +
 .../usergrid/persistence/index/IndexScope.java  |    2 +-
 .../index/impl/EsEntityIndexBatchImpl.java      |  363 ++
 .../index/impl/EsEntityIndexImpl.java           |  659 +--
 .../persistence/index/impl/EsProvider.java      |   16 +
 .../persistence/index/impl/EsQueryVistor.java   |  174 +-
 .../persistence/index/impl/IndexScopeImpl.java  |   41 +-
 .../persistence/index/impl/IndexingUtils.java   |  173 +
 .../index/query/CandidateResult.java            |   30 +
 .../usergrid/persistence/index/query/Query.java |    2 +-
 .../index/query/tree/AndOperand.java            |    2 +-
 .../persistence/index/query/tree/Property.java  |    2 +-
 .../index/query/tree/StringLiteral.java         |    2 +-
 .../index/utils/IndexValidationUtils.java       |    3 +-
 .../persistence/index/utils/LRUCache2.java      |  151 -
 .../index/impl/CorePerformanceIT.java           |   97 +-
 .../index/impl/ElasticSearchTest.java           |  273 --
 .../impl/EntityConnectionIndexImplTest.java     |   18 +-
 .../index/impl/EntityIndexMapUtils.java         |   14 +-
 .../persistence/index/impl/EntityIndexTest.java |  210 +-
 stack/corepersistence/queue/pom.xml             |   92 +
 .../usergrid/persistence/queue/Queue.java       |   31 +
 .../usergrid/persistence/queue/QueueFig.java    |   16 +
 .../persistence/queue/QueueManager.java         |   64 +
 .../persistence/queue/QueueManagerFactory.java  |   23 +
 .../persistence/queue/QueueMessage.java         |   42 +
 .../usergrid/persistence/queue/QueueScope.java  |   31 +
 .../persistence/queue/guice/QueueModule.java    |   51 +
 .../persistence/queue/impl/QueueScopeImpl.java  |   87 +
 .../queue/impl/SQSQueueManagerImpl.java         |  255 ++
 .../persistence/queue/QueueManagerTest.java     |  100 +
 .../queue/guice/TestQueueModule.java            |   33 +
 stack/launcher/README.txt                       |    2 +-
 .../resources/usergrid-standalone-context.xml   |    2 +-
 .../simulations/test/resources/notifier.p12     |  Bin 3227 -> 0 bytes
 .../simulations/GrindrPushSimulation.scala      |   52 -
 .../PushNotificationSimulation.scala            |   37 -
 stack/pom.xml                                   |   16 +-
 .../apache/usergrid/rest/SystemResource.java    |  195 +-
 .../apache/usergrid/rest/AbstractRestIT.java    |    6 +-
 .../java/org/apache/usergrid/rest/BasicIT.java  |   34 +-
 .../usergrid/rest/ConcurrentRestITSuite.java    |   54 +-
 .../apache/usergrid/rest/NotificationsIT.java   |  239 +
 .../apache/usergrid/rest/PartialUpdateTest.java |  100 +-
 .../org/apache/usergrid/rest/RestITSuite.java   |   45 +-
 .../apache/usergrid/rest/TomcatResource.java    |    4 +-
 .../ApplicationRequestCounterIT.java            |   97 -
 .../rest/applications/DevicesResourceIT.java    |   87 -
 .../collection/BadGrammarQueryTest.java         |   79 -
 .../collection/CollectionsResourceIT.java       |  205 +
 .../collection/PagingResourceIT.java            |  239 -
 .../activities/ActivityResourceIT.java          |  188 +
 .../collection/activities/AndOrQueryTest.java   |  203 -
 .../collection/activities/OrderByTest.java      |  172 -
 .../activities/PagingEntitiesTest.java          |  141 -
 .../collection/devices/DevicesResourceIT.java   |   87 +
 .../collection/groups/GeoPagingTest.java        |  133 -
 .../collection/groups/GroupResourceIT.java      |  295 ++
 .../collection/paging/PagingEntitiesTest.java   |  141 +
 .../collection/paging/PagingResourceIT.java     |  301 ++
 .../users/ConnectionResourceTest.java           |  271 ++
 .../collection/users/OwnershipResourceIT.java   |  379 ++
 .../collection/users/PermissionsResourceIT.java |  768 ++++
 .../collection/users/RetrieveUsersTest.java     |   87 +
 .../collection/users/UserResourceIT.java        | 1418 ++++++
 .../users/extensions/TestResource.java          |   51 +
 .../events/ApplicationRequestCounterIT.java     |   97 +
 .../applications/queries/AndOrQueryTest.java    |  203 +
 .../queries/BadGrammarQueryTest.java            |   79 +
 .../applications/queries/GeoPagingTest.java     |  133 +
 .../applications/queries/MatrixQueryTests.java  |  202 +
 .../rest/applications/queries/OrderByTest.java  |  172 +
 .../applications/users/ActivityResourceIT.java  |  188 -
 .../users/CollectionsResourceIT.java            |  205 -
 .../users/ConnectionResourceTest.java           |  271 --
 .../applications/users/GroupResourceIT.java     |  295 --
 .../applications/users/MatrixQueryTests.java    |  202 -
 .../applications/users/OwnershipResourceIT.java |  379 --
 .../users/PermissionsResourceIT.java            |  768 ----
 .../applications/users/RetrieveUsersTest.java   |   87 -
 .../rest/applications/users/UserResourceIT.java | 1418 ------
 .../users/extensions/TestResource.java          |   51 -
 .../usergrid/rest/management/AccessTokenIT.java |  350 ++
 .../usergrid/rest/management/AdminUsersIT.java  |  807 ++++
 .../rest/management/ManagementResourceIT.java   |  397 +-
 .../rest/management/OrganizationsIT.java        |  378 ++
 .../organizations/OrganizationResourceIT.java   |   90 -
 .../organizations/OrganizationsResourceIT.java  |  322 --
 .../rest/management/users/MUUserResourceIT.java |  654 ---
 .../UsersOrganizationsResourceIT.java           |   72 -
 stack/rest/src/test/resources/log4j.properties  |   18 +-
 .../cassandra/ManagementServiceImpl.java        |   38 +-
 .../usergrid/services/ServiceManager.java       |    7 +-
 .../notifications/ApplicationQueueManager.java  |  239 +-
 .../notifications/ApplicationQueueMessage.java  |   67 +-
 .../notifications/NotificationsService.java     |   45 +-
 .../notifications/NotificationsTaskManager.java |   33 -
 .../services/notifications/QueueJob.java        |    4 +-
 .../services/notifications/QueueListener.java   |  258 +-
 .../services/notifications/QueueManager.java    |   33 -
 .../notifications/SingleQueueTaskManager.java   |  224 -
 .../services/notifications/TaskManager.java     |  218 +-
 .../services/notifications/TaskTracker.java     |    4 +-
 .../services/notifications/gcm/GCMAdapter.java  |   61 +-
 .../resources/usergrid-services-context.xml     |    9 +-
 .../cassandra/ManagementServiceIT.java          |    2 +-
 .../usergrid/services/TestQueueManager.java     |   65 +
 .../AbstractServiceNotificationIT.java          |   21 +-
 .../notifications/NotifiersServiceIT.java       |    1 +
 .../apns/NotificationsServiceIT.java            |   85 +-
 .../gcm/NotificationsServiceIT.java             |   30 +-
 .../src/test/resources/log4j.properties         |    4 +
 stack/test-utils/pom.xml                        |   17 +-
 stack/tools/README.md                           |   22 +-
 .../java/org/apache/usergrid/tools/ApiDoc.java  |    5 +-
 .../org/apache/usergrid/tools/IndexRebuild.java |  148 +-
 .../org/apache/usergrid/tools/ToolBase.java     |   26 +-
 stack/tools/src/main/resources/log4j.properties |   18 +-
 333 files changed, 23335 insertions(+), 15488 deletions(-)
----------------------------------------------------------------------



Mime
View raw message