You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/07/24 17:22:04 UTC
[36/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o' into two-dot-o-dev
Merge branch 'two-dot-o' into two-dot-o-dev
Conflicts:
.usergridversion
stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexingUtils.java
stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
stack/tools/src/main/resources/log4j.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d32cee48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d32cee48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d32cee48
Branch: refs/heads/USERGRID-869
Commit: d32cee48bb0cb450c3e04281ae337f73d73bb0b4
Parents: 23ce4c5 764a7c8
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jul 22 08:40:00 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Jul 22 08:40:00 2015 -0400
----------------------------------------------------------------------
CHANGELOG | 3 -
LICENSE | 10 +
stack/LICENSE-2.0.txt | 202 -------------------
.../applications/assets/AssetResourceIT.java | 2 +-
.../src/test/resources/cat-larger-than-6mb.jpg | Bin 9799257 -> 0 bytes
.../src/test/resources/ship-larger-than-6mb.gif | Bin 0 -> 7407487 bytes
.../org/apache/usergrid/tools/AppAudit.java | 30 +--
.../java/org/apache/usergrid/tools/Cli.java | 6 +-
.../apache/usergrid/tools/DupAdminRepair.java | 34 +---
.../org/apache/usergrid/tools/DupOrgRepair.java | 36 ++--
.../apache/usergrid/tools/EntityCleanup.java | 178 ----------------
.../org/apache/usergrid/tools/EntityUpdate.java | 25 +--
.../org/apache/usergrid/tools/ExportAdmins.java | 73 +++----
.../org/apache/usergrid/tools/ImportAdmins.java | 60 ++++--
.../org/apache/usergrid/tools/ToolBase.java | 6 +-
.../org/apache/usergrid/tools/UserManager.java | 22 ++
stack/tools/src/main/resources/log4j.properties | 1 +
17 files changed, 152 insertions(+), 536 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d32cee48/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
----------------------------------------------------------------------
diff --cc stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
index 616d163,b318065..3c7954d
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
@@@ -222,29 -334,51 +222,29 @@@ public class AssetResourceIT extends Ab
try {
- //UserRepo.INSTANCE.load( resource(), access_token );
+ // upload a file larger than 6mb
- byte[] data = IOUtils.toByteArray( this.getClass().getResourceAsStream( "/cat-larger-than-6mb.jpg" ) );
+ byte[] data = IOUtils.toByteArray( this.getClass().getResourceAsStream( "/ship-larger-than-6mb.gif" ) );
FormDataMultiPart form = new FormDataMultiPart().field( "file", data, MediaType.MULTIPART_FORM_DATA_TYPE );
+ ApiResponse postResponse = pathResource( getOrgAppPath( "bars" ) ).post( form );
+ UUID assetId = postResponse.getEntities().get(0).getUuid();
- String orgAppPath = clientSetup.getOrganizationName() + "/" + clientSetup.getAppName();
+ String errorMessage = null;
+ LOG.info( "Waiting for upload to finish..." );
+ Thread.sleep( 2000 );
- // send data
- JsonNode node = resource().path( orgAppPath + "/bars" ).queryParam( "access_token", access_token )
- .accept( MediaType.APPLICATION_JSON ).type( MediaType.MULTIPART_FORM_DATA )
- .post( JsonNode.class, form );
- //logNode( node );
- JsonNode idNode = node.get( "entities" ).get( 0 ).get( "uuid" );
- String uuid = idNode.textValue();
+ // attempt to get asset entity, it should contain error
- // get entity
- String errorMessage = null;
- long timeout = System.currentTimeMillis() + 60000;
- while (true) {
- LOG.info( "Waiting for upload to finish..." );
- Thread.sleep( 2000 );
- node = resource().path( orgAppPath + "/bars/" + uuid )
- .queryParam( "access_token", access_token ).accept( MediaType.APPLICATION_JSON_TYPE )
- .get( JsonNode.class );
- //logNode( node );
-
- // poll for the error to happen
- if (node.findValue( "error" ) != null) {
- errorMessage = node.findValue("error").asText();
- break;
- }
- if (System.currentTimeMillis() > timeout) {
- throw new TimeoutException();
- }
- }
-
- assertTrue( errorMessage.startsWith("Asset size "));
+ ApiResponse getResponse = pathResource( getOrgAppPath( "bars/" +assetId ) ).get( ApiResponse.class );
+ Map<String, Object> fileMetadata = (Map<String, Object>)getResponse.getEntities().get(0).get("file-metadata");
+ assertTrue( fileMetadata.get( "error" ).toString().startsWith( "Asset size " ) );
} finally {
- props = new HashMap<String, String>();
+
+ // set max upload size back to default 25mb
+
props.put( "usergrid.binary.max-size-mb", "25" );
- resource().path( "/testproperties" )
- .queryParam( "access_token", access_token )
- .accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE ).post( props );
+ pathResource( "testproperties" ).post( props );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d32cee48/stack/tools/src/main/java/org/apache/usergrid/tools/AppAudit.java
----------------------------------------------------------------------
diff --cc stack/tools/src/main/java/org/apache/usergrid/tools/AppAudit.java
index 0d6e96b,0288bdb..8604bec
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/AppAudit.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/AppAudit.java
@@@ -17,33 -17,34 +17,19 @@@
package org.apache.usergrid.tools;
--import java.util.ArrayList;
--import java.util.Collection;
--import java.util.HashMap;
--import java.util.HashSet;
--import java.util.List;
--import java.util.Map;
--import java.util.Map.Entry;
--import java.util.Set;
--import java.util.UUID;
--
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
--import org.apache.usergrid.management.ApplicationInfo;
--import org.apache.usergrid.persistence.Entity;
--import org.apache.usergrid.persistence.EntityManager;
--import org.apache.usergrid.persistence.EntityRef;
--import org.apache.usergrid.persistence.index.query.Query;
--import org.apache.usergrid.persistence.Results;
--import org.apache.usergrid.persistence.SimpleEntityRef;
-import org.apache.usergrid.persistence.cassandra.CassandraService;
--
++import com.google.common.collect.BiMap;
++import com.google.common.collect.HashBiMap;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
++import org.apache.usergrid.management.ApplicationInfo;
++import org.apache.usergrid.persistence.*;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
--import com.google.common.collect.BiMap;
--import com.google.common.collect.HashBiMap;
++import java.util.*;
++import java.util.Map.Entry;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d32cee48/stack/tools/src/main/java/org/apache/usergrid/tools/Cli.java
----------------------------------------------------------------------
diff --cc stack/tools/src/main/java/org/apache/usergrid/tools/Cli.java
index 2ff000d,2ff000d..9594403
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/Cli.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/Cli.java
@@@ -82,7 -82,7 +82,7 @@@ public class Cli extends ToolBase
public void handleInput() throws QueryParseException {
BufferedReader d = new BufferedReader( new InputStreamReader( System.in ) );
-- UUID applicationId = emf.getDefaultAppId();
++ UUID applicationId = null;
while ( true ) {
System.out.println();
@@@ -103,13 -103,13 +103,13 @@@
applicationId = UUIDUtils.tryExtractUUID( s );
if ( applicationId == null ) {
try {
-- applicationId = emf.lookupApplication( s.trim() );
++ applicationId = emf.lookupApplication( s.trim() ).get();
}
catch ( Exception e ) {
}
}
if ( applicationId == null ) {
-- applicationId = emf.getDefaultAppId();
++ System.out.print("Cannot find application: " + s.trim() );
}
System.out.println( "Using application " + applicationId );
continue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d32cee48/stack/tools/src/main/java/org/apache/usergrid/tools/DupAdminRepair.java
----------------------------------------------------------------------
diff --cc stack/tools/src/main/java/org/apache/usergrid/tools/DupAdminRepair.java
index 07f6b50,07f6b50..17968b7
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/DupAdminRepair.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/DupAdminRepair.java
@@@ -17,36 -17,36 +17,24 @@@
package org.apache.usergrid.tools;
--import java.io.FileWriter;
--import java.util.ArrayList;
--import java.util.Collection;
--import java.util.Collections;
--import java.util.List;
--import java.util.Map;
--import java.util.UUID;
--
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
++import com.google.common.collect.HashMultimap;
++import com.google.common.collect.Multimap;
++import org.apache.commons.cli.CommandLine;
++import org.apache.commons.cli.Option;
++import org.apache.commons.cli.OptionBuilder;
++import org.apache.commons.cli.Options;
import org.apache.usergrid.management.OrganizationInfo;
import org.apache.usergrid.management.UserInfo;
--import org.apache.usergrid.persistence.Entity;
--import org.apache.usergrid.persistence.EntityManager;
--import org.apache.usergrid.persistence.index.query.Query;
--import org.apache.usergrid.persistence.Results;
--import org.apache.usergrid.persistence.SimpleEntityRef;
--import org.apache.usergrid.persistence.cassandra.CassandraService;
++import org.apache.usergrid.persistence.*;
import org.apache.usergrid.persistence.entities.Application;
import org.apache.usergrid.persistence.entities.User;
import org.apache.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
import org.apache.usergrid.utils.JsonUtils;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
--import org.apache.commons.cli.CommandLine;
--import org.apache.commons.cli.Option;
--import org.apache.commons.cli.OptionBuilder;
--import org.apache.commons.cli.Options;
--
--import com.google.common.collect.HashMultimap;
--import com.google.common.collect.Multimap;
++import java.io.FileWriter;
++import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d32cee48/stack/tools/src/main/java/org/apache/usergrid/tools/DupOrgRepair.java
----------------------------------------------------------------------
diff --cc stack/tools/src/main/java/org/apache/usergrid/tools/DupOrgRepair.java
index 4788c06,b9b0c69..a20dda1
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/DupOrgRepair.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/DupOrgRepair.java
@@@ -17,31 -17,32 +17,25 @@@
package org.apache.usergrid.tools;
--import java.io.FileWriter;
--import java.util.Collection;
--import java.util.Map;
--import java.util.Map.Entry;
--import java.util.UUID;
--
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
--import org.apache.usergrid.management.OrganizationInfo;
--import org.apache.usergrid.management.UserInfo;
--import org.apache.usergrid.persistence.Entity;
--import org.apache.usergrid.persistence.EntityManager;
--import org.apache.usergrid.persistence.index.query.Query;
--import org.apache.usergrid.persistence.Results;
--import org.apache.usergrid.persistence.SimpleEntityRef;
--import org.apache.usergrid.persistence.entities.Application;
--import org.apache.usergrid.utils.JsonUtils;
--
++import com.google.common.collect.HashMultimap;
++import com.google.common.collect.Multimap;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
++import org.apache.usergrid.management.OrganizationInfo;
++import org.apache.usergrid.management.UserInfo;
++import org.apache.usergrid.persistence.*;
++import org.apache.usergrid.persistence.entities.Application;
++import org.apache.usergrid.utils.JsonUtils;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
--import com.google.common.collect.HashMultimap;
--import com.google.common.collect.Multimap;
-import org.apache.usergrid.management.ApplicationInfo;
++import java.io.FileWriter;
++import java.util.Collection;
++import java.util.Map;
++import java.util.Map.Entry;
++import java.util.UUID;
/**
@@@ -220,7 -221,7 +214,7 @@@ public class DupOrgRepair extends Expor
// check to see if this orgname/appname lookup returns the app we're
// about to re-assign. If it does NOT, then we need to rename this app
// before performing the link.
-- UUID appIdToKeep = emf.lookupApplication( app.getKey() );
++ UUID appIdToKeep = emf.lookupApplication( app.getKey() ).get();
UUID appIdToChange =
appIdToKeep.equals( app.getValue() ) ? targetApps.get( app.getKey() ) : app.getValue();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d32cee48/stack/tools/src/main/java/org/apache/usergrid/tools/EntityCleanup.java
----------------------------------------------------------------------
diff --cc stack/tools/src/main/java/org/apache/usergrid/tools/EntityCleanup.java
index e5cae31,e5cae31..0000000
deleted file mode 100644,100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/EntityCleanup.java
+++ /dev/null
@@@ -1,178 -1,178 +1,0 @@@
--/*
-- * 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.tools;
--
--
--import java.nio.ByteBuffer;
--import java.util.LinkedHashSet;
--import java.util.Map.Entry;
--import java.util.Set;
--import java.util.UUID;
--
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
--import org.apache.usergrid.persistence.Entity;
--import org.apache.usergrid.persistence.IndexBucketLocator;
--import org.apache.usergrid.persistence.IndexBucketLocator.IndexType;
--import org.apache.usergrid.persistence.Results;
--import org.apache.usergrid.persistence.Schema;
--import org.apache.usergrid.persistence.cassandra.CassandraService;
--import org.apache.usergrid.persistence.cassandra.EntityManagerImpl;
--import org.apache.usergrid.persistence.cassandra.index.IndexScanner;
--import org.apache.usergrid.persistence.query.ir.result.ScanColumn;
--import org.apache.usergrid.persistence.query.ir.result.ScanColumnTransformer;
--import org.apache.usergrid.persistence.query.ir.result.SliceIterator;
--import org.apache.usergrid.persistence.query.ir.result.UUIDIndexSliceParser;
--
--import org.apache.commons.cli.CommandLine;
--import org.apache.commons.cli.Option;
--import org.apache.commons.cli.OptionBuilder;
--import org.apache.commons.cli.Options;
--
--import me.prettyprint.hector.api.Keyspace;
--import me.prettyprint.hector.api.mutation.Mutator;
--
--import static me.prettyprint.hector.api.factory.HFactory.createMutator;
--import static org.apache.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;
--import static org.apache.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS;
--import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.addDeleteToMutator;
--import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
--import static org.apache.usergrid.utils.UUIDUtils.getTimestampInMicros;
--import static org.apache.usergrid.utils.UUIDUtils.newTimeUUID;
--import static org.apache.usergrid.persistence.cassandra.Serializers.*;
--
--
--/**
-- * This is a utility to audit all available entity ids for existing target rows If an entity
-- * Id exists in the collection index with no target entity, the id is removed from the index.
-- * This is a cleanup tool as a result of the issue in USERGRID-323
-- *
-- * @author tnine
-- */
--public class EntityCleanup extends ToolBase {
--
-- /**
-- *
-- */
-- private static final int PAGE_SIZE = 100;
--
--
-- private static final Logger logger = LoggerFactory.getLogger( EntityCleanup.class );
--
--
-- @Override
-- @SuppressWarnings("static-access")
-- public Options createOptions() {
--
-- Option hostOption =
-- OptionBuilder.withArgName( "host" ).hasArg().isRequired( true ).withDescription( "Cassandra host" )
-- .create( "host" );
--
-- Options options = new Options();
-- options.addOption( hostOption );
--
-- return options;
-- }
--
--
-- /*
-- * (non-Javadoc)
-- *
-- * @see
-- * org.apache.usergrid.tools.ToolBase#runTool(org.apache.commons.cli.CommandLine)
-- */
-- @Override
-- public void runTool( CommandLine line ) throws Exception {
-- startSpring();
--
-- logger.info( "Starting entity cleanup" );
--
-- Results results = null;
--
--
-- for ( Entry<String, UUID> app : emf.getApplications().entrySet() ) {
--
-- logger.info( "Starting cleanup for app {}", app.getKey() );
--
-- UUID applicationId = app.getValue();
-- EntityManagerImpl em = ( EntityManagerImpl ) emf.getEntityManager( applicationId );
--
-- CassandraService cass = em.getCass();
-- IndexBucketLocator indexBucketLocator = em.getIndexBucketLocator();
--
-- UUID timestampUuid = newTimeUUID();
-- long timestamp = getTimestampInMicros( timestampUuid );
--
-- Set<String> collectionNames = em.getApplicationCollections();
--
-- // go through each collection and audit the value
-- for ( String collectionName : collectionNames ) {
--
-- String type = Schema.getAssociatedEntityType(collectionName);
--
-- IndexScanner scanner = cass.getIdList( cass.getApplicationKeyspace( applicationId ),
-- key( applicationId, DICTIONARY_COLLECTIONS, collectionName ), null, null, PAGE_SIZE, false,
-- indexBucketLocator, applicationId, collectionName, false );
--
-- SliceIterator itr = new SliceIterator( null, scanner, new UUIDIndexSliceParser() );
--
-- while ( itr.hasNext() ) {
--
-- // load all entity ids from the index itself.
--
-- Set<ScanColumn> copy = new LinkedHashSet<ScanColumn>( itr.next() );
--
-- results = em.getEntities(ScanColumnTransformer.getIds( copy ), type );
-- // nothing to do they're the same size so there's no
-- // orphaned uuid's in the entity index
-- if ( copy.size() == results.size() ) {
-- continue;
-- }
--
-- // they're not the same, we have some orphaned records,
-- // remove them
--
-- for ( Entity returned : results.getEntities() ) {
-- copy.remove( returned.getUuid() );
-- }
--
-- // what's left needs deleted, do so
--
-- logger.info( "Cleaning up {} orphaned entities for app {}", copy.size(), app.getValue() );
--
-- Keyspace ko = cass.getApplicationKeyspace( applicationId );
-- Mutator<ByteBuffer> m = createMutator( ko, be );
--
-- for ( ScanColumn col : copy ) {
--
-- final UUID id = col.getUUID();
--
-- Object collections_key = key( applicationId, Schema.DICTIONARY_COLLECTIONS, collectionName,
-- indexBucketLocator
-- .getBucket( applicationId, IndexType.COLLECTION, id, collectionName ) );
--
-- addDeleteToMutator( m, ENTITY_ID_SETS, collections_key, id, timestamp );
--
-- logger.info( "Deleting entity with id '{}' from collection '{}'", id, collectionName );
-- }
--
-- m.execute();
-- }
-- }
-- }
-- }
--}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d32cee48/stack/tools/src/main/java/org/apache/usergrid/tools/EntityUpdate.java
----------------------------------------------------------------------
diff --cc stack/tools/src/main/java/org/apache/usergrid/tools/EntityUpdate.java
index 1847595,1847595..04789c0
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/EntityUpdate.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/EntityUpdate.java
@@@ -17,26 -17,26 +17,19 @@@
package org.apache.usergrid.tools;
--import java.io.File;
--import java.util.Map;
--
--import org.codehaus.jackson.map.ObjectMapper;
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
--import org.apache.usergrid.management.ApplicationInfo;
--import org.apache.usergrid.persistence.DynamicEntity;
--import org.apache.usergrid.persistence.Entity;
--import org.apache.usergrid.persistence.EntityManager;
--import org.apache.usergrid.persistence.PagingResultsIterator;
--import org.apache.usergrid.persistence.index.query.Query;
--import org.apache.usergrid.persistence.Results;
--
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
++import org.apache.usergrid.management.ApplicationInfo;
++import org.apache.usergrid.persistence.*;
import org.apache.usergrid.persistence.index.query.Identifier;
--import org.apache.usergrid.persistence.index.query.Query.Level;
++import org.codehaus.jackson.map.ObjectMapper;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
++
++import java.io.File;
++import java.util.Map;
@@@ -139,7 -139,7 +132,7 @@@ public class EntityUpdate extends ToolB
Results results = entityManager.searchCollection( entityManager.getApplicationRef(), collectionName, query );
-- PagingResultsIterator itr = new PagingResultsIterator( results, Level.ALL_PROPERTIES );
++ PagingResultsIterator itr = new PagingResultsIterator( results, Query.Level.ALL_PROPERTIES );
long count = 0;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d32cee48/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
----------------------------------------------------------------------
diff --cc stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
index 7f8dd1b,7f8dd1b..aa33e49
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
@@@ -19,6 -19,6 +19,7 @@@ package org.apache.usergrid.tools
import java.util.Properties;
++import org.apache.usergrid.corepersistence.CpEntityManagerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@@ -28,7 -28,7 +29,6 @@@ import org.springframework.context.supp
import org.apache.usergrid.management.ManagementService;
import org.apache.usergrid.persistence.EntityManagerFactory;
import org.apache.usergrid.persistence.cassandra.CassandraService;
--import org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
import org.apache.usergrid.persistence.cassandra.Setup;
import org.apache.usergrid.services.ServiceManagerFactory;
@@@ -50,7 -50,7 +50,7 @@@ import static org.apache.usergrid.utils
/**
-- * Base class for Usergrid Tools commands. Any class that implements this can be called with
++ * Base class for Usergrid Tools commands. Any class that implements this can be called with
* java -jar {jarname} org.apache.usergrid.tools.{classname}.
*/
public abstract class ToolBase {
@@@ -179,7 -179,7 +179,7 @@@
public void setupCassandra() throws Exception {
-- Setup setup = ( ( EntityManagerFactoryImpl ) emf ).getSetup();
++ Setup setup = ( (CpEntityManagerFactory) emf ).getSetup();
logger.info( "Setting up Usergrid schema" );
setup.init();
logger.info( "Usergrid schema setup" );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d32cee48/stack/tools/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --cc stack/tools/src/main/resources/log4j.properties
index 037f4b1,00834cf..c71173e
--- a/stack/tools/src/main/resources/log4j.properties
+++ b/stack/tools/src/main/resources/log4j.properties
@@@ -40,7 -40,7 +40,8 @@@ log4j.logger.org.apache.usergrid.rest.s
log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout
#log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout
#log4j.logger.org.apache.usergrid.persistence.hector.CountingMutator=INFO, stdout
+log4j.logger.org.apache.usergrid.tools=DEBUG
+
log4j.logger.org.apache.usergrid.management.cassandra=DEBUB
log4j.logger.org.apache.usergrid.tools=INFO