usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rockers...@apache.org
Subject [01/18] incubator-usergrid git commit: [USERGRID-280] Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-280
Date Tue, 03 Mar 2015 20:38:23 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o b31088ac1 -> ebf6e1322


[USERGRID-280] Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into USERGRID-280

# By Todd Nine (75) and others
# Via Dave Johnson (31) and others
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (283 commits)
  Ignoring intermittently failing test
  Adding some feedback so you can tell that test is running and not just hanging.
  Tone down the DEBUG and TRACE level logging that we do during tests.
  Added fix for full use of virtual keyspaces and for token generation using the getKeyspace
method.
  updated collection IT
  fix compile issue
  Changes to allow us to fix the old tests that are broken because tests now share the same
C* keyspace, and some fixes to the old ApplicationResourceIT.
  Removes wait from progress observer, since this is no longer used.
  Removed all instances of virtual keyspaces
  Revert "Removed extraneous CF. Made the remaining code compile."
  Simple REST tests now working again with Tomcat embedded.
  Add jackson-xc back in.
  Add jackson-xc back in.
  Fixes startup order bug.
  Removed extraneous CF. Made the remaining code compile.
  Moving back to embedded Tomcat instead of Arquillian.
  Back off of Arquillian for now.
  Effort to use arquillian-suite-extension
  Adding some JVM options to help with the OOM PermGen problems, and removing all tests from
except for one (for now)
  changes to get REST tests working with Arquillian: - Add setenv.sh to set memory and debug
options for Tomcat - Make Arqillian profile active by default - Add shutdown hook to stop
job service when Usergrid is underplayed
  ...

Conflicts:
	stack/rest/src/test/resources/usergrid-custom-test.properties


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

Branch: refs/heads/two-dot-o
Commit: 06d1560843a7992643a83d114ec7328425227c7c
Parents: 0b5f598 567db37
Author: grey <greyes@apigee.com>
Authored: Thu Feb 26 10:18:24 2015 -0800
Committer: grey <greyes@apigee.com>
Committed: Thu Feb 26 10:18:24 2015 -0800

