merge

.gitignore

@@ -27,6 +27,11 @@ Icon
 /portal/test/coverage/instrument/js/usergrid-coverage.min.js
 /portal/test/coverage/instrument/js/usergrid.min.js
 /stack/corepersistence/priamcluster/aws.properties
+# Eclipse IDE files
+.project
+.classpath
+.settings/
+.metadata/
 #Webstorm artifacts
 .idea/
 stack/corepersistence/collection/nbactions.xml

stack/config/src/main/resources/corepersistence.properties

@@ -0,0 +1,45 @@
+# 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.
+
+# Keep nothing but defaults here
+
+# The properties are not the actual configuration properties but
+# safe dynamic property defaults for our testing via IDE or Maven
+
+cassandra.embedded=true
+cassandra.hosts=127.0.0.1
+cassandra.port=9160
+cassandra.version=1.2
+cassandra.cluster_name=Usergrid
+cassandra.timeout=2000
+
+# Should be set to a larger value than Hystrix thread pool size
+cassandra.connections=800
+
+collections.keyspace=Usergrid_Applications
+collections.keyspace.strategy.options=replication_factor:1
+collections.keyspace.strategy.class=org.apache.cassandra.locator.SimpleStrategy
+
+collection.stage.transient.timeout=60
+
+elasticsearch.embedded=true
+elasticsearch.cluster_name=usergrid
+elasticsearch.index_prefix=usergrid
+elasticsearch.hosts=127.0.0.1
+elasticsearch.port=9300
+
+index.query.limit.default=100
+

stack/core/src/main/java/org/apache/usergrid/batch/service/SchedulerServiceImpl.java

@@ -414,7 +414,7 @@ public QueueManager getQm() {
 
     public EntityManager getEm() {
         if ( em == null  ) {
-            this.em = emf.getEntityManager( emf.getManagementAppId());
+            this.em = emf.getEntityManager( emf.getManagementAppId() );
         }
         return em;
     }