Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ffaf1233 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ffaf1233 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ffaf1233 Branch: refs/heads/two-dot-o Commit: ffaf1233bd63cf5bc9d6c8a189202092b19625a3 Parents: 47cd79a 53e2ade Author: Alex Karasulu <[email protected]> Authored: Tue Jan 21 21:26:50 2014 +0200 Committer: Alex Karasulu <[email protected]> Committed: Tue Jan 21 21:26:50 2014 +0200 ---------------------------------------------------------------------- .../DynamicCompositeFieldSerializer.java | 5 +- .../IdColDynamicCompositeSerializer.java | 5 +- .../persistence/collection/CollectionScope.java | 18 ++++++ .../collection/EntityCollectionManager.java | 18 ++++++ .../EntityCollectionManagerFactory.java | 52 +++++++++++++----- .../collection/EntityCollectionManagerSync.java | 20 ++++++- .../collection/OrganizationScope.java | 18 ++++++ .../astyanax/AstyanaxKeyspaceProvider.java | 18 ++++++ .../collection/astyanax/CassandraFig.java | 18 ++++++ .../astyanax/CompositeFieldSerializer.java | 18 ++++++ .../astyanax/IdRowCompositeSerializer.java | 18 ++++++ .../astyanax/MultiTennantColumnFamily.java | 21 ++++++- .../MultiTennantColumnFamilyDefinition.java | 18 ++++++ .../collection/astyanax/ScopedRowKey.java | 22 +++++++- .../collection/guice/PropertyUtils.java | 18 ++++++ .../collection/impl/CollectionScopeImpl.java | 18 ++++++ .../impl/EntityCollectionManagerImpl.java | 18 ++++++ .../impl/EntityCollectionManagerSyncImpl.java | 18 ++++++ .../collection/migration/Migration.java | 18 ++++++ .../migration/MigrationException.java | 18 ++++++ .../collection/migration/MigrationManager.java | 18 ++++++ .../mvcc/MvccEntitySerializationStrategy.java | 18 ++++++ .../mvcc/MvccLogEntrySerializationStrategy.java | 18 ++++++ .../collection/mvcc/entity/MvccEntity.java | 18 ++++++ .../collection/mvcc/entity/MvccLogEntry.java | 18 ++++++ .../collection/mvcc/entity/Stage.java | 18 ++++++ .../collection/mvcc/entity/ValidationUtils.java | 18 ++++++ .../mvcc/entity/impl/MvccEntityImpl.java | 21 ++++++- .../mvcc/entity/impl/MvccLogEntryImpl.java | 18 ++++++ .../mvcc/event/PostProcessObserver.java | 21 ++++++- .../mvcc/stage/CollectionIoEvent.java | 19 ++++++- .../mvcc/stage/delete/DeleteCommit.java | 46 +++++++++++----- .../mvcc/stage/delete/DeleteStart.java | 31 +++++++++-- .../collection/mvcc/stage/load/Load.java | 30 ++++++++-- .../mvcc/stage/write/UniqueValueImpl.java | 2 +- .../collection/rx/CassandraThreadScheduler.java | 44 ++++++++++----- .../persistence/collection/rx/Concurrent.java | 42 ++++++++++---- .../persistence/collection/rx/RxFig.java | 18 ++++++ .../model/builder/EntitySerializer.java | 19 ++++++- .../model/builder/EntitySerializerFactory.java | 20 ++++++- .../persistence/model/entity/Entity.java | 22 ++++++-- .../usergrid/persistence/model/entity/Id.java | 18 ++++++ .../persistence/model/entity/SimpleId.java | 18 ++++++ .../persistence/model/field/ArrayField.java | 48 ++++++++++------ .../persistence/model/field/BooleanField.java | 2 - .../model/field/ByteBufferField.java | 40 ++++++++++---- .../persistence/model/field/DoubleField.java | 2 - .../model/field/EntityObjectField.java | 33 ++++++++--- .../usergrid/persistence/model/field/Field.java | 24 ++++++-- .../persistence/model/field/IntegerField.java | 2 - .../persistence/model/field/ListField.java | 44 ++++++++++----- .../persistence/model/field/LocationField.java | 36 +++++++++--- .../persistence/model/field/SetField.java | 44 ++++++++++----- .../model/field/value/EntityObject.java | 58 +++++++++++++------- .../persistence/model/field/value/Location.java | 39 ++++++++----- .../usergrid/persistence/model/util/Verify.java | 21 ++++++- stack/rest/pom.xml | 8 +-- stack/rest/src/test/resources/log4j.properties | 2 +- 58 files changed, 1085 insertions(+), 210 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ffaf1233/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/astyanax/AstyanaxKeyspaceProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ffaf1233/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/astyanax/CassandraFig.java ----------------------------------------------------------------------
