Merge branch 'two-dot-o-rest-refactor' of github.com:apache/incubator-usergrid into two-dot-o-rest-refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c41e920b Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c41e920b Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c41e920b Branch: refs/heads/two-dot-o-rest-refactor Commit: c41e920bbd317ffb1b183c7d2927ee7f07160c76 Parents: cc08a04 66b8ecb Author: amuramoto <[email protected]> Authored: Wed Sep 17 14:52:59 2014 -0700 Committer: amuramoto <[email protected]> Committed: Wed Sep 17 14:52:59 2014 -0700 ---------------------------------------------------------------------- .../usergrid/rest/ConcurrentRestITSuite.java | 12 +- .../org/apache/usergrid/rest/RestITSuite.java | 9 +- .../usergrid/rest/management/AccessTokenIT.java | 81 ++++ .../rest/management/ApplicationsIT.java | 251 +++++++++++++ .../rest/management/ManagementResourceIT.java | 284 -------------- .../rest/management/OrganizationsIT.java | 191 ++++++++++ .../rest/management/RegistrationIT.java | 369 ------------------- .../organizations/AdminEmailEncodingIT.java | 119 ------ .../applications/ApplicationsIT.java | 91 ----- 9 files changed, 529 insertions(+), 878 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c41e920b/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java ---------------------------------------------------------------------- diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java index c6d2705,9a404bf..39a1eed --- a/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java @@@ -23,23 -23,19 +23,19 @@@ import org.junit.runners.Suite import org.apache.usergrid.cassandra.CassandraResource; import org.apache.usergrid.cassandra.Concurrent; import org.apache.usergrid.cassandra.ConcurrentSuite; -import org.apache.usergrid.rest.applications.ApplicationRequestCounterIT; +import org.apache.usergrid.rest.applications.events.ApplicationRequestCounterIT; import org.apache.usergrid.rest.applications.ApplicationResourceIT; -import org.apache.usergrid.rest.applications.DevicesResourceIT; +import org.apache.usergrid.rest.applications.collection.devices.DevicesResourceIT; import org.apache.usergrid.rest.applications.assets.AssetResourceIT; -import org.apache.usergrid.rest.applications.collection.PagingResourceIT; +import org.apache.usergrid.rest.applications.collection.paging.PagingResourceIT; import org.apache.usergrid.rest.applications.events.EventsResourceIT; -import org.apache.usergrid.rest.applications.users.ActivityResourceIT; -import org.apache.usergrid.rest.applications.users.CollectionsResourceIT; -import org.apache.usergrid.rest.applications.users.GroupResourceIT; -import org.apache.usergrid.rest.applications.users.OwnershipResourceIT; -import org.apache.usergrid.rest.applications.users.PermissionsResourceIT; -import org.apache.usergrid.rest.applications.users.UserResourceIT; +import org.apache.usergrid.rest.applications.collection.activities.ActivityResourceIT; +import org.apache.usergrid.rest.applications.collection.CollectionsResourceIT; +import org.apache.usergrid.rest.applications.collection.groups.GroupResourceIT; +import org.apache.usergrid.rest.applications.collection.users.OwnershipResourceIT; +import org.apache.usergrid.rest.applications.collection.users.PermissionsResourceIT; +import org.apache.usergrid.rest.applications.collection.users.UserResourceIT; import org.apache.usergrid.rest.filters.ContentTypeResourceIT; - import org.apache.usergrid.rest.management.ManagementResourceIT; - import org.apache.usergrid.rest.management.RegistrationIT; - import org.apache.usergrid.rest.management.organizations.AdminEmailEncodingIT; - import org.apache.usergrid.rest.management.users.organizations.UsersOrganizationsResourceIT; @RunWith(ConcurrentSuite.class) http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c41e920b/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java ---------------------------------------------------------------------- diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java index a28fa89,7630bb1..d4b15c4 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java @@@ -22,20 -22,18 +22,18 @@@ import org.junit.runner.RunWith import org.junit.runners.Suite; import org.apache.usergrid.cassandra.CassandraResource; import org.apache.usergrid.cassandra.Concurrent; -import org.apache.usergrid.rest.applications.ApplicationRequestCounterIT; -import org.apache.usergrid.rest.applications.DevicesResourceIT; +import org.apache.usergrid.rest.applications.events.ApplicationRequestCounterIT; +import org.apache.usergrid.rest.applications.collection.devices.DevicesResourceIT; import org.apache.usergrid.rest.applications.assets.AssetResourceIT; -import org.apache.usergrid.rest.applications.collection.PagingResourceIT; +import org.apache.usergrid.rest.applications.collection.paging.PagingResourceIT; import org.apache.usergrid.rest.applications.events.EventsResourceIT; -import org.apache.usergrid.rest.applications.users.ActivityResourceIT; -import org.apache.usergrid.rest.applications.users.CollectionsResourceIT; -import org.apache.usergrid.rest.applications.users.GroupResourceIT; -import org.apache.usergrid.rest.applications.users.OwnershipResourceIT; -import org.apache.usergrid.rest.applications.users.PermissionsResourceIT; -import org.apache.usergrid.rest.applications.users.UserResourceIT; +import org.apache.usergrid.rest.applications.collection.activities.ActivityResourceIT; +import org.apache.usergrid.rest.applications.collection.CollectionsResourceIT; +import org.apache.usergrid.rest.applications.collection.groups.GroupResourceIT; +import org.apache.usergrid.rest.applications.collection.users.OwnershipResourceIT; +import org.apache.usergrid.rest.applications.collection.users.PermissionsResourceIT; +import org.apache.usergrid.rest.applications.collection.users.UserResourceIT; import org.apache.usergrid.rest.filters.ContentTypeResourceIT; - import org.apache.usergrid.rest.management.organizations.AdminEmailEncodingIT; - import org.apache.usergrid.rest.management.users.organizations.UsersOrganizationsResourceIT; @RunWith(Suite.class) @Suite.SuiteClasses(
