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/04/22 21:19:18 UTC

[1/4] incubator-usergrid git commit: Per standard policy, we can't over write the repos. Was causing the builds to not deploy.

Repository: incubator-usergrid
Updated Branches:
  refs/heads/USERGRID-576-ssometrics 77819b343 -> e7a543b4b


Per standard policy, we can't over write the repos.  Was causing the builds to not deploy.


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

Branch: refs/heads/USERGRID-576-ssometrics
Commit: dc2e712adcf386cd0468a36ebbf814bbfe270ed8
Parents: 25d0077
Author: John D. Ament <jo...@apache.org>
Authored: Thu Apr 16 21:06:58 2015 -0400
Committer: John D. Ament <jo...@apache.org>
Committed: Thu Apr 16 21:06:58 2015 -0400

----------------------------------------------------------------------
 stack/pom.xml | 24 ------------------------
 1 file changed, 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/dc2e712a/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 9bc0b06..82d0ea3 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -71,13 +71,6 @@
     <!-- NOTE:   </activeProfiles>                                   -->
     <!-- NOTE: </settings>                                           -->
 
-    <snapshot.repository.url>
-      https://repository.apache.org/content/repositories/snapshots
-    </snapshot.repository.url>
-    <release.repository.url>
-      https://repository.apache.org/service/local/staging/deploy/maven2
-    </release.repository.url>
-
     <!-- =================================================================== -->
     <!-- Properties: General Settings -->
     <!-- =================================================================== -->
@@ -163,23 +156,6 @@
     </developer>
   </developers>
 
-
-  <distributionManagement>
-    <!-- Versioned (non-snapshot) releases are published to this repository -->
-    <repository>
-      <id>usergrid.releases</id>
-      <name>Usergrid Releases</name>
-      <url>${release.repository.url}</url>
-    </repository>
-
-    <!-- Snapshots (not-releases) are published to this repository -->
-    <snapshotRepository>
-      <id>usergrid.snapshots</id>
-      <name>Usergrid Snapshots</name>
-      <url>${snapshot.repository.url}</url>
-    </snapshotRepository>
-  </distributionManagement>
-
   <modules>
     <module>java-sdk-old</module>
     <module>config</module>


[2/4] incubator-usergrid git commit: Fix to ensure that local Admin Users created by SSO / external tokens get at least one organization.

Posted by sn...@apache.org.
Fix to ensure that local Admin Users created by SSO / external tokens get at least one organization.


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

Branch: refs/heads/USERGRID-576-ssometrics
Commit: aa4f55a1bcec623a9a3029eb21e9404d2257aeb7
Parents: 2e90f39
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Apr 21 16:34:27 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Apr 21 16:34:27 2015 -0400

----------------------------------------------------------------------
 .../rest/management/ManagementResource.java     | 66 +++++++++-----------
 1 file changed, 31 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa4f55a1/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
index 2bbcfd9..d2ba606 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
@@ -17,62 +17,53 @@
 package org.apache.usergrid.rest.management;
 
 
-import java.net.URLEncoder;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.json.JSONConfiguration;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.usergrid.exception.NotImplementedException;
-import org.apache.usergrid.management.ApplicationCreator;
-import org.apache.usergrid.management.OrganizationInfo;
-import org.apache.usergrid.management.OrganizationOwnerInfo;
-import org.apache.usergrid.persistence.entities.User;
-import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
-import org.codehaus.jackson.JsonNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
+import com.sun.jersey.api.view.Viewable;
 import org.apache.amber.oauth2.common.error.OAuthError;
 import org.apache.amber.oauth2.common.exception.OAuthProblemException;
 import org.apache.amber.oauth2.common.message.OAuthResponse;
 import org.apache.amber.oauth2.common.message.types.GrantType;
+import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.codec.Base64;
-
+import org.apache.usergrid.exception.NotImplementedException;
+import org.apache.usergrid.management.ApplicationCreator;
+import org.apache.usergrid.management.OrganizationInfo;
+import org.apache.usergrid.management.OrganizationOwnerInfo;
 import org.apache.usergrid.management.UserInfo;
 import org.apache.usergrid.management.exceptions.DisabledAdminUserException;
 import org.apache.usergrid.management.exceptions.UnactivatedAdminUserException;
 import org.apache.usergrid.management.exceptions.UnconfirmedAdminUserException;
