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/02/06 22:20:43 UTC
[7/7] git commit: Merge 8112cecc6368a5f8ee0adde17229f66618b4ce4b into
2929f6008f84cb215bd22fb8bd6b1547c7b294f6
Merge 8112cecc6368a5f8ee0adde17229f66618b4ce4b into 2929f6008f84cb215bd22fb8bd6b1547c7b294f6
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fbeeaf19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fbeeaf19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fbeeaf19
Branch: refs/pull/30/merge
Commit: fbeeaf19b3ce058455b25f3218ab4a711d5559b2
Parents: 2929f60 8112cec
Author: Strong Liu <st...@hibernate.org>
Authored: Fri Feb 7 04:51:06 2014 +0800
Committer: Strong Liu <st...@hibernate.org>
Committed: Fri Feb 7 04:51:06 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/usergrid/batch/Job.java | 2 +-
.../src/main/java/org/usergrid/mq/Query.java | 7 +-
.../java/org/usergrid/mq/QueryFilterLexer.java | 3 +-
.../java/org/usergrid/mq/QueryFilterParser.java | 27 -----
.../java/org/usergrid/mq/QueryProcessor.java | 1 -
.../usergrid/persistence/CredentialsInfo.java | 2 +-
.../org/usergrid/persistence/Identifier.java | 5 +-
.../java/org/usergrid/persistence/Results.java | 2 -
.../java/org/usergrid/persistence/Schema.java | 116 +++++--------------
.../java/org/usergrid/persistence/Update.java | 2 +-
.../cassandra/CassandraPersistenceUtils.java | 2 +-
.../persistence/cassandra/CassandraService.java | 2 +-
.../cassandra/ConnectionRefImpl.java | 10 +-
.../cassandra/EntityManagerImpl.java | 10 +-
.../cassandra/RelationManagerImpl.java | 3 +-
.../usergrid/persistence/entities/JobStat.java | 7 +-
.../persistence/geo/GeoIndexSearcher.java | 14 +--
.../usergrid/persistence/geo/GeocellUtils.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 5 +-
.../query/ir/result/GeoIterator.java | 9 +-
.../persistence/query/tree/BooleanOperand.java | 5 -
.../persistence/query/tree/ContainsOperand.java | 16 ---
.../persistence/query/tree/EqualityOperand.java | 4 -
.../persistence/schema/DictionaryInfo.java | 1 -
.../usergrid/persistence/schema/EntityInfo.java | 16 +--
.../batch/ConcurrentSchedulerTestSuite.java | 2 +-
.../org/usergrid/batch/SchedulerTestSuite.java | 2 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 2 +-
.../count/BatchCountParallelismTest.java | 2 +-
.../org/usergrid/locking/zookeeper/ZooPut.java | 2 +-
.../usergrid/persistence/EntityManagerIT.java | 6 +-
.../launcher/ClasspathStaticHttpHandler.java | 9 +-
.../launcher/CustomJSPTemplateProcessor.java | 2 +-
.../main/java/org/usergrid/launcher/Server.java | 1 +
.../org/usergrid/mongo/protocol/OpQuery.java | 2 +-
.../usergrid/mongo/query/MongoQueryParser.java | 16 +--
stack/pom.xml | 2 +-
.../java/org/usergrid/rest/RootResource.java | 13 ++-
.../rest/applications/ApplicationResource.java | 2 +-
.../rest/applications/ServiceResource.java | 7 +-
.../rest/applications/users/UsersResource.java | 3 +-
.../organizations/OrganizationsResource.java | 3 +-
.../applications/ApplicationsResource.java | 3 +-
.../organizations/users/UsersResource.java | 9 +-
.../rest/management/users/UsersResource.java | 5 +-
.../organizations/OrganizationsResource.java | 5 +-
.../organizations/OrganizationResource.java | 9 +-
.../org/usergrid/rest/utils/JSONPUtils.java | 8 +-
.../org/usergrid/rest/utils/PathingUtils.java | 2 +-
.../collection/activities/AndOrQueryTest.java | 7 +-
.../queues/QueueResourceLong2IT.java | 8 +-
.../users/ConnectionResourceTest.java | 1 -
.../rest/management/RegistrationIT.java | 4 +-
.../organizations/OrganizationsResourceIT.java | 2 +-
.../usergrid/management/ActivationState.java | 2 +-
.../cassandra/ManagementServiceImpl.java | 13 +--
.../security/providers/FoursquareProvider.java | 2 +-
.../providers/PingIdentityProvider.java | 4 +-
.../security/shiro/CustomPermission.java | 5 +-
.../shiro/PrincipalCredentialsToken.java | 4 +-
.../java/org/usergrid/security/shiro/Realm.java | 6 +-
.../security/shiro/utils/SubjectUtils.java | 5 +-
.../tokens/cassandra/TokenServiceImpl.java | 31 +++--
.../org/usergrid/services/ServiceAction.java | 2 +-
.../java/org/usergrid/services/ServiceInfo.java | 2 +-
.../org/usergrid/services/ServiceManager.java | 9 +-
.../org/usergrid/services/ServiceRequest.java | 6 +-
.../applications/ApplicationsService.java | 9 +-
.../org/usergrid/NoExitSecurityManager.java | 2 +-
.../usergrid/cassandra/AvailablePortFinder.java | 2 +-
.../usergrid/cassandra/CassandraResource.java | 22 +---
71 files changed, 185 insertions(+), 355 deletions(-)
----------------------------------------------------------------------