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 2016/07/07 17:52:35 UTC

[1/7] usergrid git commit: Make the unique value loading use the config interface for consistent read CL instead of hard coding to CL_ALL

Repository: usergrid
Updated Branches:
  refs/heads/usergrid-1268-akka-211 e6c59ee3f -> d5d89a820


Make the unique value loading use the config interface for consistent read CL instead of hard coding to CL_ALL


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

Branch: refs/heads/usergrid-1268-akka-211
Commit: bd96b18116e16fc35f2bc1d740cff65b03470594
Parents: 8982ddd
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 6 15:14:30 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 6 15:14:30 2016 -0700

----------------------------------------------------------------------
 .../impl/EntityCollectionManagerFactoryImpl.java         |  9 +++++++--
 .../collection/impl/EntityCollectionManagerImpl.java     | 11 ++++++++---
 .../collection/mvcc/stage/write/WriteUniqueVerify.java   |  4 ++--
 3 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/bd96b181/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
index a52ee9c..01eab7d 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
@@ -40,6 +40,7 @@ import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerial
 import org.apache.usergrid.persistence.collection.serialization.MvccLogEntrySerializationStrategy;
 import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
 import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
+import org.apache.usergrid.persistence.core.astyanax.CassandraConfig;
 import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
 import org.apache.usergrid.persistence.core.rx.RxTaskScheduler;
 import org.apache.usergrid.persistence.core.scope.ApplicationScope;
@@ -77,6 +78,7 @@ public class EntityCollectionManagerFactoryImpl implements EntityCollectionManag
     private final Keyspace keyspace;
     private final MetricsFactory metricsFactory;
     private final RxTaskScheduler rxTaskScheduler;
+    private final CassandraConfig cassandraConfig;
 
     private LoadingCache<ApplicationScope, EntityCollectionManager> ecmCache =
         CacheBuilder.newBuilder().maximumSize( 1000 )
@@ -89,7 +91,7 @@ public class EntityCollectionManagerFactoryImpl implements EntityCollectionManag
                                 entitySerializationStrategy, uniqueValueSerializationStrategy,
                                 mvccLogEntrySerializationStrategy, keyspace,
                                 metricsFactory, serializationFig,
-                                rxTaskScheduler, scope );
+                                rxTaskScheduler, scope, cassandraConfig );
 
                             return target;
                         }
@@ -107,7 +109,9 @@ public class EntityCollectionManagerFactoryImpl implements EntityCollectionManag
                                                final UniqueValueSerializationStrategy uniqueValueSerializationStrategy,
                                                final MvccLogEntrySerializationStrategy mvccLogEntrySerializationStrategy,
                                                final Keyspace keyspace, final EntityCacheFig entityCacheFig,
-                                               final MetricsFactory metricsFactory, @CollectionExecutorScheduler  final RxTaskScheduler rxTaskScheduler ) {
+                                               final MetricsFactory metricsFactory,
+                                               @CollectionExecutorScheduler  final RxTaskScheduler rxTaskScheduler,
+                                               final CassandraConfig cassandraConfig) {
 
         this.writeStart = writeStart;
         this.writeVerifyUnique = writeVerifyUnique;
@@ -125,6 +129,7 @@ public class EntityCollectionManagerFactoryImpl implements EntityCollectionManag
         this.keyspace = keyspace;
         this.metricsFactory = metricsFactory;
         this.rxTaskScheduler = rxTaskScheduler;
+        this.cassandraConfig = cassandraConfig;
     }
     @Override
     public EntityCollectionManager createCollectionManager(ApplicationScope applicationScope) {

http://git-wip-us.apache.org/repos/asf/usergrid/blob/bd96b181/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index 9261b56..06b086c 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@ -28,6 +28,7 @@ import java.util.UUID;
 
 import com.netflix.astyanax.model.ConsistencyLevel;
 import org.apache.usergrid.persistence.collection.serialization.impl.LogEntryIterator;
+import org.apache.usergrid.persistence.core.astyanax.CassandraConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -110,6 +111,7 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
     private final UniqueValueSerializationStrategy uniqueValueSerializationStrategy;
 
     private final SerializationFig serializationFig;
+    private final CassandraConfig cassandraConfig;
 
 
     private final Keyspace keyspace;
@@ -135,7 +137,8 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
                                         final MvccLogEntrySerializationStrategy mvccLogEntrySerializationStrategy,
                                         final Keyspace keyspace, final MetricsFactory metricsFactory,
                                         final SerializationFig serializationFig, final RxTaskScheduler rxTaskScheduler,
-                                        @Assisted final ApplicationScope applicationScope ) {
+                                        @Assisted final ApplicationScope applicationScope,
+                                        final CassandraConfig cassandraConfig) {
         this.uniqueValueSerializationStrategy = uniqueValueSerializationStrategy;
         this.entitySerializationStrategy = entitySerializationStrategy;
         this.uniqueCleanup = uniqueCleanup;
@@ -166,6 +169,8 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
         this.fieldEntityTimer = metricsFactory.getTimer(EntityCollectionManagerImpl.class, "base.fieldEntity");
         this.loadTimer = metricsFactory.getTimer(EntityCollectionManagerImpl.class, "base.load");
         this.getLatestTimer = metricsFactory.getTimer(EntityCollectionManagerImpl.class, "base.latest");
+
+        this.cassandraConfig = cassandraConfig;
     }
 
 