+import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
 import org.apache.usergrid.rest.AbstractContextResource;
 import org.apache.usergrid.rest.exceptions.RedirectionException;
 import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
 import org.apache.usergrid.rest.management.users.UsersResource;
 import org.apache.usergrid.security.oauth.AccessInfo;
 import org.apache.usergrid.security.shiro.utils.SubjectUtils;
+import org.codehaus.jackson.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
 
-import com.sun.jersey.api.view.Viewable;
-
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
-import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+import java.net.URLEncoder;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
 
+import static javax.servlet.http.HttpServletResponse.*;
+import static javax.ws.rs.core.MediaType.*;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 import static org.apache.usergrid.utils.JsonUtils.mapToJsonString;
 import static org.apache.usergrid.utils.StringUtils.stringOrSubstringAfterFirst;
@@ -573,7 +564,12 @@ public class ManagementResource extends AbstractContextResource {
                 String dummyPassword = RandomStringUtils.randomAlphanumeric( 40 );
 
                 JsonNode orgsNode = userNode.get( "organizations" );
-                final Iterator<String> fieldNames = orgsNode.getFieldNames();
+                Iterator<String> fieldNames = orgsNode.getFieldNames();
+                if (!fieldNames.hasNext()) {
+                    // no organizations for user exist in response from central Usergrid SSO
+                    // so create user's personal organization and use username as organization name
+                    fieldNames = Collections.singletonList( username ).iterator();
+                }
 
                 // create user and any organizations that user is supposed to have
 


[3/4] incubator-usergrid git commit: This closes #227

Posted by sn...@apache.org.
This closes #227


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

Branch: refs/heads/USERGRID-576-ssometrics
Commit: 0d1965d1820f501644ad60c3f98ce7d390fae27f
Parents: aa4f55a dc2e712
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Apr 22 10:57:28 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Apr 22 10:57:28 2015 -0400

----------------------------------------------------------------------
 stack/pom.xml | 24 ------------------------
 1 file changed, 24 deletions(-)
----------------------------------------------------------------------



[4/4] incubator-usergrid git commit: Merge branch 'master' into USERGRID-576-ssometrics

Posted by sn...@apache.org.
Merge branch 'master' into USERGRID-576-ssometrics

Conflicts:
	stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java


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

Branch: refs/heads/USERGRID-576-ssometrics
Commit: e7a543b4bbd22bc2a8b440359270adf1e83efb1f
Parents: 77819b3 0d1965d
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Apr 22 15:19:05 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Apr 22 15:19:05 2015 -0400

----------------------------------------------------------------------
 stack/pom.xml                                   | 24 --------
 .../rest/management/ManagementResource.java     | 60 +++++++++-----------
 2 files changed, 27 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e7a543b4/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --cc stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
index 0e1469c,d2ba606..7c8cf43
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
@@@ -17,17 -17,6 +17,8 @@@
  package org.apache.usergrid.rest.management;
  
  
- import java.net.URLEncoder;
- import java.util.*;
- 
- import javax.ws.rs.*;
- import javax.ws.rs.core.Context;
- import javax.ws.rs.core.MediaType;
- import javax.ws.rs.core.Response;
- import javax.ws.rs.core.UriInfo;
- 
 +import com.codahale.metrics.Counter;
 +import com.codahale.metrics.Timer;
  import com.sun.jersey.api.client.Client;
  import com.sun.jersey.api.client.config.ClientConfig;
  import com.sun.jersey.api.client.config.DefaultClientConfig;
@@@ -58,6 -37,7 +39,8 @@@ import org.apache.usergrid.management.U
  import org.apache.usergrid.management.exceptions.DisabledAdminUserException;
  import org.apache.usergrid.management.exceptions.UnactivatedAdminUserException;
  import org.apache.usergrid.management.exceptions.UnconfirmedAdminUserException;
++import org.apache.usergrid.metrics.MetricsFactory;
+ import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
  import org.apache.usergrid.rest.AbstractContextResource;
  import org.apache.usergrid.rest.exceptions.RedirectionException;
  import org.apache.usergrid.rest.management.organizations.OrganizationsResource;
@@@ -590,7 -565,7 +583,8 @@@ public class ManagementResource extend
  
                  JsonNode orgsNode = userNode.get( "organizations" );
                  Iterator<String> fieldNames = orgsNode.getFieldNames();
 -                if (!fieldNames.hasNext()) {
++
 +                if ( !fieldNames.hasNext() ) {
                      // no organizations for user exist in response from central Usergrid SSO
                      // so create user's personal organization and use username as organization name
                      fieldNames = Collections.singletonList( username ).iterator();