usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject [7/7] usergrid git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1243
Date Tue, 02 Feb 2016 16:42:44 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1243


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

Branch: refs/heads/master
Commit: 47a86701ec020c28e84bf5483a66618f730a64dc
Parents: 54e62f9 4aac68e
Author: Mike Dunker <mdunker@apigee.com>
Authored: Mon Feb 1 14:33:43 2016 -0800
Committer: Mike Dunker <mdunker@apigee.com>
Committed: Mon Feb 1 14:33:43 2016 -0800

----------------------------------------------------------------------
 .../main/resources/usergrid-default.properties  |   5 +
 .../rx/impl/AllApplicationsObservable.java      |   2 -
 .../org/apache/usergrid/utils/MailUtils.java    |   2 +-
 stack/corepersistence/common/pom.xml            |   2 +-
 .../astyanax/MultiKeyColumnNameIterator.java    |   4 +-
 stack/corepersistence/pom.xml                   | 112 ++++++------
 stack/corepersistence/queue/pom.xml             | 179 ++++++++++---------
 .../java-wns/1.2-USERGRID/_remote.repositories  |   7 -
 ...a-wns-1.2-USERGRID-jar-with-dependencies.jar | Bin 1836665 -> 0 bytes
 .../java-wns-1.2-USERGRID-javadoc.jar           | Bin 234289 -> 0 bytes
 .../java-wns-1.2-USERGRID-sources.jar           | Bin 21654 -> 0 bytes
 .../1.2-USERGRID/java-wns-1.2-USERGRID.jar      | Bin 33164 -> 0 bytes
 .../1.2-USERGRID/java-wns-1.2-USERGRID.pom      | 128 -------------
 stack/pom.xml                                   |  12 --
 .../usergrid/rest/AbstractContextResource.java  |  52 +++++-
 .../rest/applications/ApplicationResource.java  |  10 +-
 .../rest/applications/ServiceResource.java      |  12 +-
 .../rest/applications/users/UserResource.java   |  41 ++---
 .../rest/applications/users/UsersResource.java  |  14 +-
 .../rest/management/ManagementResource.java     |   5 +-
 .../organizations/OrganizationResource.java     |  14 +-
 .../rest/management/users/UserResource.java     |  66 ++++---
 .../applications/assets/AwsAssetResourceIT.java |   1 -
 stack/services/pom.xml                          |  18 +-
 .../usergrid/management/ManagementService.java  |  13 ++
 .../usergrid/management/OrganizationConfig.java |  27 +--
 .../management/OrganizationConfigProps.java     |   4 +
 .../cassandra/ManagementServiceImpl.java        |  54 +++++-
 .../cassandra/OrganizationConfigPropsImpl.java  |  45 ++++-
 .../management/export/S3ExportImpl.java         |   1 -
 .../management/importer/S3ImportImpl.java       |   2 -
 .../assets/data/AwsSdkS3BinaryStore.java        |   7 -
 .../usergrid/management/importer/S3Upload.java  |   1 -
 stack/tools/pom.xml                             |  12 ++
 34 files changed, 438 insertions(+), 414 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
----------------------------------------------------------------------
diff --cc stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
index da41b59,1d86631..77d2d1e
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/AbstractContextResource.java
@@@ -180,12 -227,11 +227,11 @@@ public abstract class AbstractContextRe
              sendRedirect(redirect_url);
          }
  
 -        if (logger.isDebugEnabled()) {
 -            logger.debug("Dispatching to viewable with template: {}", template, template_property);
 +        if (logger.isTraceEnabled()) {
 +            logger.trace("Dispatching to viewable with template: {}  property: {}", template,
template_property);
          }
  
-         Viewable viewable = new Viewable(template, model);
-         return viewable;
+         return new Viewable(template, model);
      }
  
  

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ApplicationResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/rest/src/main/java/org/apache/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UsersResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/OrganizationResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/usergrid/blob/47a86701/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java
----------------------------------------------------------------------


Mime
View raw message