usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [46/50] [abbrv] git commit: Merge 0d1588d45348564298260e29e047e211a06fb6e0 into 7dd337212529b920b07031d73b5521916bbe0ab9
Date Fri, 13 Jun 2014 18:54:25 GMT
Merge 0d1588d45348564298260e29e047e211a06fb6e0 into 7dd337212529b920b07031d73b5521916bbe0ab9


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

Branch: refs/pull/182/merge
Commit: bd2f138ed71e3c2dcd3e6a7aa9a34a131d509541
Parents: 7dd3372 0d1588d
Author: GERey <greyes@apigee.com>
Authored: Fri Jun 13 12:11:29 2014 +0000
Committer: GERey <greyes@apigee.com>
Committed: Fri Jun 13 12:11:29 2014 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/usergrid/mq/Query.java |   7 +-
 .../apache/usergrid/mq/QueryFilterLexer.java    |   3 +-
 .../apache/usergrid/mq/QueryFilterParser.java   |  27 +++++
 .../org/apache/usergrid/mq/QueryProcessor.java  |   1 +
 .../usergrid/persistence/CredentialsInfo.java   |   2 +-
 .../apache/usergrid/persistence/Identifier.java |  14 ++-
 .../apache/usergrid/persistence/Results.java    |   2 +
 .../org/apache/usergrid/persistence/Schema.java | 116 ++++++++++++++-----
 .../org/apache/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 |  18 ++-
 .../persistence/query/tree/EqualityOperand.java |   4 +
 .../persistence/schema/DictionaryInfo.java      |   1 +
 .../usergrid/persistence/schema/EntityInfo.java |  16 ++-
 .../batch/job/AbstractSchedulerRuntimeIT.java   |   2 +-
 .../count/BatchCountParallelismTest.java        |   2 +-
 .../usergrid/locking/zookeeper/ZooPut.java      |   2 +-
 .../usergrid/persistence/EntityManagerIT.java   |   6 +-
 .../launcher/ClasspathStaticHttpHandler.java    |   9 +-
 .../launcher/CustomJSPTemplateProcessor.java    |   2 +-
 .../org/apache/usergrid/launcher/Server.java    |   1 -
 .../apache/usergrid/mongo/protocol/OpQuery.java |   2 +-
 .../usergrid/mongo/query/MongoQueryParser.java  |  16 +--
 .../org/apache/usergrid/rest/RootResource.java  |  13 +--
 .../rest/applications/ApplicationResource.java  |   2 +-
 .../rest/applications/ServiceResource.java      |  15 ++-
 .../rest/applications/users/UsersResource.java  |   3 +-
 .../organizations/OrganizationsResource.java    |   3 +-
 .../applications/ApplicationsResource.java      |   3 +-
 .../organizations/users/UsersResource.java      |   9 +-
 .../rest/management/users/UsersResource.java    |   8 +-
 .../organizations/OrganizationsResource.java    |   5 +-
 .../organizations/OrganizationResource.java     |   9 +-
 .../apache/usergrid/rest/utils/JSONPUtils.java  |   8 +-
 .../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 +-
 .../cassandra/ManagementServiceImpl.java        |  14 ++-
 .../security/providers/FoursquareProvider.java  |   2 +-
 .../providers/PingIdentityProvider.java         |   4 +-
 .../security/shiro/CustomPermission.java        |   5 +-
 .../shiro/PrincipalCredentialsToken.java        |   4 +-
 .../apache/usergrid/security/shiro/Realm.java   |   6 +-
 .../security/shiro/utils/SubjectUtils.java      |   5 +-
 .../tokens/cassandra/TokenServiceImpl.java      |  31 ++---
 .../apache/usergrid/services/ServiceInfo.java   |   2 +-
 .../usergrid/services/ServiceManager.java       |   9 +-
 .../usergrid/services/ServiceRequest.java       |   6 +-
 .../applications/ApplicationsService.java       |   9 +-
 .../apache/usergrid/NoExitSecurityManager.java  |   2 +-
 .../usergrid/cassandra/AvailablePortFinder.java |   2 +-
 .../usergrid/cassandra/CassandraResource.java   |  22 +++-
 65 files changed, 367 insertions(+), 184 deletions(-)
----------------------------------------------------------------------



Mime
View raw message