You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/22 22:42:56 UTC
[10/13] git commit: Merge branch 'master' into DPS-1123
Merge branch 'master' into DPS-1123
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/29c8c7b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/29c8c7b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/29c8c7b5
Branch: refs/heads/master
Commit: 29c8c7b5e85087b63cd4669cded0c0b54037b1c7
Parents: faa2c9e bac5259
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Aug 6 10:13:00 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Aug 6 10:13:00 2014 -0600
----------------------------------------------------------------------
.gitignore | 7 +
README.md | 20 +-
portal/Gruntfile.js | 25 +-
portal/archive/config.js | 72 +
portal/archive/index.html | 1 +
portal/bower.json | 4 +-
portal/config.js | 2 +-
portal/css/dash.min.css | 2 +-
portal/css/main.css | 10 +
portal/dist/usergrid-portal.2.0.3.zip | Bin 16280571 -> 0 bytes
portal/dist/usergrid-portal/archive/config.js | 72 +
portal/dist/usergrid-portal/archive/index.html | 1 +
.../bower_components/angular/angular-csp.css | 2 +-
.../bower_components/angular/angular.js | 3333 +++++++++++-------
.../bower_components/angular/angular.min.js | 421 +--
.../angular/angular.min.js.gzip | Bin 38793 -> 40453 bytes
.../bower_components/angular/angular.min.js.map | 6 +-
.../bower_components/angular/bower.json | 2 +-
.../jquery-waypoints/CHANGELOG.md | 10 +
.../jquery-waypoints/bower.json | 2 +-
.../jquery-waypoints/package.json | 2 +-
.../infinite-scroll/waypoints-infinite.js | 45 +-
.../infinite-scroll/waypoints-infinite.min.js | 6 +-
.../sticky-elements/waypoints-sticky.js | 24 +-
.../sticky-elements/waypoints-sticky.min.js | 6 +-
.../jquery-waypoints/waypoints.js | 15 +-
.../jquery-waypoints/waypoints.min.js | 8 +-
.../bower_components/jquery/bower.json | 4 +-
.../bower_components/jquery/dist/jquery.js | 88 +-
.../bower_components/jquery/dist/jquery.min.js | 8 +-
.../bower_components/jquery/dist/jquery.min.map | 2 +-
.../bower_components/jquery/src/css.js | 2 +-
.../bower_components/jquery/src/data.js | 12 +-
.../bower_components/jquery/src/effects.js | 8 +-
.../jquery/src/sizzle/dist/sizzle.js | 60 +-
.../jquery/src/sizzle/dist/sizzle.min.js | 4 +-
.../jquery/src/sizzle/dist/sizzle.min.map | 2 +-
portal/dist/usergrid-portal/config.js | 2 +-
portal/dist/usergrid-portal/css/dash.min.css | 2 +-
portal/dist/usergrid-portal/css/main.css | 10 +
portal/dist/usergrid-portal/index-debug.html | 22 +-
portal/dist/usergrid-portal/index-template.html | 22 +-
portal/dist/usergrid-portal/index.html | 22 +-
.../js/libs/usergrid-libs.min.js | 8 +-
.../usergrid-portal/js/libs/usergrid.sdk.js | 38 +-
.../dist/usergrid-portal/js/usergrid-dev.min.js | 263 +-
portal/dist/usergrid-portal/js/usergrid.min.js | 10 +-
portal/index-template.html | 12 +-
portal/js/app.js | 14 +-
portal/js/data/data-controller.js | 18 +-
portal/js/data/data.html | 38 +-
portal/js/data/display-generic.html | 7 +-
portal/js/global/appswitcher-template.html | 8 +-
portal/js/global/help-service.js | 154 +-
portal/js/global/page-controller.js | 11 +
portal/js/global/ug-service.js | 20 +-
portal/js/groups/groups-details.html | 6 +-
portal/js/groups/groups-members.html | 1 +
portal/js/groups/groups-roles.html | 11 +-
portal/js/groups/groups.html | 30 +-
portal/js/libs/usergrid.sdk.js | 38 +-
portal/js/menu.html | 2 +-
portal/js/menus/menu-directives.js | 100 +-
portal/js/profile/organizations.html | 3 +-
portal/js/profile/profile.html | 2 +
portal/js/roles/roles-groups.html | 1 +
portal/js/roles/roles-settings.html | 9 +-
portal/js/roles/roles-tabs.html | 3 +-
portal/js/roles/roles-users.html | 1 +
portal/js/roles/roles.html | 21 +-
portal/js/users/users-activities.html | 4 +-
portal/js/users/users-graph.html | 5 +-
portal/js/users/users-groups.html | 3 +-
portal/js/users/users-profile.html | 13 +-
portal/js/users/users-roles.html | 12 +-
portal/js/users/users.html | 36 +-
portal/package.json | 4 +-
portal/tests/protractorConf.js | 4 +-
sdks/android/pom.xml | 16 -
.../apache/usergrid/android/client/Client.java | 464 ++-
.../client/callbacks/ApiResponseCallback.java | 16 -
.../client/callbacks/ClientAsyncTask.java | 16 -
.../client/callbacks/ClientCallback.java | 16 -
.../callbacks/DeviceRegistrationCallback.java | 16 -
.../callbacks/GroupsRetrievedCallback.java | 16 -
.../client/callbacks/QueryResultsCallback.java | 16 -
.../android/client/utils/DeviceUuidFactory.java | 16 -
.../android/client/utils/ObjectUtils.java | 16 -
sdks/html5-javascript/Gruntfile.js | 49 +-
sdks/html5-javascript/README.md | 76 +-
.../extensions/usergrid.validation.js | 18 +
sdks/html5-javascript/lib/modules/Asset.js | 188 +-
sdks/html5-javascript/lib/modules/Client.js | 26 +-
sdks/html5-javascript/lib/modules/Collection.js | 20 +
sdks/html5-javascript/lib/modules/Counter.js | 20 +
sdks/html5-javascript/lib/modules/Entity.js | 201 +-
sdks/html5-javascript/lib/modules/Error.js | 18 +
sdks/html5-javascript/lib/modules/Folder.js | 19 +
sdks/html5-javascript/lib/modules/Group.js | 22 +-
sdks/html5-javascript/lib/modules/util/Ajax.js | 21 +
.../html5-javascript/lib/modules/util/Logger.js | 21 +
.../lib/modules/util/Promise.js | 21 +
sdks/html5-javascript/tests/mocha/test.js | 34 +-
sdks/html5-javascript/usergrid.js | 344 +-
sdks/html5-javascript/usergrid.min.js | 26 +-
sdks/nodejs/.gitignore | 3 +-
sdks/nodejs/lib/usergrid.js | 168 +-
sdks/nodejs/package.json | 2 +-
sdks/nodejs/readme.md | 2 +-
sdks/perl/.travis.yml | 1 +
sdks/perl/Build.PL | 30 +
sdks/perl/LICENSE | 202 ++
sdks/perl/MANIFEST | 23 +
sdks/perl/Makefile.PL | 25 +
sdks/perl/README.md | 341 ++
sdks/perl/examples/books.pl | 32 +
sdks/perl/lib/Usergrid/Client.pm | 492 +++
sdks/perl/lib/Usergrid/Collection.pm | 212 ++
sdks/perl/lib/Usergrid/Entity.pm | 92 +
sdks/perl/lib/Usergrid/Request.pm | 249 ++
sdks/perl/t/01_init.t | 11 +
sdks/perl/t/02_login.t | 48 +
sdks/perl/t/03_update.t | 86 +
sdks/perl/t/04_collection.t | 88 +
sdks/perl/t/05_query.t | 92 +
sdks/perl/t/06_batch_update.t | 91 +
sdks/perl/t/07_batch_delete.t | 71 +
sdks/perl/t/08_connections.t | 78 +
sdks/perl/t/09_paging.t | 124 +
sdks/perl/t/10_auto_paging.t | 78 +
sdks/php/lib/vendor/Apache/Usergrid/Entity.php | 17 +-
sdks/ruby-on-rails/README.md | 7 +
sdks/ruby/Gemfile | 15 +
sdks/ruby/LICENSE | 27 +-
sdks/ruby/README.md | 33 +-
sdks/ruby/Rakefile | 15 +
sdks/ruby/lib/usergrid/core/application.rb | 15 +
sdks/ruby/lib/usergrid/core/collection.rb | 15 +
sdks/ruby/lib/usergrid/core/entity.rb | 15 +
sdks/ruby/lib/usergrid/core/management.rb | 15 +
sdks/ruby/lib/usergrid/core/organization.rb | 15 +
sdks/ruby/lib/usergrid/core/resource.rb | 15 +
sdks/ruby/lib/usergrid/extensions/hash.rb | 15 +
sdks/ruby/lib/usergrid/extensions/response.rb | 15 +
sdks/ruby/lib/usergrid/version.rb | 15 +
sdks/ruby/lib/usergrid_iron.rb | 15 +
sdks/ruby/spec/spec_helper.rb | 15 +
sdks/ruby/spec/spec_settings.yaml | 15 +
.../ruby/spec/usergrid/core/application_spec.rb | 15 +
sdks/ruby/spec/usergrid/core/collection_spec.rb | 15 +
sdks/ruby/spec/usergrid/core/entity_spec.rb | 15 +
sdks/ruby/spec/usergrid/core/management_spec.rb | 15 +
.../spec/usergrid/core/organization_spec.rb | 15 +
sdks/ruby/spec/usergrid/core/resource_spec.rb | 15 +
sdks/ruby/spec/usergrid/extensions/hash_spec.rb | 15 +
sdks/ruby/usergrid_iron.gemspec | 16 +
.../main/resources/usergrid-default.properties | 7 +-
stack/config/src/test/resources/log4j.xml | 40 -
stack/core/pom.xml | 22 +
.../java/org/apache/usergrid/batch/Job.java | 12 +-
.../org/apache/usergrid/batch/JobFactory.java | 2 +-
.../usergrid/batch/UsergridJobFactory.java | 6 +-
.../batch/service/JobSchedulerService.java | 302 +-
.../usergrid/count/CassandraCounterStore.java | 4 +-
.../org/apache/usergrid/count/common/Count.java | 2 -
.../apache/usergrid/metrics/MetricsFactory.java | 113 +
.../main/java/org/apache/usergrid/mq/Query.java | 21 +-
.../apache/usergrid/mq/QueryFilterLexer.java | 3 +-
.../apache/usergrid/mq/QueryFilterParser.java | 27 -
.../org/apache/usergrid/mq/QueryProcessor.java | 1 -
.../usergrid/mq/cassandra/CassandraMQUtils.java | 14 +-
.../mq/cassandra/MessageIndexUpdate.java | 15 +-
.../mq/cassandra/QueueManagerFactoryImpl.java | 15 +-
.../usergrid/mq/cassandra/QueueManagerImpl.java | 13 +-
.../mq/cassandra/io/AbstractSearch.java | 8 +-
.../mq/cassandra/io/ConsumerTransaction.java | 2 +-
.../usergrid/mq/cassandra/io/EndSearch.java | 12 +-
.../usergrid/mq/cassandra/io/FilterSearch.java | 1 +
.../usergrid/mq/cassandra/io/StartSearch.java | 7 -
.../usergrid/persistence/AbstractEntity.java | 8 +-
.../usergrid/persistence/CounterQuery.java | 27 +-
.../usergrid/persistence/CredentialsInfo.java | 2 +-
.../usergrid/persistence/EntityManager.java | 54 +-
.../apache/usergrid/persistence/Identifier.java | 8 +-
.../persistence/MultiQueryIterator.java | 6 +-
.../persistence/ObservableIterator.java | 82 +
.../persistence/PagingResultsIterator.java | 7 +-
.../apache/usergrid/persistence/PathQuery.java | 4 +-
.../apache/usergrid/persistence/Results.java | 2 -
.../usergrid/persistence/ResultsIterator.java | 30 +
.../org/apache/usergrid/persistence/Schema.java | 116 +-
.../org/apache/usergrid/persistence/Update.java | 2 +-
.../cassandra/CassandraPersistenceUtils.java | 11 +-
.../cassandra/ConnectionRefImpl.java | 10 +-
.../persistence/cassandra/CounterUtils.java | 16 +-
.../cassandra/EntityManagerFactoryImpl.java | 20 +-
.../cassandra/EntityManagerImpl.java | 29 +-
.../cassandra/RelationManagerImpl.java | 22 +-
.../persistence/cassandra/Serializers.java | 43 +
.../usergrid/persistence/entities/JobStat.java | 7 +-
.../persistence/geo/GeoIndexSearcher.java | 40 +-
.../usergrid/persistence/geo/GeocellUtils.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 5 +-
.../ir/result/ConnectionTypesIterator.java | 9 +-
.../query/ir/result/GeoIterator.java | 19 +-
.../query/ir/result/OrderByIterator.java | 9 +-
.../query/ir/result/UUIDIndexSliceParser.java | 8 +-
.../query/ir/result/UnionIterator.java | 10 +-
.../persistence/query/tree/BooleanOperand.java | 5 -
.../persistence/query/tree/ContainsOperand.java | 18 +-
.../persistence/query/tree/EqualityOperand.java | 4 -
.../persistence/schema/CollectionInfo.java | 3 +-
.../persistence/schema/DictionaryInfo.java | 2 -
.../usergrid/persistence/schema/EntityInfo.java | 17 +-
.../main/resources/usergrid-core-context.xml | 3 +
.../apache/usergrid/batch/BulkTestUtils.java | 10 +-
.../usergrid/batch/UsergridJobFactoryTest.java | 3 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 2 +-
.../usergrid/batch/job/CountdownLatchJob.java | 6 +
.../usergrid/batch/job/DelayExecution.java | 6 +
.../usergrid/batch/job/DelayHeartbeat.java | 6 +
.../batch/job/FailureJobExceuction.java | 74 -
.../usergrid/batch/job/FailureJobExecution.java | 87 +
.../usergrid/batch/job/OnlyOnceExceution.java | 6 +
.../job/OnlyOnceUnlockOnFailExceution.java | 6 +
.../usergrid/batch/job/SchedulerRuntime1IT.java | 5 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 13 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 34 +-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 11 +-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 4 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 8 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 11 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 4 +-
.../batch/job/SchedulerRuntimeIntervalIT.java | 115 +
.../usergrid/batch/job/TestJobListener.java | 67 +-
.../usergrid/batch/job/TestJobListenerTest.java | 7 +-
.../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 +-
stack/pom.xml | 21 +-
.../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 | 17 +-
.../rest/management/users/UsersResource.java | 21 +-
.../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/ExportResourceIT.java | 130 +-
.../rest/management/RegistrationIT.java | 4 +-
.../organizations/OrganizationsResourceIT.java | 34 +-
stack/services/pom.xml | 5 -
.../management/AccountCreationProps.java | 6 +-
.../cassandra/ManagementServiceImpl.java | 31 +-
.../usergrid/management/export/ExportJob.java | 6 +
.../management/export/ExportServiceImpl.java | 5 +
.../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 | 82 +-
.../apache/usergrid/services/ServiceInfo.java | 2 +-
.../usergrid/services/ServiceManager.java | 9 +-
.../usergrid/services/ServiceRequest.java | 6 +-
.../applications/ApplicationsService.java | 9 +-
.../apache/usergrid/management/EmailFlowIT.java | 22 +-
.../usergrid/services/ConnectionsServiceIT.java | 27 +
.../usergrid/services/ServiceInvocationIT.java | 66 +
.../apache/usergrid/NoExitSecurityManager.java | 2 +-
.../usergrid/cassandra/AvailablePortFinder.java | 2 +-
.../usergrid/cassandra/CassandraResource.java | 22 +-
.../org/apache/usergrid/tools/AppAudit.java | 3 -
.../apache/usergrid/tools/EntityCleanup.java | 3 +-
.../usergrid/tools/EntityInsertBenchMark.java | 4 +-
.../usergrid/tools/EntityReadBenchMark.java | 14 +-
.../org/apache/usergrid/tools/EntityUpdate.java | 4 -
.../org/apache/usergrid/tools/IndexRebuild.java | 2 -
.../apache/usergrid/tools/ResetSuperUser.java | 2 -
.../usergrid/tools/UniqueIndexCleanup.java | 3 +-
ugc/Gemfile.lock | 18 +-
ugc/bin/ugc | 4 +-
ugc/lib/ugc/commands/put.rb | 2 +-
ugc/lib/ugc/version.rb | 2 +-
297 files changed, 9057 insertions(+), 3540 deletions(-)
----------------------------------------------------------------------