----------------------------------------------------------------------
 portal/bower.json                               |    2 +-
 portal/package.json                             |    2 +-
 stack/awscluster/src/main/cql/update_locks.cql  |    2 +-
 .../awscluster/src/main/cql/update_usergrid.cql |    2 +-
 .../main/cql/update_usergrid_applications.cql   |    2 +-
 .../main/dist/init_instance/init_rest_server.sh |   23 +-
 .../main/dist/init_instance/install_collectd.sh |  350 ++
 .../dist/init_instance/install_elasticsearch.sh |   12 +-
 .../main/dist/init_instance/update_keyspaces.sh |    9 +
 .../src/main/groovy/NodeRegistry.groovy         |   26 +
 .../src/main/groovy/configure_usergrid.groovy   |   29 +-
 .../src/main/groovy/create_dashboard.groovy     |   79 +
 .../src/main/groovy/wait_for_instances.groovy   |   20 +-
 stack/awscluster/ugcluster-cf.json              |   25 +-
 .../main/resources/usergrid-default.properties  |   15 +-
 stack/core/.test-tdoe-5thread.log.swp           |  Bin 28672 -> 0 bytes
 stack/core/pom.xml                              |  144 +-
 .../java/org/apache/usergrid/batch/Job.java     |    3 +-
 .../apache/usergrid/batch/JobExecutionImpl.java |   10 +
 .../org/apache/usergrid/batch/service/App.java  |   86 -
 .../usergrid/corepersistence/CoreModule.java    |  120 +
 .../corepersistence/CpEntityManager.java        |  244 +-
 .../corepersistence/CpEntityManagerFactory.java |  251 +-
 .../corepersistence/CpManagerCache.java         |   17 +-
 .../corepersistence/CpRelationManager.java      |   40 +-
 .../usergrid/corepersistence/CpSetup.java       |  242 +-
 .../usergrid/corepersistence/CpWalker.java      |  115 +-
 .../usergrid/corepersistence/GuiceFactory.java  |  154 +
 .../usergrid/corepersistence/GuiceModule.java   |   94 -
 .../HybridEntityManagerFactory.java             |  218 -
 .../usergrid/corepersistence/HybridSetup.java   |   72 -
 .../events/EntityDeletedHandler.java            |   16 +-
 .../events/EntityVersionCreatedHandler.java     |   20 +-
 .../events/EntityVersionDeletedHandler.java     |   18 +-
 .../corepersistence/util/CpEntityMapUtils.java  |   55 +-
 .../corepersistence/util/CpNamingUtils.java     |    3 +
 .../usergrid/persistence/EntityManager.java     |  110 +-
 .../persistence/EntityManagerFactory.java       |   46 +-
 .../persistence/cassandra/CassandraService.java |   71 +-
 .../cassandra/EntityManagerFactoryImpl.java     |   72 +-
 .../cassandra/EntityManagerImpl.java            |  100 +-
 .../usergrid/persistence/cassandra/Setup.java   |   20 +
 .../persistence/cassandra/SetupImpl.java        |   75 +-
 .../persistence/entities/FailedImport.java      |   64 +
 .../entities/FailedImportConnection.java        |   41 +
 .../entities/FailedImportEntity.java            |   35 +
 .../persistence/entities/FileImport.java        |  211 +
 .../usergrid/persistence/entities/Import.java   |  120 +
 .../OrganizationAlreadyExistsException.java     |   43 +
 .../exceptions/PersistenceException.java        |    2 +-
 .../org/apache/usergrid/utils/JsonUtils.java    |    6 +-
 .../main/resources/usergrid-core-context.xml    |   46 +-
 .../org/apache/usergrid/AbstractCoreIT.java     |   15 +-
 .../java/org/apache/usergrid/Application.java   |    3 +-
 .../org/apache/usergrid/CoreApplication.java    |   19 +-
 .../java/org/apache/usergrid/CoreITSetup.java   |    1 +
 .../org/apache/usergrid/CoreITSetupImpl.java    |   66 +-
 .../org/apache/usergrid/batch/AppArgsTest.java  |    3 -
 .../batch/BulkJobExecutionUnitTest.java         |    4 +-
 .../apache/usergrid/batch/BulkTestUtils.java    |    4 +-
 .../batch/ConcurrentSchedulerITSuite.java       |   47 -
 .../batch/ConcurrentSchedulerTestSuite.java     |   35 -
 .../usergrid/batch/UsergridJobFactoryTest.java  |    6 +-
 .../batch/job/AbstractSchedulerRuntimeIT.java   |   20 +-
 .../usergrid/batch/job/CountdownLatchJob.java   |    1 +
 .../usergrid/batch/job/DelayExecution.java      |    1 +
 .../usergrid/batch/job/DelayHeartbeat.java      |    1 +
 .../usergrid/batch/job/FailureJobExecution.java |    1 +
 .../usergrid/batch/job/OnlyOnceExceution.java   |    1 +
 .../job/OnlyOnceUnlockOnFailExceution.java      |    1 +
 .../usergrid/batch/job/SchedulerRuntime1IT.java |   32 +-
 .../usergrid/batch/job/SchedulerRuntime2IT.java |   45 +-
 .../usergrid/batch/job/SchedulerRuntime3IT.java |   13 +-
 .../usergrid/batch/job/SchedulerRuntime4IT.java |   11 +-
 .../usergrid/batch/job/SchedulerRuntime5IT.java |   11 +-
 .../usergrid/batch/job/SchedulerRuntime6IT.java |   13 +-
 .../usergrid/batch/job/SchedulerRuntime7IT.java |   11 +-
 .../usergrid/batch/job/SchedulerRuntime8IT.java |   17 +-
 .../batch/job/SchedulerRuntimeIntervalIT.java   |   25 +-
 .../usergrid/batch/job/TestJobListenerTest.java |    8 +-
 .../corepersistence/CpEntityMapUtilsTest.java   |   32 +-
 .../corepersistence/StaleIndexCleanupTest.java  |   96 +-
 .../corepersistence/TestGuiceModule.java        |   37 -
 .../migration/EntityDataMigrationIT.java        |   17 +-
 .../migration/EntityTypeMappingMigrationIT.java |   17 +-
 .../migration/GraphShardVersionMigrationIT.java |   12 +-
 .../migration/MigrationTestRule.java            |    6 +-
 .../rx/AllEntitiesInSystemObservableIT.java     |    6 +-
 .../rx/ApplicationObservableTestIT.java         |    9 +-
 .../rx/EdgesFromSourceObservableIT.java         |    9 +-
 .../rx/EdgesToTargetObservableIT.java           |   12 +-
 .../rx/TargetIdObservableTestIT.java            |   14 +-
 .../count/BatchCountParallelismTest.java        |   20 +-
 .../usergrid/count/SimpleBatcherTest.java       |    1 +
 .../locking/cassandra/HectorLockManagerIT.java  |   11 +-
 .../SingleNodeLockTestSingleNode.java           |    1 +
 .../zookeeper/ZookeeperLockManagerTest.java     |    5 +-
 .../java/org/apache/usergrid/mq/MessagesIT.java |   25 +-
 .../org/apache/usergrid/mq/QueuePathsTest.java  |    3 +-
 .../usergrid/persistence/CollectionIT.java      |   17 +-
 .../usergrid/persistence/CoreSchemaManager.java |   40 +-
 .../apache/usergrid/persistence/CounterIT.java  |   51 +-
 .../usergrid/persistence/CountingMutatorIT.java |   15 +-
 .../persistence/EntityConnectionsIT.java        |  125 +-
 .../persistence/EntityDictionaryIT.java         |   31 +-
 .../usergrid/persistence/EntityManagerIT.java   |   91 +-
 .../apache/usergrid/persistence/EntityTest.java |    4 +-
 .../org/apache/usergrid/persistence/GeoIT.java  |   34 +-
 .../persistence/GeoQueryBooleanTest.java        |   43 +-
 .../apache/usergrid/persistence/IndexIT.java    |   25 +-
 .../usergrid/persistence/LargeEntityIT.java     |    9 +-
 .../usergrid/persistence/PathQueryIT.java       |   17 +-
 .../persistence/PerformanceEntityReadTest.java  |   15 +-
 .../PerformanceEntityRebuildIndexTest.java      |  235 +-
 .../persistence/PerformanceEntityWriteTest.java |    3 +-
 .../usergrid/persistence/PermissionsIT.java     |   13 +-
 .../apache/usergrid/persistence/QueryTest.java  |   12 +-
 .../usergrid/persistence/QueryUtilsTest.java    |    3 +-
 .../apache/usergrid/persistence/SchemaTest.java |    6 +-
 .../apache/usergrid/persistence/UtilsTest.java  |    4 +-
 .../cassandra/EntityManagerFactoryImplIT.java   |  115 +-
 .../cassandra/QueryProcessorTest.java           |   41 +-
 .../SimpleIndexShardLocatorImplTest.java        |    4 +-
 ...EntityLocationRefDistanceComparatorTest.java |    1 +
 .../query/AbstractIteratingQueryIT.java         | 1336 -----
 .../persistence/query/AllInCollectionIT.java    |   29 -
 .../persistence/query/AllInConnectionIT.java    |   29 -
 .../query/AllInConnectionNoTypeIT.java          |   54 -
 .../persistence/query/CollectionIoHelper.java   |   61 +
 .../persistence/query/ConnectionHelper.java     |   85 +
 .../query/IntersectionTransitivePagingIT.java   |   17 +-
 .../query/IntersectionUnionPagingIT.java        |   27 +-
 .../usergrid/persistence/query/IoHelper.java    |   57 +
 .../persistence/query/IteratingQueryIT.java     | 1432 ++++++
 .../query/MultiOrderByCollectionIT.java         |   29 -
 .../MultiOrderByComplexUnionCollectionIT.java   |   29 -
 .../MultiOrderByComplexUnionConnectionIT.java   |   29 -
 .../query/MultiOrderByConnectionIT.java         |   32 -
 .../query/NotOrderByCollectionIT.java           |   29 -
 .../query/NotOrderByConnectionIT.java           |   29 -
 .../persistence/query/NotSubPropertyIT.java     |  157 +-
 ...gleOrderByBoundRangeScanAscCollectionIT.java |   29 -
 ...gleOrderByBoundRangeScanAscConnectionIT.java |   29 -
 ...leOrderByBoundRangeScanDescCollectionIT.java |   29 -
 ...leOrderByBoundRangeScanDescConnectionIT.java |   29 -
 ...eOrderByComplexIntersectionCollectionIT.java |   29 -
 ...eOrderByComplexIntersectionConnectionIT.java |   30 -
 .../SingleOrderByComplexUnionCollectionIT.java  |   29 -
 .../SingleOrderByComplexUnionConnectionIT.java  |   29 -
 .../SingleOrderByIntersectionCollectionIT.java  |   31 -
 .../SingleOrderByIntersectionConnectionIT.java  |   31 -
 .../SingleOrderByLessThanLimitCollectionIT.java |   29 -
 .../SingleOrderByLessThanLimitConnectionIT.java |   29 -
 .../SingleOrderByMaxLimitCollectionIT.java      |   30 -
 .../SingleOrderByMaxLimitConnectionIT.java      |   30 -
 ...SingleOrderByNoIntersectionCollectionIT.java |   29 -
 ...SingleOrderByNoIntersectionConnectionIT.java |   29 -
 .../query/SingleOrderByNotCollectionIT.java     |   29 -
 .../query/SingleOrderByNotConnectionIT.java     |   29 -
 ...OrderBySameRangeScanGreaterCollectionIT.java |   29 -
 ...OrderBySameRangeScanGreaterConnectionIT.java |   29 -
 ...meRangeScanGreaterThanEqualCollectionIT.java |   29 -
 ...gleOrderBySameRangeScanLessCollectionIT.java |   29 -
 ...gleOrderBySameRangeScanLessConnectionIT.java |   29 -
 ...ySameRangeScanLessThanEqualCollectionIT.java |   29 -
 ...ySameRangeScanLessThanEqualConnectionIT.java |   29 -
 .../query/ir/result/AbstractScanColumnTest.java |    1 +
 .../query/ir/result/InOrderIterator.java        |    9 +-
 .../ir/result/IntersectionIteratorTest.java     |    1 +
 .../ir/result/SubtractionIteratorTest.java      |    3 +-
 .../query/ir/result/UnionIteratorTest.java      |    3 +-
 .../system/UsergridSystemMonitorIT.java         |   10 +-
 .../usergrid/utils/ImmediateCounterRule.java    |   57 +
 .../apache/usergrid/utils/IndexUtilsTest.java   |    6 +-
 .../apache/usergrid/utils/UUIDUtilsTest.java    |   81 +-
 .../resources/usergrid-custom-test.properties   |   14 +-
 .../test/resources/usergrid-test-context.xml    |    6 +-
 .../cache/CachedEntityCollectionManager.java    |  136 +
 .../collection/cache/EntityCacheFig.java        |   44 +
 .../collection/guice/CollectionModule.java      |   14 +-
 .../EntityCollectionManagerFactoryImpl.java     |  158 +
 .../impl/EntityCollectionManagerImpl.java       |   32 +-
 .../collection/mvcc/stage/write/WriteStart.java |   31 +-
 .../EntityCollectionManagerFactoryTest.java     |    2 +-
 .../mvcc/stage/TestEntityGenerator.java         |   54 +-
 .../mvcc/stage/write/WriteStartTest.java        |   51 +-
 .../src/test/resources/log4j.properties         |    2 +-
 .../core/astyanax/AstyanaxKeyspaceProvider.java |    2 +-
 .../persistence/core/astyanax/CassandraFig.java |   10 +-
 .../migration/schema/MigrationManagerImpl.java  |    5 +
 .../common/src/test/resources/log4j.properties  |    6 +-
 .../graph/src/test/resources/log4j.properties   |    8 +-
 .../persistence/model/entity/Entity.java        |    5 +
 stack/corepersistence/pom.xml                   |    2 +-
 .../usergrid/persistence/index/EntityIndex.java |   12 +-
 .../index/impl/EsEntityIndexBatchImpl.java      |   29 +-
 .../index/impl/EsEntityIndexImpl.java           |   40 +-
 .../persistence/index/impl/IndexingUtils.java   |   12 +-
 .../usergrid/persistence/index/query/Query.java |   47 +-
 .../index/impl/ElasticSearchResource.java       |   52 +-
 .../persistence/index/impl/EntityIndexTest.java |   14 +-
 .../src/test/resources/log4j.properties         |    4 +-
 .../persistence/queue/DefaultQueueManager.java  |    6 +-
 .../persistence/queue/QueueMessage.java         |   10 +-
 .../queue/impl/QueueScopeFactoryImpl.java       |    1 +
 .../queue/impl/SQSQueueManagerImpl.java         |   56 +-
 .../queue/impl/UsergridAwsCredentials.java      |   75 +
 .../impl/UsergridAwsCredentialsProvider.java    |   59 +
 .../datagenerators/EntityDataGenerator.scala    |   17 +-
 .../datagenerators/FeederGenerator.scala        |   44 +-
 .../usergrid/scenarios/EntityScenarios.scala    |   26 +-
 .../org/apache/usergrid/settings/Settings.scala |    2 +
 .../PostCustomEntitySimulation.scala            |   35 +-
 .../PushNotificationTargetUserSimulation.scala  |    5 +-
 stack/mongo-emulator/pom.xml                    |   15 +-
 stack/pom.xml                                   |  658 +--
 stack/rest/README.md                            |   99 +
 stack/rest/README.txt                           |   60 -
 stack/rest/catalina_base/bin/setenv.sh          |    8 +
 stack/rest/catalina_base/conf/server.xml        |  144 +
 stack/rest/catalina_base/conf/tomcat-users.xml  |   36 +
 stack/rest/catalina_base/conf/web.xml           | 4614 ++++++++++++++++++
 .../lib/usergrid-deployment.properties          |  113 +
 .../webapps/host-manager/META-INF/context.xml   |   27 +
 .../webapps/host-manager/WEB-INF/jsp/401.jsp    |   70 +
 .../webapps/host-manager/WEB-INF/jsp/403.jsp    |   84 +
 .../webapps/host-manager/WEB-INF/jsp/404.jsp    |   61 +
 .../webapps/host-manager/WEB-INF/web.xml        |  144 +
 .../webapps/host-manager/images/add.gif         |  Bin 0 -> 1037 bytes
 .../webapps/host-manager/images/asf-logo.gif    |  Bin 0 -> 7279 bytes
 .../webapps/host-manager/images/code.gif        |  Bin 0 -> 394 bytes
 .../webapps/host-manager/images/design.gif      |  Bin 0 -> 608 bytes
 .../webapps/host-manager/images/docs.gif        |  Bin 0 -> 261 bytes
 .../webapps/host-manager/images/fix.gif         |  Bin 0 -> 345 bytes
 .../webapps/host-manager/images/tomcat.gif      |  Bin 0 -> 1934 bytes
 .../webapps/host-manager/images/update.gif      |  Bin 0 -> 627 bytes
 .../webapps/host-manager/images/void.gif        |  Bin 0 -> 43 bytes
 .../webapps/host-manager/index.jsp              |   18 +
 .../webapps/host-manager/manager.xml            |   26 +
 .../webapps/manager/META-INF/context.xml        |   27 +
 .../webapps/manager/WEB-INF/jsp/401.jsp         |   79 +
 .../webapps/manager/WEB-INF/jsp/403.jsp         |   94 +
 .../webapps/manager/WEB-INF/jsp/404.jsp         |   62 +
 .../manager/WEB-INF/jsp/sessionDetail.jsp       |  197 +
 .../manager/WEB-INF/jsp/sessionsList.jsp        |  172 +
 .../webapps/manager/WEB-INF/web.xml             |  209 +
 .../webapps/manager/images/add.gif              |  Bin 0 -> 1037 bytes
 .../webapps/manager/images/asf-logo.gif         |  Bin 0 -> 7279 bytes
 .../webapps/manager/images/code.gif             |  Bin 0 -> 394 bytes
 .../webapps/manager/images/design.gif           |  Bin 0 -> 608 bytes
 .../webapps/manager/images/docs.gif             |  Bin 0 -> 261 bytes
 .../webapps/manager/images/fix.gif              |  Bin 0 -> 345 bytes
 .../webapps/manager/images/tomcat.gif           |  Bin 0 -> 2066 bytes
 .../webapps/manager/images/update.gif           |  Bin 0 -> 627 bytes
 .../webapps/manager/images/void.gif             |  Bin 0 -> 43 bytes
 .../catalina_base/webapps/manager/index.jsp     |   18 +
 .../catalina_base/webapps/manager/status.xsd    |   84 +
 .../catalina_base/webapps/manager/xform.xsl     |  125 +
 stack/rest/catalina_base/webapps/portal         |    1 +
 .../manager/org/apache/jsp/index_jsp.java       |   83 +
 stack/rest/pom.xml                              |  211 +-
 .../usergrid/rest/AbstractContextResource.java  |   40 +-
 .../org/apache/usergrid/rest/ApiResponse.java   |   16 +
 .../org/apache/usergrid/rest/IndexResource.java |  118 +-
 .../usergrid/rest/JobServiceBoostrap.java       |   70 +
 .../org/apache/usergrid/rest/RootResource.java  |   25 +-
 .../apache/usergrid/rest/ShutdownListener.java  |   75 +
 .../rest/applications/ApplicationResource.java  |   72 +-
 .../rest/applications/ServiceResource.java      |   28 +-
 .../exceptions/NullArgumentExceptionMapper.java |   42 +
 .../usergrid/rest/filters/MeteringFilter.java   |    8 +-
 .../organizations/OrganizationResource.java     |   73 +-
 .../applications/ApplicationResource.java       |  142 +-
 .../applications/ApplicationsResource.java      |   29 +-
 .../imports/FileErrorsResource.java             |  143 +
 .../imports/FileIncludesResource.java           |  158 +
 .../applications/imports/ImportsResource.java   |  220 +
 .../security/SecuredResourceFilterFactory.java  |    2 +
 .../security/shiro/filters/SecurityFilter.java  |    3 +
 .../main/resources/usergrid-rest-context.xml    |    6 +-
 .../resources/usergrid-rest-deploy-context.xml  |    4 +-
 stack/rest/src/main/webapp/WEB-INF/web.xml      |   13 +-
 .../apache/usergrid/rest/AbstractRestIT.java    |  178 +-
 .../java/org/apache/usergrid/rest/BasicIT.java  |   69 +-
 .../usergrid/rest/ConcurrentRestITSuite.java    |   67 -
 .../usergrid/rest/DatabaseInitializer.java      |  146 -
 .../java/org/apache/usergrid/rest/ITSetup.java  |  157 +-
 .../apache/usergrid/rest/IndexResourceIT.java   |    2 +-
 .../apache/usergrid/rest/PartialUpdateTest.java |    2 +-
 .../org/apache/usergrid/rest/RestITSuite.java   |   64 -
 .../org/apache/usergrid/rest/SimplestTest.java  |   35 +
 .../apache/usergrid/rest/TomcatResource.java    |  402 --
 .../org/apache/usergrid/rest/TomcatRuntime.java |  192 +
 .../applications/ApplicationResourceIT.java     |  943 ++--
 .../applications/assets/AssetResourceIT.java    |    4 +-
 .../collection/BrowserCompatibilityTest.java    |   67 +-
 .../collection/CollectionsResourceIT.java       |  255 +-
 .../collection/DuplicateNameIT.java             |   64 +-
 .../activities/ActivityResourceIT.java          |    4 +-
 .../collection/devices/DevicesResourceIT.java   |    4 +-
 .../collection/groups/GroupResourceIT.java      |    8 +-
 .../collection/paging/PagingResourceIT.java     |    4 +-
 .../users/ConnectionResourceTest.java           |  272 +-
 .../collection/users/OwnershipResourceIT.java   |    4 +-
 .../collection/users/PermissionsResourceIT.java |    4 +-
 .../collection/users/RetrieveUsersTest.java     |    8 +-
 .../collection/users/UserResourceIT.java        |    4 +-
 .../events/ApplicationRequestCounterIT.java     |    4 +-
 .../applications/events/EventsResourceIT.java   |    7 +-
 .../queues/QueueResourceLong1IT.java            |    4 +-
 .../queues/QueueResourceLong2IT.java            |    4 +-
 .../queues/QueueResourceLong3IT.java            |    4 +-
 .../queues/QueueResourceShortIT.java            |    4 +-
 .../rest/filters/ContentTypeResourceIT.java     |    3 +-
 .../rest/management/ExportResourceIT.java       |   14 +-
 .../rest/management/ImportResourceIT.java       |  770 +++
 .../rest/management/ManagementResourceIT.java   |    4 +-
 .../rest/management/RegistrationIT.java         |    9 +-
 .../organizations/AdminEmailEncodingIT.java     |  163 +-
 .../test/resource2point0/AbstractRestIT.java    |   66 +-
 .../endpoints/ApplicationsResource.java         |    5 +
 .../endpoints/CollectionEndpoint.java           |   58 +-
 .../endpoints/EntityEndpoint.java               |    2 -
 .../endpoints/TokenResource.java                |   32 +-
 .../endpoints/mgmt/ApplicationResource.java     |   35 +-
 .../endpoints/mgmt/AuthorizeResource.java       |   59 +
 .../endpoints/mgmt/CredentialsResource.java     |   55 +
 .../endpoints/mgmt/ManagementResource.java      |   12 +-
 .../endpoints/mgmt/OrgResource.java             |    3 +
 .../endpoints/mgmt/OrganizationResource.java    |   49 +-
 .../endpoints/mgmt/TokenResource.java           |   48 +-
 .../test/resource2point0/model/Credentials.java |   47 +
 .../rest/test/resource2point0/model/Entity.java |   16 +-
 .../rest/test/resource2point0/model/Token.java  |   37 +-
 stack/rest/src/test/resources/arquillian.xml    |   39 +
 .../resources/corepersistence-UNIT.properties   |    2 +
 .../resources/testImportCorrect.testCol.1.json  |   18 +
 ...testImportInvalidJson.testApplication.3.json |  153 +
 .../resources/usergrid-custom-test.properties   |    3 +
 .../resources/usergrid-properties-context.xml   |   40 -
 .../resources/usergrid-rest-deploy-context.xml  |   13 +-
 .../test/resources/usergrid-test-context.xml    |  135 +-
 stack/services/pom.xml                          |   80 +-
 .../cassandra/ManagementServiceImpl.java        |    7 +-
 .../usergrid/management/export/ExportJob.java   |    6 +-
 .../management/export/ExportServiceImpl.java    |   43 +-
 .../usergrid/management/export/S3Export.java    |    7 -
 .../management/export/S3ExportImpl.java         |   64 +-
 .../management/importer/FileImportJob.java      |  123 +
 .../management/importer/FileImportTracker.java  |  319 ++
 .../usergrid/management/importer/ImportJob.java |  114 +
 .../management/importer/ImportService.java      |  133 +
 .../management/importer/ImportServiceImpl.java  | 1325 +++++
 .../usergrid/management/importer/S3Import.java  |   37 +
 .../management/importer/S3ImportImpl.java       |  137 +
 .../tokens/cassandra/TokenServiceImpl.java      |   14 +-
 .../apache/usergrid/services/ServiceInfo.java   |    5 +-
 .../services/assets/data/BinaryStore.java       |    3 +-
 .../services/assets/data/S3BinaryStore.java     |   18 +-
 .../usergrid/services/guice/ServiceModule.java  |   68 +
 .../notifications/NotificationsService.java     |    8 +-
 .../notifications/ProviderAdapterFactory.java   |    1 -
 .../services/notifications/QueueListener.java   |   27 +-
 .../services/queues/ImportQueueListener.java    |   91 +
 .../services/queues/ImportQueueManager.java     |   65 +
 .../services/queues/ImportQueueMessage.java     |   79 +
 .../usergrid/services/queues/QueueListener.java |  254 +
 .../resources/usergrid-services-context.xml     |  218 +-
 .../org/apache/usergrid/ServiceITSetup.java     |    7 +-
 .../org/apache/usergrid/ServiceITSetupImpl.java |   52 +-
 .../apache/usergrid/management/EmailFlowIT.java |   43 +-
 .../usergrid/management/OrganizationIT.java     |   46 +-
 .../org/apache/usergrid/management/RoleIT.java  |   15 +-
 .../cassandra/ApplicationCreatorIT.java         |   14 +-
 .../management/cassandra/ExportServiceIT.java   | 1048 ----
 .../cassandra/ManagementServiceIT.java          |   19 +-
 .../management/cassandra/MockS3ExportImpl.java  |   56 -
 .../management/export/ExportServiceIT.java      | 1116 +++++
 .../management/export/MockS3ExportImpl.java     |   56 +
 .../importer/FileImportTrackerTest.java         |  399 ++
 .../management/importer/ImportCollectionIT.java |  684 +++
 .../importer/ImportConnectionsTest.java         |  185 +
 .../management/importer/ImportServiceIT.java    |  674 +++
 .../management/importer/MockS3ImportImpl.java   |   42 +
 .../usergrid/management/importer/S3Upload.java  |  111 +
 .../security/providers/FacebookProviderIT.java  |   16 +-
 .../providers/PingIdentityProviderIT.java       |   14 +-
 .../security/tokens/TokenServiceIT.java         |   22 +-
 .../usergrid/services/AbstractServiceIT.java    |   14 +-
 .../usergrid/services/ActivitiesServiceIT.java  |    4 +-
 .../services/ApplicationsServiceIT.java         |    8 +-
 .../usergrid/services/CollectionServiceIT.java  |    4 +-
 .../usergrid/services/ConnectionsServiceIT.java |    6 +-
 .../usergrid/services/GroupServiceIT.java       |    4 +-
 .../usergrid/services/RolesServiceIT.java       |    8 +-
 .../usergrid/services/ServiceFactoryIT.java     |    4 +-
 .../usergrid/services/ServiceInvocationIT.java  |   45 +-
 .../usergrid/services/ServiceRequestIT.java     |   13 +-
 .../notifications/NotifiersServiceIT.java       |   21 +
 .../src/test/resources/log4j.properties         |   10 +-
 .../src/test/resources/project.properties       |    1 +
 .../resources/testImport.testApplication.2.json |   56 +
 .../resources/testImport.testCollection.1.json  |   13 +
 ...testImportInvalidJson.testApplication.3.json |  139 +
 .../resources/testimport-bad-connection.json    |   18 +
 .../src/test/resources/testimport-bad-json.json |   67 +
 .../src/test/resources/testimport-qtmagics.json |   66 +
 .../resources/testimport-with-connections.json  |  155 +
 .../resources/usergrid-custom-test.properties   |    5 +-
 .../test/resources/usergrid-test-context.xml    |  128 +-
 stack/test-utils/pom.xml                        |   46 +-
 .../apache/usergrid/NoExitSecurityManager.java  |   80 -
 .../usergrid/cassandra/CassandraMain.java       |   70 -
 .../usergrid/cassandra/CassandraResource.java   |  372 +-
 .../usergrid/cassandra/ClearShiroSubject.java   |   18 +
 .../apache/usergrid/cassandra/Concurrent.java   |   31 -
 .../cassandra/ConcurrentJunitRunner.java        |   91 -
 .../usergrid/cassandra/ConcurrentSuite.java     |  117 -
 .../usergrid/cassandra/SpringResource.java      |  110 +
 .../usergrid/lock/MultiProcessBarrier.java      |   77 +
 .../usergrid/lock/MultiProcessLocalLock.java    |  107 +
 .../setup/ConcurrentProcessSingleton.java       |  133 +
 .../cassandra/AnotherCassandraResourceIT.java   |   23 +-
 .../cassandra/CassandraResourceITSuite.java     |   41 -
 .../cassandra/CassandraResourceTest.java        |  115 -
 .../usergrid/cassandra/OkThisIsTheLastIT.java   |   27 +-
 .../usergrid/cassandra/SpringResourceTest.java  |   59 +
 .../YetAnotherCassandraResourceIT.java          |   86 -
 .../usergrid/lock/MultiProcessBarrierTest.java  |  136 +
 .../lock/MultiProcessLocalLockTest.java         |  118 +
 .../org/apache/usergrid/tools/IndexRebuild.java |   11 +-
 431 files changed, 24582 insertions(+), 10418 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/06d15608/stack/rest/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------


Mime
View raw message