Merge branch 'release-2.1.1' into usergrid-1268-akka-211
Conflicts:
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/bc857e3e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/bc857e3e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/bc857e3e
Branch: refs/heads/release-2.1.1
Commit: bc857e3e61d4df67d14defdc97d51ec6879dac9b
Parents: 9be069b 7fdca3d
Author: Dave Johnson <[email protected]>
Authored: Mon May 16 11:48:26 2016 -0400
Committer: Dave Johnson <[email protected]>
Committed: Mon May 16 11:48:26 2016 -0400
----------------------------------------------------------------------
.../main/resources/usergrid-default.properties | 5 +
.../corepersistence/CpEntityManagerFactory.java | 6 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 56 +++++----
.../rest/applications/users/UserResource.java | 9 ++
.../rest/applications/users/UsersResource.java | 9 ++
.../rest/management/ManagementResource.java | 2 +-
.../organizations/OrganizationsResource.java | 18 +--
.../rest/management/users/UserResource.java | 25 ++--
.../rest/management/users/UsersResource.java | 10 +-
.../security/SecuredResourceFilterFactory.java | 14 ++-
.../usergrid/rest/applications/SecurityIT.java | 1 -
.../collection/users/PermissionsResourceIT.java | 125 +++++++++++++++++--
.../rest/management/ManagementResourceIT.java | 2 +-
.../test/resource/endpoints/NamedResource.java | 8 +-
.../principals/ApplicationUserPrincipal.java | 13 +-
.../security/shiro/utils/LocalShiroCache.java | 2 +-
.../usergrid/services/ServiceManager.java | 61 +++++++--
.../ApplicationQueueManagerCache.java | 2 +-
.../java/org/apache/usergrid/tools/Cli.java | 2 +-
.../org/apache/usergrid/tools/EntityUpdate.java | 3 +-
.../org/apache/usergrid/tools/ExportApp.java | 2 +-
.../java/org/apache/usergrid/tools/Import.java | 10 +-
.../org/apache/usergrid/tools/ToolBase.java | 55 ++++----
23 files changed, 320 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/bc857e3e/stack/config/src/main/resources/usergrid-default.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/bc857e3e/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/bc857e3e/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
----------------------------------------------------------------------
diff --cc
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
index e30ccd8,2c47bdb..acfc5f6
---
a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
+++
b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
@@@ -18,17 -18,15 +18,17 @@@
package org.apache.usergrid.persistence.collection.mvcc.stage.write;
--import java.util.ArrayList;
--import java.util.HashMap;
--import java.util.List;
--import java.util.Map;
-
- import org.apache.usergrid.persistence.collection.uniquevalues.AkkaFig;
- import
org.apache.usergrid.persistence.collection.uniquevalues.UniqueValueException;
- import
org.apache.usergrid.persistence.collection.uniquevalues.UniqueValuesService;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
--
++import com.google.common.base.Preconditions;
++import com.google.inject.Inject;
++import com.google.inject.Singleton;
++import com.netflix.astyanax.Keyspace;
++import com.netflix.astyanax.MutationBatch;
++import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
++import com.netflix.astyanax.model.ConsistencyLevel;
++import com.netflix.hystrix.HystrixCommand;
++import com.netflix.hystrix.HystrixCommandGroupKey;
+ import com.netflix.hystrix.HystrixCommandProperties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
++import com.netflix.hystrix.HystrixThreadPoolProperties;
import org.apache.usergrid.persistence.collection.MvccEntity;
import
org.apache.usergrid.persistence.collection.exception.WriteUniqueVerifyException;
import
org.apache.usergrid.persistence.collection.mvcc.entity.MvccValidationUtils;
@@@ -38,26 -36,26 +38,24 @@@ import org.apache.usergrid.persistence.
import
org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
import
org.apache.usergrid.persistence.collection.serialization.UniqueValueSet;
import
org.apache.usergrid.persistence.collection.serialization.impl.UniqueValueImpl;
++import org.apache.usergrid.persistence.collection.uniquevalues.AkkaFig;
++import
org.apache.usergrid.persistence.collection.uniquevalues.UniqueValueException;
++import
org.apache.usergrid.persistence.collection.uniquevalues.UniqueValuesService;
import org.apache.usergrid.persistence.core.astyanax.CassandraConfig;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.field.Field;
import org.apache.usergrid.persistence.model.util.EntityUtils;
--
--import com.google.common.base.Preconditions;
--import com.google.inject.Inject;
--import com.google.inject.Singleton;
--import com.netflix.astyanax.Keyspace;
--import com.netflix.astyanax.MutationBatch;
--import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
--import com.netflix.astyanax.model.ConsistencyLevel;
--import com.netflix.hystrix.HystrixCommand;
--import com.netflix.hystrix.HystrixCommandGroupKey;
--import com.netflix.hystrix.HystrixThreadPoolProperties;
--
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
import rx.functions.Action1;
++import java.util.ArrayList;
++import java.util.HashMap;
++import java.util.List;
++import java.util.Map;
++
/**
* This phase execute all unique value verification on the MvccEntity.
