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/06/29 19:40:49 UTC
[37/50] [abbrv] incubator-usergrid git commit: Merge remote-tracking
branch 'upstream/two-dot-o-dev' into USERGRID-720
Merge remote-tracking branch 'upstream/two-dot-o-dev' into USERGRID-720
Conflicts:
stack/config/src/main/resources/usergrid-default.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/9f5b8ddc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9f5b8ddc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9f5b8ddc
Branch: refs/heads/USERGRID-703
Commit: 9f5b8ddcf101325b0d1fcdc9b94bd7dbdf83229a
Parents: 306bd0c ba7ec56
Author: Michael Russo <mr...@apigee.com>
Authored: Mon Jun 22 20:59:58 2015 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Mon Jun 22 20:59:58 2015 -0700
----------------------------------------------------------------------
portal/css/main.min.css | 2 +-
.../main/resources/usergrid-default.properties | 8 +-
.../asyncevents/AmazonAsyncEventService.java | 120 ++--
.../asyncevents/model/AsyncEvent.java | 22 +-
.../asyncevents/model/EdgeDeleteEvent.java | 12 +-
.../asyncevents/model/EdgeIndexEvent.java | 2 +
.../asyncevents/model/EntityDeleteEvent.java | 2 +
.../asyncevents/model/EntityIndexEvent.java | 7 +-
.../corepersistence/index/CoreIndexFig.java | 2 +-
.../main/resources/usergrid-core-context.xml | 2 +-
.../MultiTennantColumnFamilyDefinition.java | 2 +-
.../index/IndexLocationStrategy.java | 10 +
.../queue/impl/SNSQueueManagerImpl.java | 138 +++--
.../queue/impl/SQSQueueManagerImpl.java | 2 +-
.../queue/util/AmazonNotificationUtils.java | 85 ++-
.../org/apache/usergrid/rest/IndexResource.java | 39 +-
.../applications/assets/AssetsResource.java | 41 +-
.../apache/usergrid/rest/IndexResourceIT.java | 14 +-
.../applications/ApplicationResourceIT.java | 126 +++-
.../applications/assets/AssetResourceIT.java | 401 ++++---------
.../rest/test/resource2point0/ClientSetup.java | 32 +-
.../rest/test/resource2point0/RestClient.java | 8 +-
.../endpoints/NamedResource.java | 77 ++-
.../endpoints/SystemResource.java | 21 +
.../endpoints/mgmt/ApplicationResource.java | 2 +-
.../endpoints/mgmt/OrgResource.java | 5 -
.../endpoints/mgmt/OrganizationResource.java | 15 +-
stack/rest/src/test/resources/log4j.properties | 30 +-
.../cassandra/ManagementServiceImpl.java | 3 +-
.../apache/usergrid/security/shiro/Realm.java | 2 +-
.../security/shiro/utils/SubjectUtils.java | 4 +-
.../assets/data/LocalFileBinaryStore.java | 5 +
.../apache/usergrid/management/EmailFlowIT.java | 6 +-
.../org/apache/usergrid/tools/ExportAdmins.java | 469 +++++++++++----
.../org/apache/usergrid/tools/ImportAdmins.java | 598 ++++++++++++++-----
35 files changed, 1418 insertions(+), 896 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9f5b8ddc/stack/config/src/main/resources/usergrid-default.properties
----------------------------------------------------------------------
diff --cc stack/config/src/main/resources/usergrid-default.properties
index f05db38,f99a4c8..d6ce318
--- a/stack/config/src/main/resources/usergrid-default.properties
+++ b/stack/config/src/main/resources/usergrid-default.properties
@@@ -452,68 -202,48 +452,68 @@@ usergrid.central.connection.pool.size=4
usergrid.central.connection.timeout=10000
usergrid.central.read.timeout=10000
-# Where to store temporary files
-usergrid.temp.files=/tmp/usergrid
-#The timeout in locks from reading messages transitionally from a queue. Number of seconds to wait
-usergrid.queue.lock.timeout=5
+############################### Usergrid Assets #############################
+#
+# Usergrid provides the ability to store assets (images, binary data,etc.). The
+# configurations for where to store this information are below.
+#
-###############################################################################
+# Set the bucket name used for storing assets.
#
-# Scheduler setup
+usergrid.binary.bucketname=usergrid-test
-# Time in milliseconds that a job can be started without a heartbeat before being considered dead.
-# Note that this must be high enough so that jobs that are iteration based can run an iteration and update the heartbeat
-usergrid.scheduler.job.timeout=120000
+# Set the maximum size for a single asset (in MB).
+#
+#usergrid.binary.max-size-mb=50
-# The path to the queue in the managment app to get jobs from
-usergrid.scheduler.job.queueName=/jobs
+# Set the number of worker threads available for uploading assets to a remote
+# storage provider. (Amazon S3 currently supported)
+#usergrid.binary.upload-workers=40
-# The number of executor threads to allow
-usergrid.scheduler.job.workers=4
+# Set the location for storing and temporary files.
+#
+usergrid.temp.files=/tmp/usergrid
-# Poll interval to check for new jobs in millseconds. 5 seconds is the default.
-# It will run all jobs up to current so this won't limit throughput
-usergrid.scheduler.job.interval=5000
-# The max number of times a job can fail before removing it permanently. Note that this count is INCLUSIVE.
-# If the value is 10, the 11th fail will mark the job as dead
-usergrid.scheduler.job.maxfail=10
-# Zookeeper instances
-zookeeper.hosts=localhost:2180
-zookeeper.sessionTimeout = 3000
-zookeeper.maxAttempts = 3
-swagger.basepath=http://localhost:8080
+############################### Usergrid Admin ##############################
+#
+# Usergrid has a sysadmin user which has access to the complete Usergrid system
+# and all data. Below are settings for this user and other administrative functions.
+#
+#
+# Set the sysadmin login details.
+#
- usergrid.sysadmin.login.name=
- usergrid.sysadmin.login.email=
- usergrid.sysadmin.login.password=
- usergrid.sysadmin.login.allowed=false
++usergrid.sysadmin.login.name=superuser
++usergrid.sysadmin.login.email=super@usergrid.com
++usergrid.sysadmin.login.password=test
++usergrid.sysadmin.login.allowed=true
-###############################################################################
+# Set the sysadmin permissions for approving new users and organizations
#
-# Mail and activation setup
+usergrid.sysadmin.approve.users=false
+usergrid.sysadmin.approve.organizations=false
+
+# Set a legacy sysadmin email configuration.
+#
+usergrid.sysadmin.email=
+
+
+
+############################## Usergrid Server #############################
+#
+# Below settings are general server configuration properties for Usergrid. Here
+# you will configure things like SMTP, redirect urls, etc.
+#
+
+# Set SMTP server configuration details.
+#
mail.transport.protocol=
mail.smtps.host=
mail.smtps.port=