You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2016/07/26 19:14:49 UTC

[05/15] incubator-predictionio git commit: Merge branch 'master' into livedoc

Merge branch 'master' into livedoc


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

Branch: refs/heads/develop
Commit: 23765454f9f4e9c9e8540f94939882a16f145b1d
Parents: 9d49754 7cad71e
Author: Donald Szeto <do...@prediction.io>
Authored: Mon Apr 11 16:00:47 2016 -0700
Committer: Donald Szeto <do...@prediction.io>
Committed: Mon Apr 11 16:00:47 2016 -0700

----------------------------------------------------------------------
 .travis.yml                                     |  83 +++++----
 RELEASE.md                                      |  10 +-
 bin/compute-classpath.sh                        |   7 +
 bin/install.sh                                  |  49 ++----
 build.sbt                                       |  22 +--
 common/build.sbt                                |   5 +
 common/src/main/resources/application.conf      |  11 ++
 .../authentication/KeyAuthentication.scala      |  55 ++++++
 .../configuration/SSLConfiguration.scala        |  71 ++++++++
 conf/keystore.jks                               | Bin 0 -> 2238 bytes
 conf/pio-env.sh.template                        |   3 +
 conf/server.conf                                |  13 ++
 core/build.sbt                                  |  16 +-
 core/src/main/resources/application.conf        |   4 -
 .../io/prediction/controller/Deployment.scala   |   2 +-
 .../scala/io/prediction/controller/Engine.scala |   5 +-
 .../io/prediction/controller/Evaluation.scala   |  10 +-
 .../prediction/controller/FastEvalEngine.scala  |  38 ++--
 .../io/prediction/controller/LServing.scala     |   2 +-
 .../scala/io/prediction/controller/Metric.scala |  14 +-
 .../prediction/controller/MetricEvaluator.scala |  14 +-
 .../io/prediction/controller/package.scala      |   2 +-
 .../io/prediction/core/BaseAlgorithm.scala      |   2 +-
 .../scala/io/prediction/core/BaseEngine.scala   |   8 +-
 .../io/prediction/core/BaseEvaluator.scala      |   6 +-
 .../io/prediction/workflow/CoreWorkflow.scala   |   4 +-
 .../io/prediction/workflow/CreateServer.scala   |  58 ++++--
 .../io/prediction/workflow/FakeWorkflow.scala   |  26 +--
 .../io/prediction/workflow/WorkflowUtils.scala  |   6 +-
 .../io/prediction/controller/EngineTest.scala   | 106 +++++------
 data/build.sbt                                  |  20 +--
 .../io/prediction/data/api/EventServer.scala    |  95 ++++++----
 .../scala/io/prediction/data/api/Webhooks.scala |   2 +-
 .../io/prediction/data/storage/AccessKeys.scala |  12 +-
 .../io/prediction/data/storage/BiMap.scala      |   2 +-
 .../data/storage/elasticsearch/ESChannels.scala |   2 +-
 .../data/storage/hbase/PIOHBaseUtil.scala       |   2 +-
 .../data/storage/jdbc/JDBCEngineInstances.scala |   4 +-
 .../storage/jdbc/JDBCEvaluationInstances.scala  |   4 +-
 .../data/storage/jdbc/JDBCLEvents.scala         |  42 ++++-
 .../data/storage/jdbc/JDBCPEvents.scala         |  82 +++++----
 .../data/storage/jdbc/StorageClient.scala       |   7 +-
 .../io/prediction/data/store/LEventStore.scala  |   2 +-
 .../webhooks/mailchimp/MailChimpConnector.scala |  22 +--
 .../webhooks/segmentio/SegmentIOConnector.scala |  71 +++++---
 .../prediction/data/api/EventServiceSpec.scala  |  16 +-
 .../prediction/data/api/SegmentIOAuthSpec.scala | 175 +++++++++++++++++++
 .../segmentio/SegmentIOConnectorSpec.scala      |  42 ++---
 data/test-segmentio.sh                          |  91 ++++++++--
 docs/manual/data/versions.yml                   |   4 +-
 docs/manual/source/deploy/index.html.md         |   2 +
 .../evaluation/evaluationdashboard.html.md      |   4 +
 .../source/system/anotherdatastore.html.md      |  12 ++
 e2/build.sbt                                    |   2 +-
 .../prediction/e2/engine/BinaryVectorizer.scala |   3 +-
 .../scala-local-regression/Run.scala            |   3 +-
 .../src/main/scala/DataSource.scala             |   2 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/Serving.scala                |   3 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/Serving.scala                |   3 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/Serving.scala                |   3 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/Serving.scala                |   3 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/Serving.scala                |   3 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/Serving.scala                |   3 +-
 .../src/main/scala/BackTestingMetrics.scala     |  28 +--
 .../scala-stock/src/main/scala/Data.scala       |  13 +-
 .../src/main/scala/YahooDataSource.scala        |  42 ++---
 .../src/main/scala/Engine.scala                 |   6 +-
 .../weighted-items/src/main/scala/Engine.scala  |   6 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/Serving.scala                |   3 +-
 .../custom-query/src/main/scala/Engine.scala    |   4 +-
 .../custom-serving/src/main/scala/Engine.scala  |   6 +-
 .../src/main/scala/Preparator.scala             |   6 +-
 .../src/main/scala/DataSource.scala             |   8 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/DataSource.scala             |   2 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 .../src/main/scala/DataSource.scala             |  10 +-
 .../add-rateevent/src/main/scala/Engine.scala   |   6 +-
 .../filterbyyear/src/main/scala/Engine.scala    |   6 +-
 .../filterbyyear/src/main/scala/Serving.scala   |   3 +-
 .../multi/src/main/scala/Engine.scala           |   6 +-
 .../multi/src/main/scala/Serving.scala          |   3 +-
 .../no-set-user/src/main/scala/Engine.scala     |   6 +-
 .../no-set-user/src/main/scala/Serving.scala    |   3 +-
 .../src/main/scala/Engine.scala                 |   6 +-
 project/assembly.sbt                            |   2 +-
 project/plugins.sbt                             |   4 +-
 scalastyle-config.xml                           |   3 +
 tools/build.sbt                                 |  22 ++-
 .../scala/io/prediction/tools/RunWorkflow.scala |   2 +-
 .../prediction/tools/admin/CommandClient.scala  |   2 +-
 .../scala/io/prediction/tools/console/App.scala |   9 +-
 .../io/prediction/tools/console/Console.scala   |  19 +-
 .../io/prediction/tools/console/Template.scala  |   6 +-
 .../tools/dashboard/CorsSupport.scala           |  16 +-
 .../prediction/tools/dashboard/Dashboard.scala  |  41 +++--
 .../prediction/tools/imprt/FileToEvents.scala   |  12 +-
 .../io/prediction/tools/console/app.scala.txt   |  12 +-
 107 files changed, 1182 insertions(+), 602 deletions(-)
----------------------------------------------------------------------