move initialize index
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/81f91708 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/81f91708 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/81f91708 Branch: refs/heads/USERGRID-347 Commit: 81f9170815f26bf4495f2a8b40bfde9096100570 Parents: e88167d Author: Shawn Feldman <[email protected]> Authored: Fri Mar 20 17:48:37 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Fri Mar 20 17:48:37 2015 -0600 ---------------------------------------------------------------------- .../usergrid/corepersistence/CpEntityManagerFactory.java | 6 ++++-- .../main/java/org/apache/usergrid/corepersistence/CpSetup.java | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/81f91708/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java index 95ffbaa..3cfc1a4 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java @@ -253,7 +253,6 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application Map<String, Object> properties ) throws Exception { - //Ensure our management system exists before creating our application init(); @@ -266,8 +265,11 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application throw new ApplicationAlreadyExistsException( appName ); } - getSetup().setupApplicationKeyspace( applicationId, appName ); + ApplicationScope applicationScope = new ApplicationScopeImpl(new SimpleId( applicationId,"application")); + ApplicationEntityIndex applicationEntityIndex = entityIndexFactory.createApplicationEntityIndex(applicationScope); + applicationEntityIndex.initializeIndex(); + getSetup().setupApplicationKeyspace( applicationId, appName ); final Optional<UUID> cachedValue = orgApplicationCache.getOrganizationId( organizationName ); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/81f91708/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java index 1d75e47..040f60f 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java @@ -107,11 +107,6 @@ public class CpSetup implements Setup { setupStaticKeyspace(); - ApplicationScope applicationScope = new ApplicationScopeImpl(new SimpleId( CpNamingUtils.SYSTEM_APP_ID,"application")); - ApplicationEntityIndex applicationEntityIndex = entityIndexFactory.createApplicationEntityIndex(applicationScope); - //force the EMF creation of indexes before creating the default applications - applicationEntityIndex.initializeIndex(); - injector.getInstance( DataMigrationManager.class ).migrate(); logger.info( "Setting up default applications" );