@@ -333,10 +338,10 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
                 final UUID startTime = UUIDGenerator.newTimeUUID();
 
                 //Get back set of unique values that correspond to collection of fields
-                //Purposely use CL ALL as consistency is extremely important here, regardless of performance
+                //Purposely use string consistency as it's extremely important here, regardless of performance
                 UniqueValueSet set =
                     uniqueValueSerializationStrategy
-                        .load( applicationScope, ConsistencyLevel.CL_ALL, type, fields1 , uniqueIndexRepair);
+                        .load( applicationScope, cassandraConfig.getConsistentReadCL(), type, fields1 , uniqueIndexRepair);
 
                 //Short circuit if we don't have any uniqueValues from the given fields.
                 if ( !set.iterator().hasNext() ) {

http://git-wip-us.apache.org/repos/asf/usergrid/blob/bd96b181/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java
----------------------------------------------------------------------
diff --git 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
index 01e6621..b36cb79 100644
--- 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
@@ -123,8 +123,8 @@ public class WriteUniqueVerify implements Action1<CollectionIoEvent<MvccEntity>>
 
                 // loading will retrieve the oldest unique value entry for the field
                 // don't use read repair on this pre-write check
-                // use CL ALL as consistency is extremely important here, more so than performance
-                UniqueValueSet set = uniqueValueStrat.load(scope, ConsistencyLevel.CL_ALL,
+                // stronger consistency is extremely important here, more so than performance
+                UniqueValueSet set = uniqueValueStrat.load(scope, cassandraFig.getConsistentReadCL(),
                     written.getEntityId().getType(), Collections.singletonList(written.getField()), false);
 
 


[2/7] usergrid git commit: Add support for later versions of tomcat.

Posted by sn...@apache.org.
Add support for later versions of tomcat.


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

Branch: refs/heads/usergrid-1268-akka-211
Commit: 4613e09ee9d5b6df8fae3cc6419142d09a98c312
Parents: bd96b18
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 6 16:43:09 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 6 16:43:09 2016 -0700

----------------------------------------------------------------------
 stack/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/4613e09e/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index dd35891..1bf1f92 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -117,7 +117,7 @@
         <shiro-version>1.2.4</shiro-version>
         <slf4j-version>1.7.2</slf4j-version>
         <snakeyaml-version>1.9</snakeyaml-version>
-        <tomcat-version>7.0.64</tomcat-version>
+        <tomcat-version>8.5.3</tomcat-version>
         <antlr.version>3.4</antlr.version>
         <tika.version>1.4</tika.version>
         <mockito.version>1.10.8</mockito.version>


[6/7] usergrid git commit: Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into usergrid-1268-akka-211

Posted by sn...@apache.org.
Merge branch 'release-2.1.1' of https://git-wip-us.apache.org/repos/asf/usergrid into usergrid-1268-akka-211

# Conflicts:
#	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
#	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java


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

Branch: refs/heads/usergrid-1268-akka-211
Commit: 37972a2ed8c21c144f7e56d76afef37775f5012d
Parents: e6c59ee 86ae2cd
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Jul 7 12:30:10 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Jul 7 12:30:10 2016 -0400

----------------------------------------------------------------------
 .../EntityCollectionManagerFactoryImpl.java     | 103 ++++++++---------
 .../impl/EntityCollectionManagerImpl.java       | 112 ++++++++-----------
 .../mvcc/stage/write/WriteUniqueVerify.java     |   4 +-
 3 files changed, 103 insertions(+), 116 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/37972a2e/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
index 3877fe3,01eab7d..fcaa51d
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerFactoryImpl.java
@@@ -19,38 -21,37 +19,33 @@@
  package org.apache.usergrid.persistence.collection.impl;
  
  
--import java.util.concurrent.ExecutionException;
--
++import com.google.common.base.Preconditions;
++import com.google.common.cache.CacheBuilder;
++import com.google.common.cache.CacheLoader;
++import com.google.common.cache.LoadingCache;
++import com.google.inject.Inject;
++import com.google.inject.Singleton;
++import com.netflix.astyanax.Keyspace;
 +import org.apache.usergrid.persistence.actorsystem.ActorSystemManager;
  import org.apache.usergrid.persistence.collection.EntityCollectionManager;
  import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
--import org.apache.usergrid.persistence.collection.cache.EntityCacheFig;
  import org.apache.usergrid.persistence.collection.mvcc.stage.delete.MarkCommit;
  import org.apache.usergrid.persistence.collection.mvcc.stage.delete.MarkStart;
  import org.apache.usergrid.persistence.collection.mvcc.stage.delete.UniqueCleanup;
  import org.apache.usergrid.persistence.collection.mvcc.stage.delete.VersionCompact;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.RollbackAction;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteCommit;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteOptimisticVerify;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteStart;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteUniqueVerify;
++import org.apache.usergrid.persistence.collection.mvcc.stage.write.*;
  import org.apache.usergrid.persistence.collection.scheduler.CollectionExecutorScheduler;
  import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerializationStrategy;
  import org.apache.usergrid.persistence.collection.serialization.MvccLogEntrySerializationStrategy;
  import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
  import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
 +import org.apache.usergrid.persistence.collection.uniquevalues.UniqueValuesService;
+ import org.apache.usergrid.persistence.core.astyanax.CassandraConfig;
  import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
  import org.apache.usergrid.persistence.core.rx.RxTaskScheduler;
  import org.apache.usergrid.persistence.core.scope.ApplicationScope;
  
--import com.google.common.base.Preconditions;
--import com.google.common.cache.CacheBuilder;
--import com.google.common.cache.CacheLoader;
--import com.google.common.cache.LoadingCache;
--import com.google.inject.Inject;
--import com.google.inject.Singleton;
--import com.netflix.astyanax.Keyspace;
++import java.util.concurrent.ExecutionException;
  
  
  
@@@ -60,7 -61,7 +55,6 @@@
  @Singleton
  public class EntityCollectionManagerFactoryImpl implements EntityCollectionManagerFactory {
  
--
      private final WriteStart writeStart;
      private final WriteUniqueVerify writeVerifyUnique;
      private final WriteOptimisticVerify writeOptimisticVerify;
@@@ -77,35 -78,20 +71,40 @@@
      private final Keyspace keyspace;
      private final MetricsFactory metricsFactory;
      private final RxTaskScheduler rxTaskScheduler;
 +    private final ActorSystemManager actorSystemManager;
 +    private final UniqueValuesService uniqueValuesService;
 +
+     private final CassandraConfig cassandraConfig;
  
      private LoadingCache<ApplicationScope, EntityCollectionManager> ecmCache =
          CacheBuilder.newBuilder().maximumSize( 1000 )
                      .build( new CacheLoader<ApplicationScope, EntityCollectionManager>() {
                          public EntityCollectionManager load( ApplicationScope scope ) {
 -                                  //create the target EM that will perform logic
 +                            //create the target EM that will perform logic
                              final EntityCollectionManager target = new EntityCollectionManagerImpl(
 -                                writeStart, writeVerifyUnique,
 -                                writeOptimisticVerify, writeCommit, rollback, markStart, markCommit,  uniqueCleanup, versionCompact,
 -                                entitySerializationStrategy, uniqueValueSerializationStrategy,
 -                                mvccLogEntrySerializationStrategy, keyspace,
 -                                metricsFactory, serializationFig,
 -                                rxTaskScheduler, scope, cassandraConfig );
++
 +                                writeStart,
 +                                writeVerifyUnique,
 +                                writeOptimisticVerify,
 +                                writeCommit,
 +                                rollback,
 +                                markStart,
 +                                markCommit,
 +                                uniqueCleanup,
 +                                versionCompact,
++
 +                                entitySerializationStrategy,
 +                                uniqueValueSerializationStrategy,
 +                                mvccLogEntrySerializationStrategy,
++
 +                                keyspace,
 +                                metricsFactory,
 +                                serializationFig,
 +                                rxTaskScheduler,
 +                                actorSystemManager,
 +                                uniqueValuesService,
++                                cassandraConfig,
 +                                scope );
  
                              return target;
                          }
@@@ -113,47 -99,38 +112,49 @@@
  
  
      @Inject
 -    public EntityCollectionManagerFactoryImpl( final WriteStart writeStart, final WriteUniqueVerify writeVerifyUnique,
 -                                               final WriteOptimisticVerify writeOptimisticVerify,
 -                                               final WriteCommit writeCommit, final RollbackAction rollback,
 -                                               final MarkStart markStart, final MarkCommit markCommit,
 -                                               final UniqueCleanup uniqueCleanup, final VersionCompact versionCompact,
 -                                               final SerializationFig serializationFig, final
 -                                                   MvccEntitySerializationStrategy entitySerializationStrategy,
 -                                               final UniqueValueSerializationStrategy uniqueValueSerializationStrategy,
 -                                               final MvccLogEntrySerializationStrategy mvccLogEntrySerializationStrategy,
 -                                               final Keyspace keyspace, final EntityCacheFig entityCacheFig,
 -                                               final MetricsFactory metricsFactory,
 -                                               @CollectionExecutorScheduler  final RxTaskScheduler rxTaskScheduler,
 -                                               final CassandraConfig cassandraConfig) {
 -
 -        this.writeStart = writeStart;
 -        this.writeVerifyUnique = writeVerifyUnique;
 -        this.writeOptimisticVerify = writeOptimisticVerify;
 -        this.writeCommit = writeCommit;
 -        this.rollback = rollback;
 -        this.markStart = markStart;
 -        this.markCommit = markCommit;
 -        this.uniqueCleanup = uniqueCleanup;
 -        this.versionCompact = versionCompact;
 -        this.serializationFig = serializationFig;
 -        this.entitySerializationStrategy = entitySerializationStrategy;
 -        this.uniqueValueSerializationStrategy = uniqueValueSerializationStrategy;
 +    public EntityCollectionManagerFactoryImpl(
-             final WriteStart writeStart,
-             final WriteUniqueVerify writeVerifyUnique,
++            final WriteStart            writeStart,
++            final WriteUniqueVerify     writeVerifyUnique,
 +            final WriteOptimisticVerify writeOptimisticVerify,
-             final WriteCommit writeCommit,
-             final RollbackAction rollback,
-             final MarkStart markStart,
-             final MarkCommit markCommit,
-             final UniqueCleanup uniqueCleanup,
-             final VersionCompact versionCompact,
-             final SerializationFig serializationFig,
-             final MvccEntitySerializationStrategy entitySerializationStrategy,
-             final UniqueValueSerializationStrategy uniqueValueSerializationStrategy,
++            final WriteCommit           writeCommit,
++            final RollbackAction        rollback,
++            final MarkStart             markStart,
++            final MarkCommit            markCommit,
++            final UniqueCleanup         uniqueCleanup,
++            final VersionCompact        versionCompact,
++            final SerializationFig      serializationFig,
++            final MvccEntitySerializationStrategy   entitySerializationStrategy,
++            final UniqueValueSerializationStrategy  uniqueValueSerializationStrategy,
 +            final MvccLogEntrySerializationStrategy mvccLogEntrySerializationStrategy,
-             final Keyspace keyspace,
-             final EntityCacheFig entityCacheFig,
-             final MetricsFactory metricsFactory, @CollectionExecutorScheduler
-             final RxTaskScheduler rxTaskScheduler,
-             final ActorSystemManager actorSystemManager,
-             final UniqueValuesService uniqueValuesService ) {
- 
-         this.writeStart = writeStart;
-         this.writeVerifyUnique = writeVerifyUnique;
-         this.writeOptimisticVerify = writeOptimisticVerify;
-         this.writeCommit = writeCommit;
-         this.rollback = rollback;
-         this.markStart = markStart;
-         this.markCommit = markCommit;
-         this.uniqueCleanup = uniqueCleanup;
-         this.versionCompact = versionCompact;
-         this.serializationFig = serializationFig;
-         this.entitySerializationStrategy = entitySerializationStrategy;
-         this.uniqueValueSerializationStrategy = uniqueValueSerializationStrategy;
++            final Keyspace              keyspace,
++            final MetricsFactory        metricsFactory,
++            @CollectionExecutorScheduler
++            final RxTaskScheduler       rxTaskScheduler,
++            final ActorSystemManager    actorSystemManager,
++            final UniqueValuesService   uniqueValuesService,
++            final CassandraConfig       cassandraConfig ) {
++
++        this.writeStart =               writeStart;
++        this.writeVerifyUnique =        writeVerifyUnique;
++        this.writeOptimisticVerify =    writeOptimisticVerify;
++        this.writeCommit =              writeCommit;
++        this.rollback =                 rollback;
++        this.markStart =                markStart;
++        this.markCommit =               markCommit;
++        this.uniqueCleanup =            uniqueCleanup;
++        this.versionCompact =           versionCompact;
++        this.serializationFig =         serializationFig;
++        this.entitySerializationStrategy =       entitySerializationStrategy;
++        this.uniqueValueSerializationStrategy =  uniqueValueSerializationStrategy;
          this.mvccLogEntrySerializationStrategy = mvccLogEntrySerializationStrategy;
--        this.keyspace = keyspace;
--        this.metricsFactory = metricsFactory;
--        this.rxTaskScheduler = rxTaskScheduler;
-         this.actorSystemManager = actorSystemManager;
-         this.uniqueValuesService = uniqueValuesService;
 -        this.cassandraConfig = cassandraConfig;
++        this.keyspace =                 keyspace;
++        this.metricsFactory =           metricsFactory;
++        this.rxTaskScheduler =          rxTaskScheduler;
++        this.actorSystemManager =       actorSystemManager;
++        this.uniqueValuesService =      uniqueValuesService;
++        this.cassandraConfig =          cassandraConfig;
      }
 +
      @Override
      public EntityCollectionManager createCollectionManager(ApplicationScope applicationScope) {
          Preconditions.checkNotNull(applicationScope);

http://git-wip-us.apache.org/repos/asf/usergrid/blob/37972a2e/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index 6a04c7c,06b086c..9dce7ef
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@@ -19,44 -19,43 +19,32 @@@
  package org.apache.usergrid.persistence.collection.impl;
  
  
--import java.util.ArrayList;
--import java.util.Collection;
--import java.util.Collections;
--import java.util.Iterator;
--import java.util.List;
--import java.util.UUID;
--
++import com.codahale.metrics.Timer;
++import com.google.common.base.Preconditions;
++import com.google.inject.Inject;
++import com.google.inject.assistedinject.Assisted;
++import com.netflix.astyanax.Keyspace;
++import com.netflix.astyanax.MutationBatch;
++import com.netflix.astyanax.connectionpool.OperationResult;
++import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
++import com.netflix.astyanax.model.ColumnFamily;
  import com.netflix.astyanax.model.ConsistencyLevel;
 -import org.apache.usergrid.persistence.collection.serialization.impl.LogEntryIterator;
 -import org.apache.usergrid.persistence.core.astyanax.CassandraConfig;
 -import org.slf4j.Logger;
 -import org.slf4j.LoggerFactory;
 -
 -import org.apache.usergrid.persistence.collection.EntityCollectionManager;
 -import org.apache.usergrid.persistence.collection.EntitySet;
 -import org.apache.usergrid.persistence.collection.FieldSet;
 -import org.apache.usergrid.persistence.collection.MvccEntity;
 -import org.apache.usergrid.persistence.collection.MvccLogEntry;
 -import org.apache.usergrid.persistence.collection.VersionSet;
++import com.netflix.astyanax.model.CqlResult;
++import com.netflix.astyanax.serializers.StringSerializer;
 +import org.apache.usergrid.persistence.actorsystem.ActorSystemManager;
- import org.apache.usergrid.persistence.collection.uniquevalues.UniqueValuesService;
- import org.apache.usergrid.persistence.collection.serialization.impl.LogEntryIterator;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
- 
- import org.apache.usergrid.persistence.collection.EntityCollectionManager;
- import org.apache.usergrid.persistence.collection.EntitySet;
- import org.apache.usergrid.persistence.collection.FieldSet;
- import org.apache.usergrid.persistence.collection.MvccEntity;
- import org.apache.usergrid.persistence.collection.MvccLogEntry;
- import org.apache.usergrid.persistence.collection.VersionSet;
++import org.apache.usergrid.persistence.collection.*;
  import org.apache.usergrid.persistence.collection.mvcc.stage.CollectionIoEvent;
  import org.apache.usergrid.persistence.collection.mvcc.stage.delete.MarkCommit;
  import org.apache.usergrid.persistence.collection.mvcc.stage.delete.MarkStart;
  import org.apache.usergrid.persistence.collection.mvcc.stage.delete.UniqueCleanup;
  import org.apache.usergrid.persistence.collection.mvcc.stage.delete.VersionCompact;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.RollbackAction;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteCommit;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteOptimisticVerify;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteStart;
--import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteUniqueVerify;
--import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerializationStrategy;
--import org.apache.usergrid.persistence.collection.serialization.MvccLogEntrySerializationStrategy;
--import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
--import org.apache.usergrid.persistence.collection.serialization.UniqueValue;
--import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
--import org.apache.usergrid.persistence.collection.serialization.UniqueValueSet;
++import org.apache.usergrid.persistence.collection.mvcc.stage.write.*;
++import org.apache.usergrid.persistence.collection.serialization.*;
++import org.apache.usergrid.persistence.collection.serialization.impl.LogEntryIterator;
  import org.apache.usergrid.persistence.collection.serialization.impl.MinMaxLogEntryIterator;
  import org.apache.usergrid.persistence.collection.serialization.impl.MutableFieldSet;
++import org.apache.usergrid.persistence.collection.uniquevalues.UniqueValuesService;
++import org.apache.usergrid.persistence.core.astyanax.CassandraConfig;
  import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
  import org.apache.usergrid.persistence.core.metrics.ObservableTimer;
  import org.apache.usergrid.persistence.core.rx.ObservableIterator;
@@@ -68,22 -67,22 +56,13 @@@ import org.apache.usergrid.persistence.
  import org.apache.usergrid.persistence.model.entity.Id;
  import org.apache.usergrid.persistence.model.field.Field;
  import org.apache.usergrid.persistence.model.util.UUIDGenerator;
--
--import com.codahale.metrics.Timer;
--import com.google.common.base.Preconditions;
--import com.google.inject.Inject;
--import com.google.inject.assistedinject.Assisted;
--import com.netflix.astyanax.Keyspace;
--import com.netflix.astyanax.MutationBatch;
--import com.netflix.astyanax.connectionpool.OperationResult;
--import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
--import com.netflix.astyanax.model.ColumnFamily;
--import com.netflix.astyanax.model.CqlResult;
--import com.netflix.astyanax.serializers.StringSerializer;
--
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
  import rx.Observable;
  import rx.Subscriber;
  
++import java.util.*;
++
  
  /**
   * Simple implementation.  Should perform  writes, delete and load.
@@@ -125,31 -125,20 +105,35 @@@ public class EntityCollectionManagerImp
      private final ApplicationScope applicationScope;
      private final RxTaskScheduler rxTaskScheduler;
  
 +    private final UniqueValuesService uniqueValuesService;
 +    private final ActorSystemManager actorSystemManager;
 +
  
      @Inject
-     public EntityCollectionManagerImpl( final WriteStart writeStart,
-                                         final WriteUniqueVerify writeVerifyUnique,
 -    public EntityCollectionManagerImpl( final WriteStart writeStart, final WriteUniqueVerify writeVerifyUnique,
--                                        final WriteOptimisticVerify writeOptimisticVerify,
-                                         final WriteCommit writeCommit,
-                                         final RollbackAction rollback,
-                                         final MarkStart markStart,
-                                         final MarkCommit markCommit,
-                                         final UniqueCleanup uniqueCleanup,
-                                         final VersionCompact versionCompact,
 -                                        final WriteCommit writeCommit, final RollbackAction rollback,
 -                                        final MarkStart markStart, final MarkCommit markCommit,
 -                                        final UniqueCleanup uniqueCleanup, final VersionCompact versionCompact,
--                                        final MvccEntitySerializationStrategy entitySerializationStrategy,
--                                        final UniqueValueSerializationStrategy uniqueValueSerializationStrategy,
--                                        final MvccLogEntrySerializationStrategy mvccLogEntrySerializationStrategy,
-                                         final Keyspace keyspace,
-                                         final MetricsFactory metricsFactory,
-                                         final SerializationFig serializationFig,
-                                         final RxTaskScheduler rxTaskScheduler,
-                                         ActorSystemManager actorSystemManager,
-                                         UniqueValuesService uniqueValuesService,
-                                         @Assisted final ApplicationScope applicationScope ) {
 -                                        final Keyspace keyspace, final MetricsFactory metricsFactory,
 -                                        final SerializationFig serializationFig, final RxTaskScheduler rxTaskScheduler,
 -                                        @Assisted final ApplicationScope applicationScope,
 -                                        final CassandraConfig cassandraConfig) {
++    public EntityCollectionManagerImpl(
++        final WriteStart            writeStart,
++        final WriteUniqueVerify     writeVerifyUnique,
++        final WriteOptimisticVerify writeOptimisticVerify,
++        final WriteCommit           writeCommit,
++        final RollbackAction        rollback,
++        final MarkStart             markStart,
++        final MarkCommit            markCommit,
++        final UniqueCleanup         uniqueCleanup,
++        final VersionCompact        versionCompact,
++
++        final MvccEntitySerializationStrategy   entitySerializationStrategy,
++        final UniqueValueSerializationStrategy  uniqueValueSerializationStrategy,
++        final MvccLogEntrySerializationStrategy mvccLogEntrySerializationStrategy,
++
++        final Keyspace              keyspace,
++        final MetricsFactory        metricsFactory,
++        final SerializationFig      serializationFig,
++        final RxTaskScheduler       rxTaskScheduler,
++        final ActorSystemManager    actorSystemManager,
++        final UniqueValuesService   uniqueValuesService,
++        final CassandraConfig       cassandraConfig,
++        @Assisted final ApplicationScope applicationScope ) {
 +
          this.uniqueValueSerializationStrategy = uniqueValueSerializationStrategy;
          this.entitySerializationStrategy = entitySerializationStrategy;
          this.uniqueCleanup = uniqueCleanup;

http://git-wip-us.apache.org/repos/asf/usergrid/blob/37972a2e/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 1f86440,b36cb79..a3565ea
--- 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
@@@ -170,11 -121,13 +170,11 @@@ public class WriteUniqueVerify implemen
  
              try {
  
 -                // loading will retrieve the oldest unique value entry for the field
                  // don't use read repair on this pre-write check
-                 // use CL ALL as consistency is extremely important here, more so than performance
-                 UniqueValueSet set = uniqueValueStrat.load(scope, ConsistencyLevel.CL_ALL,
+                 // stronger consistency is extremely important here, more so than performance
+                 UniqueValueSet set = uniqueValueStrat.load(scope, cassandraFig.getConsistentReadCL(),
                      written.getEntityId().getType(), Collections.singletonList(written.getField()), false);
  
 -
                  set.forEach(uniqueValue -> {
  
                      if(!uniqueValue.getEntityId().getUuid().equals(written.getEntityId().getUuid())){


[7/7] usergrid git commit: Remove unnecessary releaseUniqueValues() logic.

Posted by sn...@apache.org.
Remove unnecessary releaseUniqueValues() logic.


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

Branch: refs/heads/usergrid-1268-akka-211
Commit: d5d89a8203f8939fa2a436a718e3f5d4b3cce3de
Parents: 37972a2
Author: Dave Johnson <sn...@apache.org>
Authored: Thu Jul 7 13:53:45 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Thu Jul 7 13:53:45 2016 -0400

----------------------------------------------------------------------
 .../mvcc/stage/delete/MarkCommit.java           | 36 +++++++++++---------
 .../uniquevalues/UniqueValuesService.java       |  7 ++--
 .../uniquevalues/UniqueValuesServiceImpl.java   | 30 +++++++++-------
 3 files changed, 40 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/d5d89a82/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java
index 70c785e..57d92e1 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java
@@ -126,23 +126,25 @@ public class MarkCommit implements Action1<CollectionIoEvent<MvccEntity>> {
             throw new RuntimeException( "Unable to mark entry as deleted" );
         }
 
-        // actorSystemFig may be null in testing
-        if ( actorSystemFig != null && actorSystemFig.getEnabled() ) {
-
-            String region = idIoEvent.getRegion();
-            if ( region == null ) {
-                region = uniqueValuesFig.getAuthoritativeRegion();
-            }
-            if ( region == null ) {
-                region = actorSystemFig.getRegionLocal();
-            }
-
-            try {
-                uniqueValuesService.releaseUniqueValues( applicationScope, entityId, version, region );
-            } catch (UniqueValueException e) {
-                throw new RuntimeException( "Unable to release unique values for entity " + entityId );
-            }
-        }
+        // TODO: do we need this or can we rely on UniqueCleanup + Cassandra replication?
+//
+//        // actorSystemFig may be null in testing
+//        if ( actorSystemFig != null && actorSystemFig.getEnabled() ) {
+//
+//            String region = idIoEvent.getRegion();
+//            if ( region == null ) {
+//                region = uniqueValuesFig.getAuthoritativeRegion();
+//            }
+//            if ( region == null ) {
+//                region = actorSystemFig.getRegionLocal();
+//            }
+//
+//            try {
+//                uniqueValuesService.releaseUniqueValues( applicationScope, entityId, version, region );
+//            } catch (UniqueValueException e) {
+//                throw new RuntimeException( "Unable to release unique values for entity " + entityId );
+//            }
+//        }
     }
 }
 

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d5d89a82/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesService.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesService.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesService.java
index 5deddd6..1104a23 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesService.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesService.java
@@ -59,15 +59,16 @@ public interface UniqueValuesService extends RouterProducer {
     void confirmUniqueValues( ApplicationScope scope, Entity entity, UUID version , String region )
         throws UniqueValueException;
 
+    // TODO: is this really necessary? MarkCommit and UniqueCleanup should do the trick
     /**
      * Release unique values held by an entity.
-     *
      * @param scope Application scope of entity.
      * @param entityId Id of Entity with unique values to be released
      * @param version Version of entity.
      * @param region Authoritative Region to be used for this entity or null to use current region.
      * @throws UniqueValueException if unique values cannot be reserved.
      */
-    void releaseUniqueValues( ApplicationScope scope, Id entityId, UUID version, String region )
-        throws UniqueValueException;
+//    void releaseUniqueValues( ApplicationScope scope, Id entityId, UUID version, String region )
+//        throws UniqueValueException;
+
 }

http://git-wip-us.apache.org/repos/asf/usergrid/blob/d5d89a82/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java
index 4102090..50114be 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/uniquevalues/UniqueValuesServiceImpl.java
@@ -151,19 +151,23 @@ public class UniqueValuesServiceImpl implements UniqueValuesService {
     }
 
 
-    @Override
-    public void releaseUniqueValues(ApplicationScope scope, Id entityId, UUID version, String region)
-        throws UniqueValueException {
-
-        ready();
-
-        Iterator<UniqueValue> iterator = table.getUniqueValues( scope, entityId );
-
-        while ( iterator.hasNext() ) {
-            UniqueValue uniqueValue = iterator.next();
-            cancelUniqueField( scope, entityId, uniqueValue.getEntityVersion(), uniqueValue.getField(), region );
-        }
-    }
+    // TODO: do we need this or can we rely on UniqueCleanup + Cassandra replication?
+
+//    @Override
+//    public void releaseUniqueValues(ApplicationScope scope, Id entityId, UUID version, String region)
+//        throws UniqueValueException {
+//
+//        ready();
+//
+//        TODO: need to replicate logic from UniqueCleanup and make sure it happens in Authoritative Region
+//
+//        Iterator<UniqueValue> iterator = table.getUniqueValues( scope, entityId );
+//
+//        while ( iterator.hasNext() ) {
+//            UniqueValue uniqueValue = iterator.next();
+//            cancelUniqueField( scope, entityId, uniqueValue.getEntityVersion(), uniqueValue.getField(), region );
+//        }
+//    }
 
 
     private void reserveUniqueField(


[4/7] usergrid git commit: Revert "Fix tomcat dependency versions."

Posted by sn...@apache.org.
Revert "Fix tomcat dependency versions."

This reverts commit 3e65e78c33ca47404905cea8558d9e0e2800241f.


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

Branch: refs/heads/usergrid-1268-akka-211
Commit: 2cae8662d13cc0e51380552a0e46a2f6b5163c27
Parents: 3e65e78
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 6 22:21:53 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 6 22:21:53 2016 -0700

----------------------------------------------------------------------
 stack/pom.xml            | 3 +--
 stack/test-utils/pom.xml | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/2cae8662/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 5fd0817..1bf1f92 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -118,7 +118,6 @@
         <slf4j-version>1.7.2</slf4j-version>
         <snakeyaml-version>1.9</snakeyaml-version>
         <tomcat-version>8.5.3</tomcat-version>
-        <tomcat-logging-version>8.5.2</tomcat-logging-version>
         <antlr.version>3.4</antlr.version>
         <tika.version>1.4</tika.version>
         <mockito.version>1.10.8</mockito.version>
@@ -909,7 +908,7 @@
             <dependency>
                 <groupId>org.apache.tomcat.embed</groupId>
                 <artifactId>tomcat-embed-logging-juli</artifactId>
-                <version>${tomcat-logging-version}</version>
+                <version>${tomcat-version}</version>
             </dependency>
 
             <dependency>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/2cae8662/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index b460198..c104f0a 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -245,31 +245,26 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>${tomcat-version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-logging-juli</artifactId>
-            <version>${tomcat-logging-version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-jasper</artifactId>
-            <version>${tomcat-version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jasper-el</artifactId>
-            <version>${tomcat-version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jsp-api</artifactId>
-            <version>${tomcat-version}</version>
         </dependency>
 
     </dependencies>


[3/7] usergrid git commit: Fix tomcat dependency versions.

Posted by sn...@apache.org.
Fix tomcat dependency versions.


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

Branch: refs/heads/usergrid-1268-akka-211
Commit: 3e65e78c33ca47404905cea8558d9e0e2800241f
Parents: 4613e09
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 6 17:25:56 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 6 17:25:56 2016 -0700

----------------------------------------------------------------------
 stack/pom.xml            | 3 ++-
 stack/test-utils/pom.xml | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/3e65e78c/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 1bf1f92..5fd0817 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -118,6 +118,7 @@
         <slf4j-version>1.7.2</slf4j-version>
         <snakeyaml-version>1.9</snakeyaml-version>
         <tomcat-version>8.5.3</tomcat-version>
+        <tomcat-logging-version>8.5.2</tomcat-logging-version>
         <antlr.version>3.4</antlr.version>
         <tika.version>1.4</tika.version>
         <mockito.version>1.10.8</mockito.version>
@@ -908,7 +909,7 @@
             <dependency>
                 <groupId>org.apache.tomcat.embed</groupId>
                 <artifactId>tomcat-embed-logging-juli</artifactId>
-                <version>${tomcat-version}</version>
+                <version>${tomcat-logging-version}</version>
             </dependency>
 
             <dependency>

http://git-wip-us.apache.org/repos/asf/usergrid/blob/3e65e78c/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index c104f0a..b460198 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -245,26 +245,31 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
+            <version>${tomcat-version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-logging-juli</artifactId>
+            <version>${tomcat-logging-version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-jasper</artifactId>
+            <version>${tomcat-version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jasper-el</artifactId>
+            <version>${tomcat-version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jsp-api</artifactId>
+            <version>${tomcat-version}</version>
         </dependency>
 
     </dependencies>


[5/7] usergrid git commit: Revert "Add support for later versions of tomcat."

Posted by sn...@apache.org.
Revert "Add support for later versions of tomcat."

This reverts commit 4613e09ee9d5b6df8fae3cc6419142d09a98c312.


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

Branch: refs/heads/usergrid-1268-akka-211
Commit: 86ae2cd01175a9f861e4fdcf0fbc0c0e96004334
Parents: 2cae866
Author: Michael Russo <mr...@apigee.com>
Authored: Wed Jul 6 22:22:03 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Wed Jul 6 22:22:03 2016 -0700

----------------------------------------------------------------------
 stack/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/86ae2cd0/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 1bf1f92..dd35891 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -117,7 +117,7 @@
         <shiro-version>1.2.4</shiro-version>
         <slf4j-version>1.7.2</slf4j-version>
         <snakeyaml-version>1.9</snakeyaml-version>
-        <tomcat-version>8.5.3</tomcat-version>
+        <tomcat-version>7.0.64</tomcat-version>
         <antlr.version>3.4</antlr.version>
         <tika.version>1.4</tika.version>
         <mockito.version>1.10.8</mockito.version>