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 2014/10/22 23:12:24 UTC
[82/82] [abbrv] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-events
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events
# By Shawn Feldman (13) and others
# Via Shawn Feldman (4) and others
* 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (28 commits)
checking additional threads
added error message to script
Changed configuration to disable system administrator approval
fix xml for gatling
cache queue names
change method to get queue url
license headers
Fixes missing license headers
add expected count to history
add gatling script
changing con path
portal should send debug flag
fix send to all parameter
fix send to all parameter
fixing query to send to all
Fixes bucket name
change default property value to turn off graphite
updated loadtest README
updated loadtest simulations
updated load tests
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4e2e4111
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4e2e4111
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4e2e4111
Branch: refs/heads/two-dot-o-events
Commit: 4e2e41117190feba3029238b463025b53b024450
Parents: 4474ca9 c97e531
Author: grey <gr...@apigee.com>
Authored: Wed Oct 22 14:06:02 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Oct 22 14:06:02 2014 -0700
----------------------------------------------------------------------
portal/js/global/ug-service.js | 2 +-
portal/js/push/push-history.html | 8 +-
.../push/push-send-notification-controller.js | 44 ++--
stack/awscluster/pom.xml | 2 +-
.../main/groovy/configure_elasticsearch.groovy | 2 +-
.../src/main/groovy/configure_usergrid.groovy | 6 +-
.../main/resources/usergrid-default.properties | 2 +-
.../usergrid/persistence/queue/Queue.java | 4 +
.../queue/impl/SQSQueueManagerImpl.java | 77 +++++--
stack/loadtests/README.md | 53 +++++
stack/loadtests/gatling/LICENSE | 202 +++++++++++++++++++
stack/loadtests/gatling/conf/application.conf | 21 ++
stack/loadtests/gatling/conf/gatling.conf | 162 +++++++++++++++
stack/loadtests/gatling/conf/logback.xml | 35 ++++
stack/loadtests/gatling/conf/recorder.conf | 51 +++++
.../gatling/lib/Saxon-HE-9.5.1-6-compressed.jar | Bin 0 -> 3813075 bytes
.../gatling/lib/akka-actor_2.10-2.3.6.jar | Bin 0 -> 2583959 bytes
.../lib/async-http-client-1.9.0-BETA13.jar | Bin 0 -> 579954 bytes
stack/loadtests/gatling/lib/boon-0.26.jar | Bin 0 -> 1026950 bytes
.../loadtests/gatling/lib/commons-pool-1.6.jar | Bin 0 -> 111119 bytes
.../lib/compiler-interface-0.13.5-sources.jar | Bin 0 -> 30056 bytes
.../lib/concurrentlinkedhashmap-lru-1.4.jar | Bin 0 -> 116575 bytes
stack/loadtests/gatling/lib/config-1.2.1.jar | Bin 0 -> 219554 bytes
.../gatling/lib/fastring_2.10-0.2.4.jar | Bin 0 -> 98640 bytes
.../gatling/lib/gatling-app-2.0.0-RC5.jar | Bin 0 -> 73052 bytes
.../gatling/lib/gatling-charts-2.0.0-RC5.jar | Bin 0 -> 500609 bytes
.../lib/gatling-charts-highcharts-2.0.0-RC5.jar | Bin 0 -> 214683 bytes
.../gatling/lib/gatling-core-2.0.0-RC5.jar | Bin 0 -> 1678475 bytes
.../gatling/lib/gatling-http-2.0.0-RC5.jar | Bin 0 -> 1222752 bytes
.../gatling/lib/gatling-jdbc-2.0.0-RC5.jar | Bin 0 -> 41648 bytes
.../gatling/lib/gatling-jms-2.0.0-RC5.jar | Bin 0 -> 174279 bytes
.../gatling/lib/gatling-metrics-2.0.0-RC5.jar | Bin 0 -> 72446 bytes
.../gatling/lib/gatling-recorder-2.0.0-RC5.jar | Bin 0 -> 815471 bytes
.../gatling/lib/gatling-redis-2.0.0-RC5.jar | Bin 0 -> 19970 bytes
.../gatling/lib/geronimo-jms_1.1_spec-1.1.1.jar | Bin 0 -> 32359 bytes
.../gatling/lib/incremental-compiler-0.13.5.jar | Bin 0 -> 2214694 bytes
.../gatling/lib/jackson-annotations-2.4.0.jar | Bin 0 -> 38605 bytes
.../gatling/lib/jackson-core-2.4.2.jar | Bin 0 -> 225316 bytes
.../gatling/lib/jackson-databind-2.4.2.jar | Bin 0 -> 1075759 bytes
stack/loadtests/gatling/lib/jodd-core-3.6.jar | Bin 0 -> 373882 bytes
.../loadtests/gatling/lib/jodd-lagarto-3.6.jar | Bin 0 -> 204738 bytes
stack/loadtests/gatling/lib/jodd-log-3.6.jar | Bin 0 -> 14547 bytes
.../gatling/lib/jsonpath_2.10-0.5.0.jar | Bin 0 -> 180090 bytes
stack/loadtests/gatling/lib/jzlib-1.1.3.jar | Bin 0 -> 71976 bytes
.../gatling/lib/logback-classic-1.1.2.jar | Bin 0 -> 270750 bytes
.../gatling/lib/logback-core-1.1.2.jar | Bin 0 -> 427729 bytes
.../loadtests/gatling/lib/netty-3.9.4.Final.jar | Bin 0 -> 1310154 bytes
stack/loadtests/gatling/lib/opencsv-2.3.jar | Bin 0 -> 19827 bytes
.../gatling/lib/redisclient_2.10-2.13.jar | Bin 0 -> 712616 bytes
.../gatling/lib/sbt-interface-0.13.5.jar | Bin 0 -> 52012 bytes
stack/loadtests/gatling/lib/scala-compiler.jar | Bin 0 -> 14445780 bytes
stack/loadtests/gatling/lib/scala-library.jar | Bin 0 -> 7126372 bytes
stack/loadtests/gatling/lib/scala-reflect.jar | Bin 0 -> 3203471 bytes
.../gatling/lib/scala-swing-2.10.4.jar | Bin 0 -> 707298 bytes
.../lib/scalalogging-slf4j_2.10-1.1.0.jar | Bin 0 -> 79003 bytes
.../loadtests/gatling/lib/scopt_2.10-3.2.0.jar | Bin 0 -> 122918 bytes
stack/loadtests/gatling/lib/slf4j-api-1.7.7.jar | Bin 0 -> 29257 bytes
stack/loadtests/gatling/lib/t-digest-3.0.jar | Bin 0 -> 49754 bytes
stack/loadtests/gatling/lib/threetenbp-1.0.jar | Bin 0 -> 507797 bytes
.../gatling/lib/uncommons-maths-1.2.3.jar | Bin 0 -> 49923 bytes
stack/loadtests/gatling/lib/zinc-0.3.5.3.jar | Bin 0 -> 392810 bytes
stack/loadtests/gatling/scripts/gatling-ug.sh | 49 +++++
.../gatling/user-files/data/search.csv | 3 +
.../gatling/user-files/request-bodies/.keep | 0
stack/loadtests/loadtest_setup.sh | 45 +++++
.../data-generators/EntityDataGenerator.scala | 57 ++++++
.../data-generators/FeederGenerator.scala | 101 ++++++++++
.../scenarios/ApplicationScenarios.scala | 45 +++++
.../scenarios/ConnectionScenarios.scala | 30 +++
.../usergrid/scenarios/DeviceScenarios.scala | 65 ++++++
.../usergrid/scenarios/GeoScenarios.scala | 43 ++++
.../scenarios/NotificationScenarios.scala | 71 +++++++
.../usergrid/scenarios/NotifierScenarios.scala | 65 ++++++
.../scenarios/OrganizationScenarios.scala | 42 ++++
.../usergrid/scenarios/TokenScenarios.scala | 59 ++++++
.../usergrid/scenarios/UserScenarios.scala | 50 +++++
.../org/apache/usergrid/settings/Headers.scala | 43 ++++
.../org/apache/usergrid/settings/Settings.scala | 54 +++++
.../org/apache/usergrid/settings/Utils.scala | 87 ++++++++
.../simulations/GetEntitySimulation.scala | 41 ++++
.../simulations/PostDevicesSimulation.scala | 42 ++++
.../simulations/PostUsersSimulation.scala | 47 +++++
.../PushTargetDeviceSimulation.scala | 53 +++++
.../simulations/PushTargetUserSimulation.scala | 68 +++++++
stack/pom.xml | 7 +-
.../notifications/NotificationsService.java | 4 +-
.../services/notifications/QueueListener.java | 10 +-
.../services/notifications/TaskManager.java | 7 +-
88 files changed, 1808 insertions(+), 51 deletions(-)
----------------------------------------------------------------------