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 2017/05/04 00:07:59 UTC
[3/3] incubator-predictionio-template-skeleton git commit:
0.11.0-incubating release
0.11.0-incubating release
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/commit/5494f06a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/tree/5494f06a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/diff/5494f06a
Branch: refs/heads/develop
Commit: 5494f06a04f19c215de583ecef44b7339e4fce70
Parents: 8da8d93
Author: Donald Szeto <ds...@salesforce.com>
Authored: Wed May 3 17:07:27 2017 -0700
Committer: Donald Szeto <ds...@salesforce.com>
Committed: Wed May 3 17:07:27 2017 -0700
----------------------------------------------------------------------
README.md | 9 ++++++++-
build.sbt | 4 +---
engine.json | 2 +-
src/main/scala/Algorithm.scala | 2 +-
src/main/scala/DataSource.scala | 2 +-
src/main/scala/Engine.scala | 2 +-
src/main/scala/Preparator.scala | 2 +-
src/main/scala/Serving.scala | 2 +-
src/test/scala/AlgorithmTest.scala | 2 +-
src/test/scala/DataSourceTest.scala | 2 +-
src/test/scala/EngineTest.scala | 2 +-
src/test/scala/PreparatorTest.scala | 2 +-
src/test/scala/ServingTest.scala | 2 +-
src/test/scala/SharedSingletonContext.scala | 2 +-
14 files changed, 21 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 55552ad..20b7a9e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Vanilla Engine Template
+# Skeleton Engine Template
## Documentation
@@ -6,6 +6,13 @@ Please refer to http://predictionio.incubator.apache.org/templates/vanilla/quick
## Versions
+### v0.11.0-incubating
+
+- Bump version number to track PredictionIO version
+- Added basic tests
+- Rename Scala package name
+- Update SBT version
+
### v0.4.0
- Update for Apache PredictionIO 0.10.0-incubating
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 1300f14..81df9ab 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,5 @@
name := "template-scala-parallel-vanilla"
-organization := "org.apache.predictionio"
-
libraryDependencies ++= Seq(
"org.apache.predictionio" %% "apache-predictionio-core" % "0.11.0-incubating" % "provided",
"org.apache.spark" %% "spark-core" % "1.3.0" % "provided",
@@ -9,4 +7,4 @@ libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "2.2.1" % "test")
// SparkContext is shared between all tests via SharedSingletonContext
-parallelExecution in Test := false
\ No newline at end of file
+parallelExecution in Test := false
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/engine.json
----------------------------------------------------------------------
diff --git a/engine.json b/engine.json
index 162c967..ca61630 100644
--- a/engine.json
+++ b/engine.json
@@ -1,7 +1,7 @@
{
"id": "default",
"description": "Default settings",
- "engineFactory": "org.template.vanilla.VanillaEngine",
+ "engineFactory": "org.example.vanilla.VanillaEngine",
"datasource": {
"params" : {
"appName": "INVALID_APP_NAME"
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/main/scala/Algorithm.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Algorithm.scala b/src/main/scala/Algorithm.scala
index 7c6c9a5..9259dde 100644
--- a/src/main/scala/Algorithm.scala
+++ b/src/main/scala/Algorithm.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.apache.predictionio.controller.P2LAlgorithm
import org.apache.predictionio.controller.Params
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/main/scala/DataSource.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/DataSource.scala b/src/main/scala/DataSource.scala
index 4f4026f..940ac05 100644
--- a/src/main/scala/DataSource.scala
+++ b/src/main/scala/DataSource.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.apache.predictionio.controller.PDataSource
import org.apache.predictionio.controller.EmptyEvaluationInfo
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/main/scala/Engine.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Engine.scala b/src/main/scala/Engine.scala
index 6090772..b01bc2a 100644
--- a/src/main/scala/Engine.scala
+++ b/src/main/scala/Engine.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.apache.predictionio.controller.EngineFactory
import org.apache.predictionio.controller.Engine
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/main/scala/Preparator.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Preparator.scala b/src/main/scala/Preparator.scala
index 1504cbd..1be9ba7 100644
--- a/src/main/scala/Preparator.scala
+++ b/src/main/scala/Preparator.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.apache.predictionio.controller.PPreparator
import org.apache.predictionio.data.storage.Event
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/main/scala/Serving.scala
----------------------------------------------------------------------
diff --git a/src/main/scala/Serving.scala b/src/main/scala/Serving.scala
index c8d62c9..309f2d2 100644
--- a/src/main/scala/Serving.scala
+++ b/src/main/scala/Serving.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.apache.predictionio.controller.LServing
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/test/scala/AlgorithmTest.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/AlgorithmTest.scala b/src/test/scala/AlgorithmTest.scala
index 2c533e0..a012c6c 100644
--- a/src/test/scala/AlgorithmTest.scala
+++ b/src/test/scala/AlgorithmTest.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.scalatest.FlatSpec
import org.scalatest.Matchers
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/test/scala/DataSourceTest.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/DataSourceTest.scala b/src/test/scala/DataSourceTest.scala
index 9098946..baf8d2c 100644
--- a/src/test/scala/DataSourceTest.scala
+++ b/src/test/scala/DataSourceTest.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.scalatest.FlatSpec
import org.scalatest.Matchers
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/test/scala/EngineTest.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/EngineTest.scala b/src/test/scala/EngineTest.scala
index 26d9e2c..802c3d4 100644
--- a/src/test/scala/EngineTest.scala
+++ b/src/test/scala/EngineTest.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.scalatest.FlatSpec
import org.scalatest.Matchers
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/test/scala/PreparatorTest.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/PreparatorTest.scala b/src/test/scala/PreparatorTest.scala
index d7b5ccd..f6952f7 100644
--- a/src/test/scala/PreparatorTest.scala
+++ b/src/test/scala/PreparatorTest.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.scalatest.FlatSpec
import org.scalatest.Matchers
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/test/scala/ServingTest.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/ServingTest.scala b/src/test/scala/ServingTest.scala
index 8571105..c6a025a 100644
--- a/src/test/scala/ServingTest.scala
+++ b/src/test/scala/ServingTest.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.scalatest.FlatSpec
import org.scalatest.Matchers
http://git-wip-us.apache.org/repos/asf/incubator-predictionio-template-skeleton/blob/5494f06a/src/test/scala/SharedSingletonContext.scala
----------------------------------------------------------------------
diff --git a/src/test/scala/SharedSingletonContext.scala b/src/test/scala/SharedSingletonContext.scala
index 92443d6..da796e2 100644
--- a/src/test/scala/SharedSingletonContext.scala
+++ b/src/test/scala/SharedSingletonContext.scala
@@ -1,4 +1,4 @@
-package org.template.vanilla
+package org.example.vanilla
import org.apache.spark.{SparkConf, SparkContext}
import org.scalatest.{BeforeAndAfterAll, Suite}