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 2015/07/10 15:37:36 UTC
[30/50] [abbrv] incubator-usergrid git commit: Merge branch 'master'
into two-dot-o
Merge branch 'master' into two-dot-o
Conflicts:
stack/build-tools/pom.xml
stack/config/pom.xml
stack/core/pom.xml
stack/launcher/pom.xml
stack/mongo-emulator/pom.xml
stack/pom.xml
stack/rest/pom.xml
stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AssetResourceIT.java
stack/rest/src/test/resources/log4j.properties
stack/services/pom.xml
stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
stack/test-utils/pom.xml
stack/tools/pom.xml
stack/tools/src/main/resources/log4j.properties
stack/websocket/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d8fdc3a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d8fdc3a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d8fdc3a1
Branch: refs/heads/two-dot-o-import
Commit: d8fdc3a1045a607d6f5a696a3f3b84c4a921023c
Parents: a784016 5fbe31f
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Jun 9 12:11:20 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Jun 9 12:11:20 2015 -0400
----------------------------------------------------------------------
CHANGELOG | 28 +-
LICENSE | 55 ++-
NOTICE | 13 +-
stack/java-sdk-old/pom.xml | 2 +-
.../applications/assets/AssetResourceIT.java | 13 +-
stack/rest/src/test/resources/log4j.properties | 6 +
.../usergrid/management/ManagementService.java | 5 +-
.../cassandra/ManagementServiceImpl.java | 49 ++-
.../assets/data/LocalFileBinaryStore.java | 51 +++
stack/tools/pom.xml | 18 +-
.../org/apache/usergrid/tools/ExportAdmins.java | 154 ++++---
.../org/apache/usergrid/tools/ImportAdmins.java | 412 +++++++++----------
.../org/apache/usergrid/tools/ToolBase.java | 10 +-
stack/tools/src/main/resources/log4j.properties | 19 +
.../usergrid/tools/ExportImportAdminsTest.java | 234 +++++++++++
...adata.usergrid-management.1433331614293.json | 85 ++++
...users.usergrid-management.1433331614293.json | 23 ++
17 files changed, 841 insertions(+), 336 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d8fdc3a1/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 6455748,10e9703..0fb5149
--- 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
@@@ -399,14 -372,14 +399,15 @@@ public class AssetResourceIT extends Ab
// create the entity that will be the asset, an image
Map<String, String> payload = hashMap("name", "cassandra_eye.jpg");
- JsonNode node = resource().path(orgAppPath + "/foos")
- .header( "Authorization", "Bearer " + access_token )
- //.queryParam("access_token", access_token)
- .accept( MediaType.APPLICATION_JSON )
- .type( MediaType.APPLICATION_JSON_TYPE )
- .post(JsonNode.class, payload);
+
+ JsonNode node = resource().path("/test-organization/test-app/foos")
+ .queryParam("access_token", access_token)
+ .accept(MediaType.APPLICATION_JSON)
+ .type(MediaType.APPLICATION_JSON_TYPE)
+ .post(JsonNode.class, payload);
++
JsonNode idNode = node.get("entities").get(0).get("uuid");
- uuid = idNode.getTextValue();
+ uuid = idNode.textValue();
// post image data to the asset entity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d8fdc3a1/stack/rest/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --cc stack/rest/src/test/resources/log4j.properties
index 8b1eac2,3ae1591..4d3d764
--- a/stack/rest/src/test/resources/log4j.properties
+++ b/stack/rest/src/test/resources/log4j.properties
@@@ -24,13 -24,12 +24,19 @@@ log4j.rootLogger=WARN,stdou
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
#log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) [%c] - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) %c{1} - %m%n
++<<<<<<< HEAD
+log4j.logger.org.apache.usergrid=INFO
+#log4j.logger.org.apache.usergrid.cassandra=DEBUG
+#log4j.logger.org.apache.usergrid.persistence.cassandra=DEBUG
++=======
+ log4j.category.org.apache=ERROR, stdout
+ log4j.category.org.apache.usergrid=WARN, stdout
+ log4j.category.org.apache.usergrid.rest=INFO, stdout
++>>>>>>> master
+log4j.logger.org.apache.usergrid.persistence.cassandra.CounterUtils=ERROR, stdout
log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout
log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout
log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d8fdc3a1/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d8fdc3a1/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --cc stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
index 85ddcbb,b3204a7..2f5f7d0
--- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@@ -516,8 -496,7 +516,8 @@@ public class ManagementServiceImpl impl
user = createAdminUserInternal( username, name, email, password, activated, disabled, userProperties );
}
+ logger.debug("User created");
- organization = createOrganizationInternal( organizationName, user, true, organizationProperties );
+ organization = createOrganizationInternal( null, organizationName, user, true, organizationProperties );
}
finally {
emailLock.unlock();
@@@ -529,28 -508,21 +529,28 @@@
}
- private OrganizationInfo createOrganizationInternal( String organizationName, UserInfo user, boolean activated )
- private OrganizationInfo createOrganizationInternal(
- UUID orgUuid, String organizationName, UserInfo user, boolean activated) throws Exception {
++ private OrganizationInfo createOrganizationInternal( UUID orgUuid, String organizationName, UserInfo user, boolean activated )
+ throws Exception {
+ logger.debug("createOrganizationInternal1");
- return createOrganizationInternal( organizationName, user, activated, null );
+ return createOrganizationInternal( orgUuid, organizationName, user, activated, null );
}
- private OrganizationInfo createOrganizationInternal( String organizationName, UserInfo user, boolean activated,
- private OrganizationInfo createOrganizationInternal(
- UUID orgUuid, String organizationName, UserInfo user, boolean activated,
- Map<String, Object> properties ) throws Exception {
++ private OrganizationInfo createOrganizationInternal( UUID orgUuid, String organizationName, UserInfo user, boolean activated,
+ Map<String, Object> properties ) throws Exception {
+
+ logger.info( "createOrganizationInternal2: {}", organizationName );
- if ( ( organizationName == null ) || ( user == null ) ) {
+ if ( organizationName == null ) {
+ logger.debug("organizationName = null");
+ return null;
+ }
+ if ( user == null ) {
+ logger.debug("user = null");
return null;
}
- logger.info( "createOrganizationInternal: {}", organizationName );
- EntityManager em = emf.getEntityManager( MANAGEMENT_APPLICATION_ID );
+
+ EntityManager em = emf.getEntityManager( smf.getManagementAppId() );
Group organizationEntity = new Group();
organizationEntity.setPath( organizationName );
@@@ -567,37 -544,39 +573,47 @@@
new OrganizationInfo( organizationEntity.getUuid(), organizationName, properties );
updateOrganization( organization );
- postOrganizationActivity( organization.getUuid(), user, "create", organizationEntity, "Organization",
- organization.getName(),
- "<a href=\"mailto:" + user.getEmail() + "\">" + user.getName() + " (" + user.getEmail()
- + ")</a> created a new organization account named " + organizationName, null );
+ if ( orgUuid == null ) { // no import ID specified, so do the activation email flow stuff
+
+ logger.info( "createOrganizationInternal: {}", organizationName );
+ postOrganizationActivity( organization.getUuid(), user, "create", organizationEntity, "Organization",
+ organization.getName(),
+ "<a href=\"mailto:" + user.getEmail() + "\">" + user.getName() + " (" + user.getEmail()
+ + ")</a> created a new organization account named " + organizationName, null );
- startOrganizationActivationFlow( organization );
+ startOrganizationActivationFlow( organization );
+ }
+
+
return organization;
}
@Override
- public OrganizationInfo createOrganization( String organizationName, UserInfo user, boolean activated )
+ public OrganizationInfo createOrganization(String organizationName, UserInfo user, boolean activated)
+ throws Exception {
+ return createOrganization( null, organizationName, user, activated );
+ }
+
+ @Override
+ public OrganizationInfo createOrganization(UUID orgUuid, String organizationName, UserInfo user, boolean activated)
throws Exception {
- if ( ( organizationName == null ) || ( user == null ) ) {
+ if ( organizationName == null ) {
+ logger.debug("organizationName = null");
return null;
}
+ if ( user == null ) {
+ logger.debug("user = null");
+ return null;
+ }
+
Lock groupLock =
- getUniqueUpdateLock( lockManager, MANAGEMENT_APPLICATION_ID, organizationName, "groups", "path" );
- EntityManager em = emf.getEntityManager( MANAGEMENT_APPLICATION_ID );
- if ( !em.isPropertyValueUniqueForEntity( "group", "path", organizationName ) ) {
- throw new DuplicateUniquePropertyExistsException( "group", "path", organizationName );
+ getUniqueUpdateLock( lockManager, smf.getManagementAppId(), organizationName, "groups", PROPERTY_PATH );
+ EntityManager em = emf.getEntityManager( smf.getManagementAppId() );
+ if ( !em.isPropertyValueUniqueForEntity( "group", PROPERTY_PATH, organizationName ) ) {
+ throw new DuplicateUniquePropertyExistsException( "group", PROPERTY_PATH, organizationName );
}
try {
groupLock.lock();
@@@ -1507,20 -1472,21 +1523,25 @@@
String path = null;
- for ( Entity entity : results.getEntities() ) {
+ do {
+ for ( Entity entity : results.getEntities() ) {
- path = ( String ) entity.getProperty( "path" );
+ path = ( String ) entity.getProperty( PROPERTY_PATH );
- if ( path != null ) {
- path = path.toLowerCase();
- }
+ if ( path != null ) {
+ path = path.toLowerCase();
+ }
- try {
-- organizations.put( entity.getUuid(), path );
- } catch (IllegalArgumentException e) {
- logger.warn("Error adding " + entity.getUuid() + ":" + path + " to BiMap: " + e.getMessage() );
++ try {
++ organizations.put( entity.getUuid(), path );
++ } catch (IllegalArgumentException e) {
++ logger.warn("Error adding " + entity.getUuid() + ":" + path + " to BiMap: " + e.getMessage() );
++ }
}
- }
+ results = results.getNextPageResults();
- }while(results != null);
++
++ } while(results != null);
return organizations;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d8fdc3a1/stack/tools/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d8fdc3a1/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
----------------------------------------------------------------------
diff --cc stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
index fe2752f,8831b89..5bbad14
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/ExportAdmins.java
@@@ -20,26 -17,26 +17,22 @@@
package org.apache.usergrid.tools;
--
--import java.util.List;
--import java.util.Map;
--import java.util.Set;
--import java.util.UUID;
-
- import org.codehaus.jackson.JsonGenerator;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
--
++import org.apache.usergrid.persistence.index.query.Query;
+ import com.google.common.collect.BiMap;
-import org.codehaus.jackson.JsonGenerator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.commons.cli.CommandLine;
--
++import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.persistence.ConnectionRef;
import org.apache.usergrid.persistence.Entity;
import org.apache.usergrid.persistence.EntityManager;
--import org.apache.usergrid.persistence.Query;
import org.apache.usergrid.persistence.Results;
--import org.apache.usergrid.persistence.Results.Level;
--import org.apache.usergrid.persistence.cassandra.CassandraService;
- import org.apache.usergrid.utils.JsonUtils;
++import org.codehaus.jackson.JsonGenerator;
++import org.slf4j.Logger;
++import org.slf4j.LoggerFactory;
++
++import java.util.List;
++import java.util.Map;
++import java.util.Set;
++import java.util.UUID;
/**
@@@ -65,26 -64,25 +60,25 @@@ public class ExportAdmins extends Expor
}
- private void exportApplicationsForOrg( Map.Entry<UUID, String> organization ) throws Exception {
+ private void exportAdminUsers() throws Exception {
- EntityManager em = emf.getEntityManager( CassandraService.MANAGEMENT_APPLICATION_ID );
+ int count = 0;
- // Get the JSon serializer.
- JsonGenerator jg = getJsonGenerator( createOutputFile( "application", em.getApplication().getName() ) );
- EntityManager em = emf.getEntityManager( CassandraService.MANAGEMENT_APPLICATION_ID );
++ EntityManager em = emf.getEntityManager( CpNamingUtils.MANAGEMENT_APPLICATION_ID );
- jg.writeStartArray();
+ // write one JSON file for management application users
+
+ JsonGenerator usersFile =
+ getJsonGenerator( createOutputFile( ADMIN_USERS_PREFIX, em.getApplication().getName() ) );
+ usersFile.writeStartArray();
- // Create a GENERATOR for the application collections.
- JsonGenerator collectionsJg =
- getJsonGenerator( createOutputFile( "collections", em.getApplication().getName() ) );
- collectionsJg.writeStartObject();
+ // write one JSON file for metadata: collections, connections and dictionaries of those users
- Map<String, Object> metadata = em.getApplicationCollectionMetadata();
- echo( JsonUtils.mapToFormattedJsonString( metadata ) );
+ JsonGenerator metadataFile =
+ getJsonGenerator( createOutputFile( ADMIN_USER_METADATA_PREFIX, em.getApplication().getName() ) );
+ metadataFile.writeStartObject();
- // Loop through the collections. This is the only way to loop
- // through the entities in the application (former namespace).
- // for ( String collectionName : metadata.keySet() ) {
+ // query for and loop through all users in management application
Query query = new Query();
query.setLimit( MAX_ENTITY_FETCH );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d8fdc3a1/stack/tools/src/main/java/org/apache/usergrid/tools/ToolBase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d8fdc3a1/stack/tools/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --cc stack/tools/src/main/resources/log4j.properties
index b993313,73ade48..c288fec
--- a/stack/tools/src/main/resources/log4j.properties
+++ b/stack/tools/src/main/resources/log4j.properties
@@@ -26,28 -26,21 +26,47 @@@ log4j.appender.stdout=org.apache.log4j.
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) [%c] - %m%n
++<<<<<<< HEAD
+log4j.category.org.apache.usergrid.tools=TRACE
+log4j.category.org.apache.usergrid=ERROR
+
+log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, stdout
+log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout
+log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
+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.persistence.cassandra.DB=WARN
+ log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN
+ log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN
+ log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN
+ log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN
+ log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN
+ log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN
+ log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN
+ log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR
+ #log4j.logger.org.apache.usergrid.locking.singlenode.SingleNodeLockManagerImpl=DEBUG, stdout
+
+ log4j.logger.org.apache.usergrid.persistence.hector.CountingMutator=INFO
+
++>>>>>>> master
#log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG, stdout
+#log4j.logger.org.apache.usergrid.corepersistence=INFO
+#log4j.logger.org.apache.usergrid.corepersistence.CpSetup=INFO
+log4j.logger.org.apache.usergrid.corepersistence.CpEntityManagerFactory=DEBUG
+#log4j.logger.org.apache.usergrid.corepersistence.CpEntityManager=DEBUG
+#log4j.logger.org.apache.usergrid.corepersistence.CpRelationManager=DEBUG
+
+#log4j.logger.org.apache.usergrid.persistence.collection=INFO
+#log4j.logger.org.apache.usergrid.persistence.index=DEBUG
+#log4j.logger.org.apache.usergrid.persistence.index.impl=DEBUG