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/09/25 19:36:13 UTC
git commit: Fix a couple of problems with a recent PR,
a compile problem and missing ASF headers. This closes #77
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o ef7964b89 -> 4c9b6952d
Fix a couple of problems with a recent PR, a compile problem and missing ASF headers. This closes #77
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4c9b6952
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4c9b6952
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4c9b6952
Branch: refs/heads/two-dot-o
Commit: 4c9b6952d7a37801481689bd2ad6816530964f44
Parents: ef7964b
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Sep 25 13:36:01 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Sep 25 13:36:01 2014 -0400
----------------------------------------------------------------------
.../usergrid/rest/ConcurrentRestITSuite.java | 33 ++++++++++++--------
.../org/apache/usergrid/rest/RestITSuite.java | 25 +++++++++------
.../usergrid/rest/management/AccessTokenIT.java | 17 ++++++++++
.../usergrid/rest/management/AdminUsersIT.java | 19 +++++++++--
.../rest/management/OrganizationsIT.java | 16 ++++++++++
5 files changed, 86 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4c9b6952/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java b/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java
index c6d2705..1c1c073 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/ConcurrentRestITSuite.java
@@ -16,7 +16,6 @@
*/
package org.apache.usergrid.rest;
-
import org.junit.ClassRule;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -39,22 +38,30 @@ 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)
-@Suite.SuiteClasses(
- {
- ActivityResourceIT.class, AdminEmailEncodingIT.class, ApplicationRequestCounterIT.class,
- ApplicationResourceIT.class, AssetResourceIT.class, BasicIT.class, CollectionsResourceIT.class,
- ContentTypeResourceIT.class, DevicesResourceIT.class, EventsResourceIT.class, GroupResourceIT.class,
- MUUserResourceIT.class, ManagementResourceIT.class, OrganizationResourceIT.class,
- OrganizationsResourceIT.class, OwnershipResourceIT.class, PagingResourceIT.class,
- PermissionsResourceIT.class, RegistrationIT.class, UserResourceIT.class,
- UsersOrganizationsResourceIT.class
- })
+@Suite.SuiteClasses({
+ ActivityResourceIT.class,
+ AdminEmailEncodingIT.class,
+ ApplicationRequestCounterIT.class,
+ ApplicationResourceIT.class,
+ AssetResourceIT.class,
+ BasicIT.class,
+ CollectionsResourceIT.class,
+ ContentTypeResourceIT.class,
+ DevicesResourceIT.class,
+ EventsResourceIT.class,
+ GroupResourceIT.class,
+ ManagementResourceIT.class,
+ OwnershipResourceIT.class,
+ PagingResourceIT.class,
+ PermissionsResourceIT.class,
+ RegistrationIT.class,
+ UserResourceIT.class
+})
@Concurrent()
public class ConcurrentRestITSuite {
+
@ClassRule
public static CassandraResource cassandraResource = CassandraResource.newWithAvailablePorts();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4c9b6952/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java b/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java
index a28fa89..1d7aae0 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/RestITSuite.java
@@ -35,17 +35,24 @@ import org.apache.usergrid.rest.applications.collection.users.PermissionsResourc
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(
- {
- ActivityResourceIT.class, AdminEmailEncodingIT.class, ApplicationRequestCounterIT.class,
- AssetResourceIT.class, BasicIT.class, CollectionsResourceIT.class, ContentTypeResourceIT.class,
- DevicesResourceIT.class, EventsResourceIT.class, GroupResourceIT.class, OrganizationResourceIT.class,
- OrganizationsResourceIT.class, OwnershipResourceIT.class, PagingResourceIT.class,
- PermissionsResourceIT.class, UserResourceIT.class, UsersOrganizationsResourceIT.class
- })
+@Suite.SuiteClasses({
+ ActivityResourceIT.class,
+ AdminEmailEncodingIT.class,
+ ApplicationRequestCounterIT.class,
+ AssetResourceIT.class,
+ BasicIT.class,
+ CollectionsResourceIT.class,
+ ContentTypeResourceIT.class,
+ DevicesResourceIT.class,
+ EventsResourceIT.class,
+ GroupResourceIT.class,
+ OwnershipResourceIT.class,
+ PagingResourceIT.class,
+ PermissionsResourceIT.class,
+ UserResourceIT.class
+})
@Concurrent()
public class RestITSuite {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4c9b6952/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
index 75743cb..bad46a7 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.usergrid.rest.management;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4c9b6952/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
index 46f7d32..694b12d 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java
@@ -1,11 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.usergrid.rest.management;
/**
* Created by ApigeeCorporation on 9/17/14.
*/
-
-
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4c9b6952/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
index 2a72bc5..621010c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.usergrid.rest.management;