Merge branch 'develop'
diff --git a/README.md b/README.md
index fc0ce44..031c09f 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,14 @@
## Documentation
-Please refer to http://docs.prediction.io/templates/classification/quickstart/
+Please refer to http://predictionio.incubator.apache.org/templates/classification/quickstart/
## Versions
+### v0.4.0
+
+Update for Apache PredictionIO 0.10.0-incubating
+
### v0.3.1
- Change query format from
diff --git a/build.sbt b/build.sbt
index 6d12a3e..d74e6bc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,9 +4,9 @@
name := "template-scala-parallel-classification"
-organization := "io.prediction"
+organization := "org.apache.predictionio"
libraryDependencies ++= Seq(
- "io.prediction" %% "core" % pioVersion.value % "provided",
- "org.apache.spark" %% "spark-core" % "1.3.1" % "provided",
- "org.apache.spark" %% "spark-mllib" % "1.3.1" % "provided")
+ "org.apache.predictionio" %% "apache-predictionio-core" % "0.10.0-incubating" % "provided",
+ "org.apache.spark" %% "spark-core" % "1.3.1" % "provided",
+ "org.apache.spark" %% "spark-mllib" % "1.3.1" % "provided")
diff --git a/project/pio-build.sbt b/project/pio-build.sbt
deleted file mode 100644
index 8346a96..0000000
--- a/project/pio-build.sbt
+++ /dev/null
@@ -1 +0,0 @@
-addSbtPlugin("io.prediction" % "pio-build" % "0.9.0")
diff --git a/src/main/scala/CompleteEvaluation.scala b/src/main/scala/CompleteEvaluation.scala
index e168872..3dd1d1d 100644
--- a/src/main/scala/CompleteEvaluation.scala
+++ b/src/main/scala/CompleteEvaluation.scala
@@ -1,7 +1,7 @@
package org.template.classification
-import io.prediction.controller.Evaluation
-import io.prediction.controller.MetricEvaluator
+import org.apache.predictionio.controller.Evaluation
+import org.apache.predictionio.controller.MetricEvaluator
object CompleteEvaluation extends Evaluation {
engineEvaluator = (
diff --git a/src/main/scala/DataSource.scala b/src/main/scala/DataSource.scala
index 278d4a5..eb2e6e8 100644
--- a/src/main/scala/DataSource.scala
+++ b/src/main/scala/DataSource.scala
@@ -1,9 +1,9 @@
package org.template.classification
-import io.prediction.controller.PDataSource
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.Params
-import io.prediction.data.store.PEventStore
+import org.apache.predictionio.controller.PDataSource
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.Params
+import org.apache.predictionio.data.store.PEventStore
import org.apache.spark.SparkContext
import org.apache.spark.rdd.RDD
diff --git a/src/main/scala/Engine.scala b/src/main/scala/Engine.scala
index 1bce077..885f56d 100644
--- a/src/main/scala/Engine.scala
+++ b/src/main/scala/Engine.scala
@@ -1,7 +1,7 @@
package org.template.classification
-import io.prediction.controller.EngineFactory
-import io.prediction.controller.Engine
+import org.apache.predictionio.controller.EngineFactory
+import org.apache.predictionio.controller.Engine
class Query(
val attr0 : Double,
diff --git a/src/main/scala/Evaluation.scala b/src/main/scala/Evaluation.scala
index 03e5a01..5f58cfa 100644
--- a/src/main/scala/Evaluation.scala
+++ b/src/main/scala/Evaluation.scala
@@ -1,10 +1,10 @@
package org.template.classification
-import io.prediction.controller.AverageMetric
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.EngineParams
-import io.prediction.controller.EngineParamsGenerator
-import io.prediction.controller.Evaluation
+import org.apache.predictionio.controller.AverageMetric
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.EngineParams
+import org.apache.predictionio.controller.EngineParamsGenerator
+import org.apache.predictionio.controller.Evaluation
case class Accuracy()
extends AverageMetric[EmptyEvaluationInfo, Query, PredictedResult, ActualResult] {
diff --git a/src/main/scala/NaiveBayesAlgorithm.scala b/src/main/scala/NaiveBayesAlgorithm.scala
index 56c86ff..c40f31f 100644
--- a/src/main/scala/NaiveBayesAlgorithm.scala
+++ b/src/main/scala/NaiveBayesAlgorithm.scala
@@ -1,7 +1,7 @@
package org.template.classification
-import io.prediction.controller.P2LAlgorithm
-import io.prediction.controller.Params
+import org.apache.predictionio.controller.P2LAlgorithm
+import org.apache.predictionio.controller.Params
import org.apache.spark.mllib.classification.NaiveBayes
import org.apache.spark.mllib.classification.NaiveBayesModel
diff --git a/src/main/scala/PrecisionEvaluation.scala b/src/main/scala/PrecisionEvaluation.scala
index 5323925..299c43f 100644
--- a/src/main/scala/PrecisionEvaluation.scala
+++ b/src/main/scala/PrecisionEvaluation.scala
@@ -1,8 +1,8 @@
package org.template.classification
-import io.prediction.controller.OptionAverageMetric
-import io.prediction.controller.EmptyEvaluationInfo
-import io.prediction.controller.Evaluation
+import org.apache.predictionio.controller.OptionAverageMetric
+import org.apache.predictionio.controller.EmptyEvaluationInfo
+import org.apache.predictionio.controller.Evaluation
case class Precision(label: Double)
extends OptionAverageMetric[EmptyEvaluationInfo, Query, PredictedResult, ActualResult] {
diff --git a/src/main/scala/Preparator.scala b/src/main/scala/Preparator.scala
index 7100e3b..8a1e41d 100644
--- a/src/main/scala/Preparator.scala
+++ b/src/main/scala/Preparator.scala
@@ -1,6 +1,6 @@
package org.template.classification
-import io.prediction.controller.PPreparator
+import org.apache.predictionio.controller.PPreparator
import org.apache.spark.SparkContext
import org.apache.spark.rdd.RDD
diff --git a/src/main/scala/Serving.scala b/src/main/scala/Serving.scala
index ef06088..9722883 100644
--- a/src/main/scala/Serving.scala
+++ b/src/main/scala/Serving.scala
@@ -1,6 +1,6 @@
package org.template.classification
-import io.prediction.controller.LServing
+import org.apache.predictionio.controller.LServing
class Serving extends LServing[Query, PredictedResult] {
diff --git a/template.json b/template.json
index fb4a50b..d076ec5 100644
--- a/template.json
+++ b/template.json
@@ -1 +1 @@
-{"pio": {"version": { "min": "0.9.2" }}}
+{"pio": {"version": { "min": "0.10.0-incubating" }}}
