change all to org.apache.predictionio except docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/6d160b6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/6d160b6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/6d160b6b Branch: refs/heads/develop Commit: 6d160b6b5a3bf2870427cf8e27d00ece026055e2 Parents: 4f03388 Author: Xusen Yin <[email protected]> Authored: Thu Jul 7 16:41:51 2016 -0700 Committer: Xusen Yin <[email protected]> Committed: Thu Jul 7 16:41:51 2016 -0700 ---------------------------------------------------------------------- bin/pio | 2 +- bin/pio-daemon | 2 +- build.sbt | 44 ++++++++++---------- .../authentication/KeyAuthentication.scala | 2 +- .../configuration/SSLConfiguration.scala | 6 +-- conf/server.conf | 6 +-- .../predictionio/workflow/index.scala.html | 6 +-- data/README.md | 18 ++++---- .../data/storage/hbase/upgrade/Upgrade.scala | 10 ++--- .../storage/hbase/upgrade/Upgrade_0_8_3.scala | 14 +++---- data/src/test/resources/application.conf | 2 +- .../data/api/SegmentIOAuthSpec.scala | 4 +- .../java-local-helloworld/MyAlgorithm.java | 2 +- .../java-local-helloworld/MyDataSource.java | 2 +- .../java-local-helloworld/MyEngineFactory.java | 2 +- .../java-local-helloworld/build.sbt | 2 +- .../java-local-regression/README.md | 2 +- .../java-local-regression/build.sbt | 2 +- .../java-local-regression/engine.json | 2 +- .../src/main/java/DataSource.java | 4 +- .../src/main/java/DataSourceParams.java | 4 +- .../src/main/java/DefaultAlgorithm.java | 4 +- .../src/main/java/DefaultAlgorithmParams.java | 4 +- .../src/main/java/EngineFactory.java | 8 ++-- .../src/main/java/MeanSquareEvaluator.java | 6 +-- .../src/main/java/OLSAlgorithm.java | 6 +-- .../src/main/java/Preparator.java | 4 +- .../src/main/java/PreparatorParams.java | 4 +- .../src/main/java/Run.java | 22 +++++----- .../src/main/java/Serving.java | 6 +-- .../src/main/java/TrainingData.java | 2 +- .../src/main/java/examples/manifest.json | 4 +- .../experimental/java-local-tutorial/build.sbt | 6 +-- .../recommendations/tutorial1/AlgoParams.java | 4 +- .../recommendations/tutorial1/Algorithm.java | 4 +- .../recommendations/tutorial1/DataSource.java | 4 +- .../tutorial1/DataSourceParams.java | 4 +- .../tutorial1/EngineFactory.java | 8 ++-- .../java/recommendations/tutorial1/Model.java | 2 +- .../java/recommendations/tutorial1/Query.java | 2 +- .../recommendations/tutorial1/TrainingData.java | 2 +- .../java/recommendations/tutorial1/engine.json | 4 +- .../java/recommendations/tutorial2/Runner1.java | 26 ++++++------ .../java/recommendations/tutorial2/Runner2.java | 36 ++++++++-------- .../recommendations/tutorial3/DataSource.java | 10 ++--- .../tutorial3/EngineFactory.java | 14 +++---- .../recommendations/tutorial3/Evaluator.java | 8 ++-- .../java/recommendations/tutorial3/Runner3.java | 22 +++++----- .../CollaborativeFilteringAlgorithm.java | 4 +- .../CollaborativeFilteringAlgorithmParams.java | 4 +- .../tutorial4/CollaborativeFilteringModel.java | 2 +- .../recommendations/tutorial4/DataSource.java | 6 +-- .../tutorial4/DataSourceParams.java | 4 +- .../tutorial4/EngineFactory.java | 10 ++--- .../tutorial4/FeatureBasedAlgorithm.java | 4 +- .../tutorial4/FeatureBasedAlgorithmParams.java | 4 +- .../tutorial4/FeatureBasedModel.java | 2 +- .../recommendations/tutorial4/Preparator.java | 6 +-- .../recommendations/tutorial4/PreparedData.java | 2 +- .../java/recommendations/tutorial4/Query.java | 2 +- .../recommendations/tutorial4/Runner4a.java | 20 ++++----- .../recommendations/tutorial4/Runner4b.java | 20 ++++----- .../recommendations/tutorial4/Runner4c.java | 24 +++++------ .../recommendations/tutorial4/Runner4d.java | 24 +++++------ .../java/recommendations/tutorial4/Serving.java | 6 +-- .../tutorial4/SingleEngineFactory.java | 12 +++--- .../recommendations/tutorial4/TrainingData.java | 2 +- .../tutorial4/multiple-algo-engine.json | 4 +- .../tutorial4/single-algo-engine.json | 4 +- .../tutorial5/EngineFactory.java | 14 +++---- .../tutorial5/MahoutAlgoModel.java | 2 +- .../tutorial5/MahoutAlgoParams.java | 4 +- .../tutorial5/MahoutAlgorithm.java | 12 +++--- .../java/recommendations/tutorial5/Runner5.java | 22 +++++----- .../recommendations/tutorial5/manifest.json | 4 +- .../java-parallel-helloworld/build.sbt | 2 +- .../java-parallel-helloworld/engine.json | 2 +- .../src/main/java/parallel/Algorithm.java | 6 +-- .../src/main/java/parallel/DataSource.java | 6 +-- .../src/main/java/parallel/EngineFactory.java | 10 ++--- .../src/main/java/parallel/Model.java | 2 +- .../src/main/java/parallel/Preparator.java | 6 +-- .../src/main/java/parallel/Query.java | 2 +- .../src/main/java/parallel/Runner.java | 20 ++++----- .../src/main/java/parallel/Serving.java | 6 +-- .../src/main/java/parallel/build.sbt | 6 +-- .../experimental/scala-cleanup-app/build.sbt | 4 +- .../experimental/scala-cleanup-app/engine.json | 2 +- .../src/main/scala/Algorithm.scala | 6 +-- .../src/main/scala/DataSource.scala | 16 +++---- .../src/main/scala/Engine.scala | 8 ++-- .../src/main/scala/Preparator.scala | 6 +-- .../src/main/scala/Serving.scala | 6 +-- .../scala-local-friend-recommendation/build.sbt | 6 +-- .../keyword_similarity_engine.json | 4 +- .../random_engine.json | 4 +- .../scala/FriendRecommendationAlgoParams.scala | 4 +- .../scala/FriendRecommendationDataSource.scala | 4 +- .../FriendRecommendationDataSourceParams.scala | 4 +- .../scala/FriendRecommendationPrediction.scala | 2 +- .../main/scala/FriendRecommendationQuery.scala | 2 +- .../FriendRecommendationTrainingData.scala | 2 +- .../main/scala/KeywordSimilarityAlgorithm.scala | 4 +- .../scala/KeywordSimilarityEngineFactory.scala | 4 +- .../src/main/scala/KeywordSimilarityModel.scala | 2 +- .../src/main/scala/RandomAlgorithm.scala | 4 +- .../src/main/scala/RandomEngineFactory.scala | 4 +- .../src/main/scala/RandomModel.scala | 2 +- .../scala-local-helloworld/HelloWorld.scala | 2 +- .../scala-local-helloworld/build.sbt | 4 +- .../scala-local-movielens-evaluation/build.sbt | 4 +- .../src/main/scala/Evaluation.scala | 28 ++++++------- .../src/main/scala/ItemRecEvaluation.scala | 28 ++++++------- .../scala-local-movielens-filtering/build.sbt | 4 +- .../src/main/scala/Engine.scala | 10 ++--- .../src/main/scala/Filtering.scala | 8 ++-- .../scala-local-regression/README.md | 4 +- .../scala-local-regression/Run.scala | 30 ++++++------- .../scala-local-regression/build.sbt | 4 +- .../scala-local-regression/engine.json | 2 +- .../README.md | 2 +- .../build.sbt | 4 +- .../engine-forest.json | 2 +- .../engine.json | 2 +- .../src/main/scala/DataSource.scala | 14 +++---- .../src/main/scala/DeltaSimRankRDD.scala | 2 +- .../src/main/scala/Engine.scala | 6 +-- .../src/main/scala/Preparator.scala | 10 ++--- .../src/main/scala/Sampling.scala | 2 +- .../src/main/scala/Serving.scala | 6 +-- .../src/main/scala/SimRankAlgorithm.scala | 6 +-- .../scala-parallel-recommendation-cat/build.sbt | 4 +- .../src/main/scala/ALSAlgorithm.scala | 10 ++--- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/Serving.scala | 2 +- .../build.sbt | 4 +- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../src/main/scala/ALSModel.scala | 6 +-- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/Serving.scala | 2 +- .../build.sbt | 4 +- .../src/main/scala/ALSAlgorithm.scala | 4 +- .../src/main/scala/ALSModel.scala | 6 +-- .../src/main/scala/DataSource.scala | 14 +++---- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 4 +- .../src/main/scala/Serving.scala | 2 +- .../build.sbt | 4 +- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../src/main/scala/ALSModel.scala | 6 +-- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/Serving.scala | 2 +- .../scala-parallel-regression/Run.scala | 24 +++++------ .../scala-parallel-regression/build.sbt | 2 +- .../scala-parallel-regression/engine.json | 2 +- .../build.sbt | 4 +- .../src/main/scala/DIMSUMAlgorithm.scala | 10 ++--- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/Serving.scala | 2 +- .../build.sbt | 4 +- .../src/main/scala/ALSAlgorithm.scala | 10 ++--- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/Serving.scala | 2 +- .../scala-parallel-trim-app/build.sbt | 4 +- .../scala-parallel-trim-app/engine.json | 2 +- .../src/main/scala/Algorithm.scala | 6 +-- .../src/main/scala/DataSource.scala | 16 +++---- .../src/main/scala/Engine.scala | 8 ++-- .../src/main/scala/Preparator.scala | 6 +-- .../src/main/scala/Serving.scala | 6 +-- .../scala-recommendations/build.sbt | 4 +- .../src/main/scala/Run.scala | 24 +++++------ .../experimental/scala-refactor-test/build.sbt | 6 +-- .../src/main/scala/Algorithm.scala | 4 +- .../src/main/scala/DataSource.scala | 14 +++---- .../src/main/scala/Engine.scala | 8 ++-- .../src/main/scala/Evaluator.scala | 6 +-- .../src/main/scala/Preparator.scala | 4 +- .../src/main/scala/Serving.scala | 2 +- examples/experimental/scala-stock/README.md | 10 ++--- examples/experimental/scala-stock/build.sbt | 6 +-- .../scala-stock/src/main/scala/Algorithm.scala | 6 +-- .../src/main/scala/BackTestingMetrics.scala | 10 ++--- .../scala-stock/src/main/scala/Data.scala | 2 +- .../scala-stock/src/main/scala/DataSource.scala | 10 ++--- .../scala-stock/src/main/scala/Indicators.scala | 2 +- .../src/main/scala/RegressionStrategy.scala | 4 +- .../scala-stock/src/main/scala/Run.scala | 16 +++---- .../src/main/scala/YahooDataSource.scala | 14 +++---- .../examples/stock/backtesting.scala.html | 2 +- .../add-algorithm/build.sbt | 4 +- .../add-algorithm/project/pio-build.sbt | 2 +- .../src/main/scala/DataSource.scala | 12 +++--- .../add-algorithm/src/main/scala/Engine.scala | 4 +- .../src/main/scala/NaiveBayesAlgorithm.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/RandomForestAlgorithm.scala | 4 +- .../add-algorithm/src/main/scala/Serving.scala | 2 +- .../custom-attributes/build.sbt | 6 +-- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/RandomForestAlgorithm.scala | 4 +- .../src/main/scala/Serving.scala | 2 +- .../train-with-rate-event/build.sbt | 4 +- .../train-with-rate-event/project/pio-build.sbt | 2 +- .../src/main/scala/ALSAlgorithm.scala | 10 ++--- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/Serving.scala | 2 +- .../weighted-items/build.sbt | 4 +- .../weighted-items/project/pio-build.sbt | 2 +- .../src/main/scala/ALSAlgorithm.scala | 10 ++--- .../src/main/scala/DataSource.scala | 12 +++--- .../weighted-items/src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../weighted-items/src/main/scala/Serving.scala | 2 +- .../custom-prepartor/build.sbt | 4 +- .../custom-prepartor/project/pio-build.sbt | 2 +- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../src/main/scala/ALSModel.scala | 6 +-- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 4 +- .../src/main/scala/Serving.scala | 2 +- .../custom-query/build.sbt | 4 +- .../custom-query/data/build.sbt | 2 +- .../recommendation/ImportDataScript.scala | 2 +- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../custom-query/src/main/scala/ALSModel.scala | 6 +-- .../src/main/scala/DataSource.scala | 10 ++--- .../custom-query/src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../custom-query/src/main/scala/Serving.scala | 2 +- .../custom-serving/build.sbt | 4 +- .../custom-serving/project/pio-build.sbt | 2 +- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../src/main/scala/ALSModel.scala | 6 +-- .../src/main/scala/DataSource.scala | 12 +++--- .../custom-serving/src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../custom-serving/src/main/scala/Serving.scala | 4 +- .../filter-by-category/build.sbt | 6 +-- .../filter-by-category/project/pio-build.sbt | 2 +- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../src/main/scala/ALSModel.scala | 6 +-- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/Serving.scala | 2 +- .../add-and-return-item-properties/build.sbt | 6 +-- .../project/pio-build.sbt | 2 +- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../src/main/scala/DataSource.scala | 12 +++--- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/Serving.scala | 2 +- .../add-rateevent/build.sbt | 4 +- .../add-rateevent/project/pio-build.sbt | 2 +- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../src/main/scala/DataSource.scala | 12 +++--- .../add-rateevent/src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../add-rateevent/src/main/scala/Serving.scala | 2 +- .../filterbyyear/build.sbt | 6 +-- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../src/main/scala/DataSource.scala | 12 +++--- .../filterbyyear/src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../filterbyyear/src/main/scala/Serving.scala | 2 +- .../multi/build.sbt | 4 +- .../multi/project/pio-build.sbt | 2 +- .../multi/src/main/scala/ALSAlgorithm.scala | 10 ++--- .../multi/src/main/scala/DataSource.scala | 12 +++--- .../multi/src/main/scala/Engine.scala | 4 +- .../multi/src/main/scala/LikeAlgorithm.scala | 2 +- .../multi/src/main/scala/Preparator.scala | 2 +- .../multi/src/main/scala/Serving.scala | 2 +- .../no-set-user/build.sbt | 4 +- .../no-set-user/project/pio-build.sbt | 2 +- .../src/main/scala/ALSAlgorithm.scala | 6 +-- .../no-set-user/src/main/scala/DataSource.scala | 12 +++--- .../no-set-user/src/main/scala/Engine.scala | 4 +- .../no-set-user/src/main/scala/Preparator.scala | 2 +- .../no-set-user/src/main/scala/Serving.scala | 2 +- .../recommended-user/build.sbt | 4 +- .../recommended-user/project/pio-build.sbt | 2 +- .../src/main/scala/ALSAlgorithm.scala | 4 +- .../src/main/scala/DataSource.scala | 4 +- .../src/main/scala/Engine.scala | 4 +- .../src/main/scala/Preparator.scala | 2 +- .../src/main/scala/Serving.scala | 2 +- .../apache/predictionio/tools/admin/README.md | 4 +- .../tools/templates/scala/buildSbt.scala.txt | 2 +- 305 files changed, 936 insertions(+), 936 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/bin/pio ---------------------------------------------------------------------- diff --git a/bin/pio b/bin/pio index f2ca006..4a030c0 100755 --- a/bin/pio +++ b/bin/pio @@ -39,4 +39,4 @@ FIRST_HALF="${@:1:$FIRST_SEP}" SECOND_HALF="${@:$FIRST_SEP+1}" -exec ${PIO_HOME}/bin/pio-class io.prediction.tools.console.Console ${FIRST_HALF} --pio-home ${PIO_HOME} ${SECOND_HALF} +exec ${PIO_HOME}/bin/pio-class org.apache.predictionio.tools.console.Console ${FIRST_HALF} --pio-home ${PIO_HOME} ${SECOND_HALF} http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/bin/pio-daemon ---------------------------------------------------------------------- diff --git a/bin/pio-daemon b/bin/pio-daemon index b63ddb6..18aaa60 100755 --- a/bin/pio-daemon +++ b/bin/pio-daemon @@ -43,6 +43,6 @@ FIRST_HALF="${@:1:$FIRST_SEP}" SECOND_HALF="${@:$FIRST_SEP+1}" -exec nohup ${PIO_HOME}/bin/pio-class io.prediction.tools.console.Console ${FIRST_HALF} --pio-home ${PIO_HOME} ${SECOND_HALF} <&- > /dev/null 2>&1 & +exec nohup ${PIO_HOME}/bin/pio-class org.apache.predictionio.tools.console.Console ${FIRST_HALF} --pio-home ${PIO_HOME} ${SECOND_HALF} <&- > /dev/null 2>&1 & echo $! > ${PIDFILE} http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index 74daaad..9342be0 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,7 @@ name := "pio" version in ThisBuild := "0.9.7-SNAPSHOT" -organization in ThisBuild := "io.prediction" +organization in ThisBuild := "org.apache.predictionio" scalaVersion in ThisBuild := "2.10.5" @@ -45,7 +45,7 @@ lazy val pioBuildInfoSettings = buildInfoSettings ++ Seq( scalaVersion, sbtVersion, sparkVersion), - buildInfoPackage := "io.prediction.core") + buildInfoPackage := "org.apache.predictionio.core") lazy val conf = file(".") / "conf" @@ -97,12 +97,12 @@ scalacOptions in (ScalaUnidoc, unidoc) ++= Seq( "akka", "breeze", "html", - "io.prediction.annotation", - "io.prediction.controller.html", - "io.prediction.data.api", - "io.prediction.data.view", - "io.prediction.workflow", - "io.prediction.tools", + "org.apache.predictionio.annotation", + "org.apache.predictionio.controller.html", + "org.apache.predictionio.data.api", + "org.apache.predictionio.data.view", + "org.apache.predictionio.workflow", + "org.apache.predictionio.tools", "org", "scalikejdbc").mkString(":"), "-doc-title", @@ -114,31 +114,31 @@ scalacOptions in (ScalaUnidoc, unidoc) ++= Seq( javacOptions in (JavaUnidoc, unidoc) := Seq( "-subpackages", - "io.prediction", + "org.apache.predictionio", "-exclude", Seq( - "io.prediction.controller.html", - "io.prediction.data.api", - "io.prediction.data.view", - "io.prediction.data.webhooks.*", - "io.prediction.workflow", - "io.prediction.tools", + "org.apache.predictionio.controller.html", + "org.apache.predictionio.data.api", + "org.apache.predictionio.data.view", + "org.apache.predictionio.data.webhooks.*", + "org.apache.predictionio.workflow", + "org.apache.predictionio.tools", "org.apache.hadoop").mkString(":"), "-windowtitle", "PredictionIO Javadoc " + version.value, "-group", "Java Controllers", Seq( - "io.prediction.controller.java", - "io.prediction.data.store.java").mkString(":"), + "org.apache.predictionio.controller.java", + "org.apache.predictionio.data.store.java").mkString(":"), "-group", "Scala Base Classes", Seq( - "io.prediction.controller", - "io.prediction.core", - "io.prediction.data.storage", - "io.prediction.data.storage.*", - "io.prediction.data.store").mkString(":"), + "org.apache.predictionio.controller", + "org.apache.predictionio.core", + "org.apache.predictionio.data.storage", + "org.apache.predictionio.data.storage.*", + "org.apache.predictionio.data.store").mkString(":"), "-overview", "docs/javadoc/javadoc-overview.html", "-noqualifier", http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/common/src/main/scala/org/apache/predictionio/authentication/KeyAuthentication.scala ---------------------------------------------------------------------- diff --git a/common/src/main/scala/org/apache/predictionio/authentication/KeyAuthentication.scala b/common/src/main/scala/org/apache/predictionio/authentication/KeyAuthentication.scala index 0553952..6b5995d 100644 --- a/common/src/main/scala/org/apache/predictionio/authentication/KeyAuthentication.scala +++ b/common/src/main/scala/org/apache/predictionio/authentication/KeyAuthentication.scala @@ -32,7 +32,7 @@ trait KeyAuthentication { object ServerKey { private val config = ConfigFactory.load("server.conf") - val get = config.getString("io.prediction.server.accessKey") + val get = config.getString("org.apache.predictionio.server.accessKey") val param = "accessKey" } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/common/src/main/scala/org/apache/predictionio/configuration/SSLConfiguration.scala ---------------------------------------------------------------------- diff --git a/common/src/main/scala/org/apache/predictionio/configuration/SSLConfiguration.scala b/common/src/main/scala/org/apache/predictionio/configuration/SSLConfiguration.scala index 2a9344d..311802f 100644 --- a/common/src/main/scala/org/apache/predictionio/configuration/SSLConfiguration.scala +++ b/common/src/main/scala/org/apache/predictionio/configuration/SSLConfiguration.scala @@ -31,9 +31,9 @@ trait SSLConfiguration { private val serverConfig = ConfigFactory.load("server.conf") private val keyStoreResource = - serverConfig.getString("io.prediction.server.ssl-keystore-resource") - private val password = serverConfig.getString("io.prediction.server.ssl-keystore-pass") - private val keyAlias = serverConfig.getString("io.prediction.server.ssl-key-alias") + serverConfig.getString("org.apache.predictionio.server.ssl-keystore-resource") + private val password = serverConfig.getString("org.apache.predictionio.server.ssl-keystore-pass") + private val keyAlias = serverConfig.getString("org.apache.predictionio.server.ssl-key-alias") private val keyStore = { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/conf/server.conf ---------------------------------------------------------------------- diff --git a/conf/server.conf b/conf/server.conf index 2d2f628..93ff6e1 100644 --- a/conf/server.conf +++ b/conf/server.conf @@ -1,12 +1,12 @@ # Engine and dashboard Server related configurations -io.prediction.server { +org.apache.predictionio.server { - # This access key is used by io.prediction.authentication.KeyAuthentication + # This access key is used by org.apache.predictionio.authentication.KeyAuthentication # to authenticate Evalutaion Dashboard, and Engine Server /stop and /reload enpoints # Should be passed as a query string param accessKey = "" - # configs used by io.prediction.configuration.SSLConfiguration + # configs used by org.apache.predictionio.configuration.SSLConfiguration ssl-keystore-resource = "keystore.jks" ssl-keystore-pass = "pioserver" ssl-key-alias = "selfsigned" http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/core/src/main/twirl/org/apache/predictionio/workflow/index.scala.html ---------------------------------------------------------------------- diff --git a/core/src/main/twirl/org/apache/predictionio/workflow/index.scala.html b/core/src/main/twirl/org/apache/predictionio/workflow/index.scala.html index 4e0707b..5a3894f 100644 --- a/core/src/main/twirl/org/apache/predictionio/workflow/index.scala.html +++ b/core/src/main/twirl/org/apache/predictionio/workflow/index.scala.html @@ -1,6 +1,6 @@ -@import io.prediction.data.storage.EngineInstance -@import io.prediction.data.storage.EngineManifest -@import io.prediction.workflow.ServerConfig +@import org.apache.predictionio.data.storage.EngineInstance +@import org.apache.predictionio.data.storage.EngineManifest +@import org.apache.predictionio.workflow.ServerConfig @import org.joda.time.DateTime @import org.joda.time.format.DateTimeFormat @(args: ServerConfig, http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/data/README.md ---------------------------------------------------------------------- diff --git a/data/README.md b/data/README.md index cead614..8f4e121 100644 --- a/data/README.md +++ b/data/README.md @@ -11,7 +11,7 @@ $ sbt/sbt "data/compile" $ set -a $ source conf/pio-env.sh $ set +a -$ sbt/sbt "data/run-main io.prediction.data.api.Run" +$ sbt/sbt "data/run-main org.apache.predictionio.data.api.Run" ``` ### Very simple test @@ -32,20 +32,20 @@ $ sbt/sbt "data/test" - test for EventService ``` -$ sbt/sbt "data/test-only io.prediction.data.api.EventServiceSpec" +$ sbt/sbt "data/test-only org.apache.predictionio.data.api.EventServiceSpec" ``` - test for LEvents ``` -$ sbt/sbt "data/test-only io.prediction.data.storage.LEventsSpec" +$ sbt/sbt "data/test-only org.apache.predictionio.data.storage.LEventsSpec" ``` - test for ExampleJson and ExampleForm webhooks ``` -$ sbt/sbt "data/test-only io.prediction.data.webhooks.examplejson.ExampleJsonConnectorSpec" -$ sbt/sbt "data/test-only io.prediction.data.webhooks.exampleform.ExampleFormConnectorSpec" +$ sbt/sbt "data/test-only org.apache.predictionio.data.webhooks.examplejson.ExampleJsonConnectorSpec" +$ sbt/sbt "data/test-only org.apache.predictionio.data.webhooks.exampleform.ExampleFormConnectorSpec" ``` ### Upgrade from 0.8.0/0.8.1 to 0.8.2 @@ -63,7 +63,7 @@ Replace <to app ID> by the returned app ID: $ set -a $ source conf/pio-env.sh $ set +a -$ sbt/sbt "data/run-main io.prediction.data.storage.hbase.upgrade.Upgrade <from app ID>" "<to app ID>" +$ sbt/sbt "data/run-main org.apache.predictionio.data.storage.hbase.upgrade.Upgrade <from app ID>" "<to app ID>" ``` ### Upgrade from 0.8.2 to 0.8.3 @@ -91,7 +91,7 @@ $ bin/pio app new NewApp The App with `<new_app_id>` must be empty before you upgrade. You can check the status of this new created app using: ``` -$ sbt/sbt "data/run-main io.prediction.data.storage.hbase.upgrade.CheckDistribution <new_app_id>" +$ sbt/sbt "data/run-main org.apache.predictionio.data.storage.hbase.upgrade.CheckDistribution <new_app_id>" ``` If it shows that it is non-empty, you can clean it with @@ -103,12 +103,12 @@ $ bin/pio app data-delete <new_app_name> #### 2. Run the following to migrate from <old_app_id> to <new_app_id> ``` -$ sbt/sbt "data/run-main io.prediction.data.storage.hbase.upgrade.Upgrade_0_8_3 <old_app_id> <new_app_id>" +$ sbt/sbt "data/run-main org.apache.predictionio.data.storage.hbase.upgrade.Upgrade_0_8_3 <old_app_id> <new_app_id>" ... Done. ``` You can use the following to check the <new_app_id> again. It should display the number of data being migrated: ``` -$ sbt/sbt "data/run-main io.prediction.data.storage.hbase.upgrade.CheckDistribution <new_app_id>" +$ sbt/sbt "data/run-main org.apache.predictionio.data.storage.hbase.upgrade.CheckDistribution <new_app_id>" ``` http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade.scala b/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade.scala index 7ef5305..dfbf415 100644 --- a/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade.scala +++ b/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade.scala @@ -13,13 +13,13 @@ * limitations under the License. */ -package io.prediction.data.storage.hbase.upgrade +package org.apache.predictionio.data.storage.hbase.upgrade -import io.prediction.annotation.Experimental +import org.apache.predictionio.annotation.Experimental -import io.prediction.data.storage.Storage -import io.prediction.data.storage.hbase.HBLEvents -import io.prediction.data.storage.hbase.HBEventsUtil +import org.apache.predictionio.data.storage.Storage +import org.apache.predictionio.data.storage.hbase.HBLEvents +import org.apache.predictionio.data.storage.hbase.HBEventsUtil import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade_0_8_3.scala ---------------------------------------------------------------------- diff --git a/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade_0_8_3.scala b/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade_0_8_3.scala index 8b80b83..78859d3 100644 --- a/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade_0_8_3.scala +++ b/data/src/main/scala/org/apache/predictionio/data/storage/hbase/upgrade/Upgrade_0_8_3.scala @@ -13,21 +13,21 @@ * limitations under the License. */ -package io.prediction.data.storage.hbase.upgrade +package org.apache.predictionio.data.storage.hbase.upgrade -import io.prediction.annotation.Experimental +import org.apache.predictionio.annotation.Experimental import grizzled.slf4j.Logger -import io.prediction.data.storage.Storage -import io.prediction.data.storage.DataMap -import io.prediction.data.storage.hbase.HBLEvents -import io.prediction.data.storage.hbase.HBEventsUtil +import org.apache.predictionio.data.storage.Storage +import org.apache.predictionio.data.storage.DataMap +import org.apache.predictionio.data.storage.hbase.HBLEvents +import org.apache.predictionio.data.storage.hbase.HBEventsUtil import scala.collection.JavaConversions._ import scala.concurrent._ import ExecutionContext.Implicits.global -import io.prediction.data.storage.LEvents +import org.apache.predictionio.data.storage.LEvents import scala.concurrent.Await import scala.concurrent.duration.Duration import java.lang.Thread http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/data/src/test/resources/application.conf ---------------------------------------------------------------------- diff --git a/data/src/test/resources/application.conf b/data/src/test/resources/application.conf index 2e1229d..eecae44 100644 --- a/data/src/test/resources/application.conf +++ b/data/src/test/resources/application.conf @@ -1,4 +1,4 @@ -io.prediction.data.storage { +org.apache.predictionio.data.storage { sources { mongodb { type = mongodb http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/data/src/test/scala/org/apache/predictionio/data/api/SegmentIOAuthSpec.scala ---------------------------------------------------------------------- diff --git a/data/src/test/scala/org/apache/predictionio/data/api/SegmentIOAuthSpec.scala b/data/src/test/scala/org/apache/predictionio/data/api/SegmentIOAuthSpec.scala index bae0f0b..31fe1a6 100644 --- a/data/src/test/scala/org/apache/predictionio/data/api/SegmentIOAuthSpec.scala +++ b/data/src/test/scala/org/apache/predictionio/data/api/SegmentIOAuthSpec.scala @@ -1,8 +1,8 @@ -package io.prediction.data.api +package org.apache.predictionio.data.api import akka.actor.{ActorSystem, Props} import akka.testkit.TestProbe -import io.prediction.data.storage._ +import org.apache.predictionio.data.storage._ import org.joda.time.DateTime import org.specs2.mutable.Specification import spray.http.HttpHeaders.RawHeader http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-helloworld/MyAlgorithm.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-helloworld/MyAlgorithm.java b/examples/experimental/java-local-helloworld/MyAlgorithm.java index 2294791..be68077 100644 --- a/examples/experimental/java-local-helloworld/MyAlgorithm.java +++ b/examples/experimental/java-local-helloworld/MyAlgorithm.java @@ -1,6 +1,6 @@ package org.sample.java.helloworld; -import io.prediction.controller.java.*; +import org.apache.predictionio.controller.java.*; import java.util.Map; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-helloworld/MyDataSource.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-helloworld/MyDataSource.java b/examples/experimental/java-local-helloworld/MyDataSource.java index 3fe9510..c0c4ce5 100644 --- a/examples/experimental/java-local-helloworld/MyDataSource.java +++ b/examples/experimental/java-local-helloworld/MyDataSource.java @@ -1,6 +1,6 @@ package org.sample.java.helloworld; -import io.prediction.controller.java.*; +import org.apache.predictionio.controller.java.*; import java.util.List; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-helloworld/MyEngineFactory.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-helloworld/MyEngineFactory.java b/examples/experimental/java-local-helloworld/MyEngineFactory.java index a545c82..6faae88 100644 --- a/examples/experimental/java-local-helloworld/MyEngineFactory.java +++ b/examples/experimental/java-local-helloworld/MyEngineFactory.java @@ -1,6 +1,6 @@ package org.sample.java.helloworld; -import io.prediction.controller.java.*; +import org.apache.predictionio.controller.java.*; public class MyEngineFactory implements IJavaEngineFactory { public JavaSimpleEngine<MyTrainingData, EmptyDataParams, MyQuery, http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-helloworld/build.sbt ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-helloworld/build.sbt b/examples/experimental/java-local-helloworld/build.sbt index d233429..198a6d9 100644 --- a/examples/experimental/java-local-helloworld/build.sbt +++ b/examples/experimental/java-local-helloworld/build.sbt @@ -7,5 +7,5 @@ name := "example-java-local-helloworld" organization := "org.sample" libraryDependencies ++= Seq( - "io.prediction" %% "core" % "0.9.1" % "provided", + "org.apache.predictionio" %% "core" % "0.9.1" % "provided", "org.apache.spark" %% "spark-core" % "1.2.0" % "provided") http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/README.md ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/README.md b/examples/experimental/java-local-regression/README.md index 86c7e48..2a4be0b 100644 --- a/examples/experimental/java-local-regression/README.md +++ b/examples/experimental/java-local-regression/README.md @@ -65,7 +65,7 @@ $ curl -X POST http://localhost:9997/queries.json -d \ You can evaluate the engine instance too. ``` $ pio eval --batch JavaRegressionEval \ ---metrics-class io.prediction.examples.java.regression.MeanSquareMetrics +--metrics-class org.apache.predictionio.examples.java.regression.MeanSquareMetrics ... 2014-09-24 03:23:07,170 INFO spark.SparkContext - Job finished: collect at Workflow.scala:695, took 0.092829 s http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/build.sbt ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/build.sbt b/examples/experimental/java-local-regression/build.sbt index 2a95cdd..dc4100b 100644 --- a/examples/experimental/java-local-regression/build.sbt +++ b/examples/experimental/java-local-regression/build.sbt @@ -10,5 +10,5 @@ organization := "myorg" version := "0.0.1-SNAPSHOT" libraryDependencies ++= Seq( - "io.prediction" %% "core" % "0.9.1" % "provided", + "org.apache.predictionio" %% "core" % "0.9.1" % "provided", "org.apache.spark" %% "spark-core" % "1.2.0" % "provided") http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/engine.json ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/engine.json b/examples/experimental/java-local-regression/engine.json index 9cb6c16..a80ef7d 100644 --- a/examples/experimental/java-local-regression/engine.json +++ b/examples/experimental/java-local-regression/engine.json @@ -1,7 +1,7 @@ { "id": "java-local-regression", "description": "java-local-regression", - "engineFactory": "io.prediction.examples.java.regression.EngineFactory", + "engineFactory": "org.apache.predictionio.examples.java.regression.EngineFactory", "datasource": { "params": { "filepath": "PATH-TO-lr_data.txt" http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/DataSource.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/DataSource.java b/examples/experimental/java-local-regression/src/main/java/DataSource.java index 82a4365..ad36904 100644 --- a/examples/experimental/java-local-regression/src/main/java/DataSource.java +++ b/examples/experimental/java-local-regression/src/main/java/DataSource.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.LJavaDataSource; +import org.apache.predictionio.controller.java.LJavaDataSource; import scala.Tuple2; import scala.Tuple3; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/DataSourceParams.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/DataSourceParams.java b/examples/experimental/java-local-regression/src/main/java/DataSourceParams.java index a7fb887..324ab7f 100644 --- a/examples/experimental/java-local-regression/src/main/java/DataSourceParams.java +++ b/examples/experimental/java-local-regression/src/main/java/DataSourceParams.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.JavaParams; +import org.apache.predictionio.controller.java.JavaParams; public class DataSourceParams implements JavaParams { public final String filepath; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithm.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithm.java b/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithm.java index 64b150c..6fb7e61 100644 --- a/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithm.java +++ b/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithm.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.LJavaAlgorithm; +import org.apache.predictionio.controller.java.LJavaAlgorithm; // This algorithm is for illustration only. It returns a constant. public class DefaultAlgorithm http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithmParams.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithmParams.java b/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithmParams.java index c20cdd7..a62a08c 100644 --- a/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithmParams.java +++ b/examples/experimental/java-local-regression/src/main/java/DefaultAlgorithmParams.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.JavaParams; +import org.apache.predictionio.controller.java.JavaParams; public class DefaultAlgorithmParams implements JavaParams { public final double v; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/EngineFactory.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/EngineFactory.java b/examples/experimental/java-local-regression/src/main/java/EngineFactory.java index 1b61141..09886a4 100644 --- a/examples/experimental/java-local-regression/src/main/java/EngineFactory.java +++ b/examples/experimental/java-local-regression/src/main/java/EngineFactory.java @@ -1,8 +1,8 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.IJavaEngineFactory; -import io.prediction.controller.java.JavaEngine; -import io.prediction.controller.java.JavaEngineBuilder; +import org.apache.predictionio.controller.java.IJavaEngineFactory; +import org.apache.predictionio.controller.java.JavaEngine; +import org.apache.predictionio.controller.java.JavaEngineBuilder; public class EngineFactory implements IJavaEngineFactory { public JavaEngine<TrainingData, Integer, TrainingData, Double[], Double, Double> apply() { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/MeanSquareEvaluator.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/MeanSquareEvaluator.java b/examples/experimental/java-local-regression/src/main/java/MeanSquareEvaluator.java index 263e5dc..a556adc 100644 --- a/examples/experimental/java-local-regression/src/main/java/MeanSquareEvaluator.java +++ b/examples/experimental/java-local-regression/src/main/java/MeanSquareEvaluator.java @@ -1,8 +1,8 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.JavaEvaluator; +import org.apache.predictionio.controller.java.JavaEvaluator; import java.lang.Iterable; -import io.prediction.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.EmptyParams; import scala.Tuple2; import java.util.List; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/OLSAlgorithm.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/OLSAlgorithm.java b/examples/experimental/java-local-regression/src/main/java/OLSAlgorithm.java index 72c47a1..86d047a 100644 --- a/examples/experimental/java-local-regression/src/main/java/OLSAlgorithm.java +++ b/examples/experimental/java-local-regression/src/main/java/OLSAlgorithm.java @@ -1,11 +1,11 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; import org.apache.commons.math3.stat.regression.OLSMultipleLinearRegression; import org.apache.commons.math3.linear.RealVector; import java.util.Arrays; -import io.prediction.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.EmptyParams; -import io.prediction.controller.java.LJavaAlgorithm; +import org.apache.predictionio.controller.java.LJavaAlgorithm; public class OLSAlgorithm extends LJavaAlgorithm<EmptyParams, TrainingData, Double[], Double[], Double> { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/Preparator.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/Preparator.java b/examples/experimental/java-local-regression/src/main/java/Preparator.java index 8015d6e..b3e8173 100644 --- a/examples/experimental/java-local-regression/src/main/java/Preparator.java +++ b/examples/experimental/java-local-regression/src/main/java/Preparator.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.LJavaPreparator; +import org.apache.predictionio.controller.java.LJavaPreparator; // This Preparator is just a proof-of-concept. It removes a fraction of the // training data to make training more "efficient". http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/PreparatorParams.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/PreparatorParams.java b/examples/experimental/java-local-regression/src/main/java/PreparatorParams.java index 6b38e53..38028c4 100644 --- a/examples/experimental/java-local-regression/src/main/java/PreparatorParams.java +++ b/examples/experimental/java-local-regression/src/main/java/PreparatorParams.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.JavaParams; +import org.apache.predictionio.controller.java.JavaParams; public class PreparatorParams implements JavaParams { // Take the r-fraction of data in training. http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/Run.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/Run.java b/examples/experimental/java-local-regression/src/main/java/Run.java index 356fb9a..b0edaf0 100644 --- a/examples/experimental/java-local-regression/src/main/java/Run.java +++ b/examples/experimental/java-local-regression/src/main/java/Run.java @@ -1,15 +1,15 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.EmptyParams; -import io.prediction.controller.java.IJavaEngineFactory; -import io.prediction.controller.java.JavaParams; -import io.prediction.controller.java.JavaEngine; -import io.prediction.controller.java.JavaEngineBuilder; -import io.prediction.controller.java.JavaEngineParams; -import io.prediction.controller.java.JavaEngineParamsBuilder; -import io.prediction.controller.java.LJavaAlgorithm; -import io.prediction.controller.java.JavaWorkflow; -import io.prediction.controller.java.WorkflowParamsBuilder; +import org.apache.predictionio.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.IJavaEngineFactory; +import org.apache.predictionio.controller.java.JavaParams; +import org.apache.predictionio.controller.java.JavaEngine; +import org.apache.predictionio.controller.java.JavaEngineBuilder; +import org.apache.predictionio.controller.java.JavaEngineParams; +import org.apache.predictionio.controller.java.JavaEngineParamsBuilder; +import org.apache.predictionio.controller.java.LJavaAlgorithm; +import org.apache.predictionio.controller.java.JavaWorkflow; +import org.apache.predictionio.controller.java.WorkflowParamsBuilder; import java.io.File; import java.io.IOException; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/Serving.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/Serving.java b/examples/experimental/java-local-regression/src/main/java/Serving.java index f6cfecd..2fa0bb4 100644 --- a/examples/experimental/java-local-regression/src/main/java/Serving.java +++ b/examples/experimental/java-local-regression/src/main/java/Serving.java @@ -1,7 +1,7 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; -import io.prediction.controller.java.LJavaServing; -import io.prediction.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.LJavaServing; +import org.apache.predictionio.controller.java.EmptyParams; import java.lang.Iterable; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/TrainingData.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/TrainingData.java b/examples/experimental/java-local-regression/src/main/java/TrainingData.java index ec8a11f..3666c6c 100644 --- a/examples/experimental/java-local-regression/src/main/java/TrainingData.java +++ b/examples/experimental/java-local-regression/src/main/java/TrainingData.java @@ -1,4 +1,4 @@ -package io.prediction.examples.java.regression; +package org.apache.predictionio.examples.java.regression; import java.io.Serializable; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-regression/src/main/java/examples/manifest.json ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-regression/src/main/java/examples/manifest.json b/examples/experimental/java-local-regression/src/main/java/examples/manifest.json index 886baca..191de43 100644 --- a/examples/experimental/java-local-regression/src/main/java/examples/manifest.json +++ b/examples/experimental/java-local-regression/src/main/java/examples/manifest.json @@ -1,6 +1,6 @@ { - "id": "io.prediction.examples.java.regression", + "id": "org.apache.predictionio.examples.java.regression", "version": "0.8.1-SNAPSHOT", "name": "Apache Java Regression Engine", - "engineFactory": "io.prediction.examples.java.regression.EngineFactory" + "engineFactory": "org.apache.predictionio.examples.java.regression.EngineFactory" } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/build.sbt ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/build.sbt b/examples/experimental/java-local-tutorial/build.sbt index 0f92e55..b7a4ccd 100644 --- a/examples/experimental/java-local-tutorial/build.sbt +++ b/examples/experimental/java-local-tutorial/build.sbt @@ -5,12 +5,12 @@ assemblySettings name := "java-local-tutorial" -organization := "io.prediction" +organization := "org.apache.predictionio" version := "0.9.1" libraryDependencies ++= Seq( - "io.prediction" %% "core" % "0.9.1" % "provided", - "io.prediction" %% "engines" % "0.9.1" % "provided", + "org.apache.predictionio" %% "core" % "0.9.1" % "provided", + "org.apache.predictionio" %% "engines" % "0.9.1" % "provided", "org.apache.mahout" % "mahout-core" % "0.9", "org.apache.spark" %% "spark-core" % "1.2.0" % "provided") http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/AlgoParams.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/AlgoParams.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/AlgoParams.java index dbf6779..a687a1c 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/AlgoParams.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/AlgoParams.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.recommendations.tutorial1; +package org.apache.predictionio.examples.java.recommendations.tutorial1; -import io.prediction.controller.java.JavaParams; +import org.apache.predictionio.controller.java.JavaParams; public class AlgoParams implements JavaParams { public double threshold; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Algorithm.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Algorithm.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Algorithm.java index 0c2ab4d..616d014 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Algorithm.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Algorithm.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.recommendations.tutorial1; +package org.apache.predictionio.examples.java.recommendations.tutorial1; -import io.prediction.controller.java.LJavaAlgorithm; +import org.apache.predictionio.controller.java.LJavaAlgorithm; import org.apache.commons.math3.linear.RealVector; import org.apache.commons.math3.linear.ArrayRealVector; import org.apache.commons.math3.linear.OpenMapRealVector; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSource.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSource.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSource.java index edc6642..3f7b356 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSource.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSource.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.recommendations.tutorial1; +package org.apache.predictionio.examples.java.recommendations.tutorial1; -import io.prediction.controller.java.LJavaDataSource; +import org.apache.predictionio.controller.java.LJavaDataSource; import scala.Tuple2; import scala.Tuple3; import java.io.File; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSourceParams.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSourceParams.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSourceParams.java index ee4471c..411cf88 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSourceParams.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/DataSourceParams.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.recommendations.tutorial1; +package org.apache.predictionio.examples.java.recommendations.tutorial1; -import io.prediction.controller.java.JavaParams; +import org.apache.predictionio.controller.java.JavaParams; public class DataSourceParams implements JavaParams { public String filePath; // file path http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/EngineFactory.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/EngineFactory.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/EngineFactory.java index c791ccb..56881de 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/EngineFactory.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/EngineFactory.java @@ -1,8 +1,8 @@ -package io.prediction.examples.java.recommendations.tutorial1; +package org.apache.predictionio.examples.java.recommendations.tutorial1; -import io.prediction.controller.java.IJavaEngineFactory; -import io.prediction.controller.java.JavaSimpleEngine; -import io.prediction.controller.java.JavaSimpleEngineBuilder; +import org.apache.predictionio.controller.java.IJavaEngineFactory; +import org.apache.predictionio.controller.java.JavaSimpleEngine; +import org.apache.predictionio.controller.java.JavaSimpleEngineBuilder; public class EngineFactory implements IJavaEngineFactory { public JavaSimpleEngine<TrainingData, Object, Query, Float, Object> apply() { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Model.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Model.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Model.java index 842bc34..a839010 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Model.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Model.java @@ -1,4 +1,4 @@ -package io.prediction.examples.java.recommendations.tutorial1; +package org.apache.predictionio.examples.java.recommendations.tutorial1; import java.io.Serializable; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Query.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Query.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Query.java index ef09d41..bfca90c 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Query.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/Query.java @@ -1,4 +1,4 @@ -package io.prediction.examples.java.recommendations.tutorial1; +package org.apache.predictionio.examples.java.recommendations.tutorial1; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/TrainingData.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/TrainingData.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/TrainingData.java index e92af22..1f015d9 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/TrainingData.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/TrainingData.java @@ -1,4 +1,4 @@ -package io.prediction.examples.java.recommendations.tutorial1; +package org.apache.predictionio.examples.java.recommendations.tutorial1; import java.io.Serializable; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/engine.json ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/engine.json b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/engine.json index c43174e..12c3927 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/engine.json +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial1/engine.json @@ -1,6 +1,6 @@ { - "id": "io.prediction.examples.java.recommendations.tutorial1.EngineFactory", + "id": "org.apache.predictionio.examples.java.recommendations.tutorial1.EngineFactory", "version": "0.9.1", "name": "Simple Recommendations Engine", - "engineFactory": "io.prediction.examples.java.recommendations.tutorial1.EngineFactory" + "engineFactory": "org.apache.predictionio.examples.java.recommendations.tutorial1.EngineFactory" } http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner1.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner1.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner1.java index 6efc798..b121b37 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner1.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner1.java @@ -1,18 +1,18 @@ -package io.prediction.examples.java.recommendations.tutorial2; +package org.apache.predictionio.examples.java.recommendations.tutorial2; -import io.prediction.examples.java.recommendations.tutorial1.TrainingData; -import io.prediction.examples.java.recommendations.tutorial1.Query; -import io.prediction.examples.java.recommendations.tutorial1.DataSource; -import io.prediction.examples.java.recommendations.tutorial1.DataSourceParams; +import org.apache.predictionio.examples.java.recommendations.tutorial1.TrainingData; +import org.apache.predictionio.examples.java.recommendations.tutorial1.Query; +import org.apache.predictionio.examples.java.recommendations.tutorial1.DataSource; +import org.apache.predictionio.examples.java.recommendations.tutorial1.DataSourceParams; -import io.prediction.controller.java.EmptyParams; -import io.prediction.controller.java.IJavaEngineFactory; -import io.prediction.controller.java.JavaSimpleEngine; -import io.prediction.controller.java.JavaSimpleEngineBuilder; -import io.prediction.controller.java.JavaEngineParams; -import io.prediction.controller.java.JavaEngineParamsBuilder; -import io.prediction.controller.java.JavaWorkflow; -import io.prediction.controller.java.WorkflowParamsBuilder; +import org.apache.predictionio.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.IJavaEngineFactory; +import org.apache.predictionio.controller.java.JavaSimpleEngine; +import org.apache.predictionio.controller.java.JavaSimpleEngineBuilder; +import org.apache.predictionio.controller.java.JavaEngineParams; +import org.apache.predictionio.controller.java.JavaEngineParamsBuilder; +import org.apache.predictionio.controller.java.JavaWorkflow; +import org.apache.predictionio.controller.java.WorkflowParamsBuilder; import java.util.HashMap; public class Runner1 { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner2.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner2.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner2.java index a8838da..3a12b35 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner2.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial2/Runner2.java @@ -1,24 +1,24 @@ -package io.prediction.examples.java.recommendations.tutorial2; - -import io.prediction.examples.java.recommendations.tutorial1.TrainingData; -import io.prediction.examples.java.recommendations.tutorial1.Query; -import io.prediction.examples.java.recommendations.tutorial1.DataSource; -import io.prediction.examples.java.recommendations.tutorial1.DataSourceParams; -import io.prediction.examples.java.recommendations.tutorial1.Algorithm; -import io.prediction.examples.java.recommendations.tutorial1.AlgoParams; - -import io.prediction.controller.java.EmptyParams; -import io.prediction.controller.java.IJavaEngineFactory; -import io.prediction.controller.java.JavaSimpleEngine; -import io.prediction.controller.java.JavaSimpleEngineBuilder; -import io.prediction.controller.java.JavaEngineParams; -import io.prediction.controller.java.JavaEngineParamsBuilder; -import io.prediction.controller.java.JavaWorkflow; -import io.prediction.controller.java.WorkflowParamsBuilder; +package org.apache.predictionio.examples.java.recommendations.tutorial2; + +import org.apache.predictionio.examples.java.recommendations.tutorial1.TrainingData; +import org.apache.predictionio.examples.java.recommendations.tutorial1.Query; +import org.apache.predictionio.examples.java.recommendations.tutorial1.DataSource; +import org.apache.predictionio.examples.java.recommendations.tutorial1.DataSourceParams; +import org.apache.predictionio.examples.java.recommendations.tutorial1.Algorithm; +import org.apache.predictionio.examples.java.recommendations.tutorial1.AlgoParams; + +import org.apache.predictionio.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.IJavaEngineFactory; +import org.apache.predictionio.controller.java.JavaSimpleEngine; +import org.apache.predictionio.controller.java.JavaSimpleEngineBuilder; +import org.apache.predictionio.controller.java.JavaEngineParams; +import org.apache.predictionio.controller.java.JavaEngineParamsBuilder; +import org.apache.predictionio.controller.java.JavaWorkflow; +import org.apache.predictionio.controller.java.WorkflowParamsBuilder; import java.util.HashMap; -import io.prediction.controller.IdentityPreparator; +import org.apache.predictionio.controller.IdentityPreparator; public class Runner2 { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/DataSource.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/DataSource.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/DataSource.java index ee4c8e2..426e628 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/DataSource.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/DataSource.java @@ -1,10 +1,10 @@ -package io.prediction.examples.java.recommendations.tutorial3; +package org.apache.predictionio.examples.java.recommendations.tutorial3; -import io.prediction.examples.java.recommendations.tutorial1.TrainingData; -import io.prediction.examples.java.recommendations.tutorial1.Query; -import io.prediction.examples.java.recommendations.tutorial1.DataSourceParams; +import org.apache.predictionio.examples.java.recommendations.tutorial1.TrainingData; +import org.apache.predictionio.examples.java.recommendations.tutorial1.Query; +import org.apache.predictionio.examples.java.recommendations.tutorial1.DataSourceParams; -import io.prediction.controller.java.LJavaDataSource; +import org.apache.predictionio.controller.java.LJavaDataSource; import scala.Tuple2; import scala.Tuple3; import java.io.File; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/EngineFactory.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/EngineFactory.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/EngineFactory.java index 9c74c77..7e7add7 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/EngineFactory.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/EngineFactory.java @@ -1,12 +1,12 @@ -package io.prediction.examples.java.recommendations.tutorial3; +package org.apache.predictionio.examples.java.recommendations.tutorial3; -import io.prediction.examples.java.recommendations.tutorial1.Algorithm; -import io.prediction.examples.java.recommendations.tutorial1.TrainingData; -import io.prediction.examples.java.recommendations.tutorial1.Query; +import org.apache.predictionio.examples.java.recommendations.tutorial1.Algorithm; +import org.apache.predictionio.examples.java.recommendations.tutorial1.TrainingData; +import org.apache.predictionio.examples.java.recommendations.tutorial1.Query; -import io.prediction.controller.java.IJavaEngineFactory; -import io.prediction.controller.java.JavaSimpleEngine; -import io.prediction.controller.java.JavaSimpleEngineBuilder; +import org.apache.predictionio.controller.java.IJavaEngineFactory; +import org.apache.predictionio.controller.java.JavaSimpleEngine; +import org.apache.predictionio.controller.java.JavaSimpleEngineBuilder; public class EngineFactory implements IJavaEngineFactory { public JavaSimpleEngine<TrainingData, Object, Query, Float, Float> apply() { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Evaluator.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Evaluator.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Evaluator.java index 547eaf0..98042b0 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Evaluator.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Evaluator.java @@ -1,8 +1,8 @@ -package io.prediction.examples.java.recommendations.tutorial3; +package org.apache.predictionio.examples.java.recommendations.tutorial3; -import io.prediction.examples.java.recommendations.tutorial1.Query; -import io.prediction.controller.java.JavaEvaluator; -import io.prediction.controller.java.EmptyParams; +import org.apache.predictionio.examples.java.recommendations.tutorial1.Query; +import org.apache.predictionio.controller.java.JavaEvaluator; +import org.apache.predictionio.controller.java.EmptyParams; import scala.Tuple2; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Runner3.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Runner3.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Runner3.java index 7b4f581..5fba5aa 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Runner3.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial3/Runner3.java @@ -1,16 +1,16 @@ -package io.prediction.examples.java.recommendations.tutorial3; +package org.apache.predictionio.examples.java.recommendations.tutorial3; -import io.prediction.examples.java.recommendations.tutorial1.DataSourceParams; -import io.prediction.examples.java.recommendations.tutorial1.AlgoParams; +import org.apache.predictionio.examples.java.recommendations.tutorial1.DataSourceParams; +import org.apache.predictionio.examples.java.recommendations.tutorial1.AlgoParams; -import io.prediction.controller.java.EmptyParams; -import io.prediction.controller.java.IJavaEngineFactory; -import io.prediction.controller.java.JavaSimpleEngine; -import io.prediction.controller.java.JavaSimpleEngineBuilder; -import io.prediction.controller.java.JavaEngineParams; -import io.prediction.controller.java.JavaEngineParamsBuilder; -import io.prediction.controller.java.JavaWorkflow; -import io.prediction.controller.java.WorkflowParamsBuilder; +import org.apache.predictionio.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.IJavaEngineFactory; +import org.apache.predictionio.controller.java.JavaSimpleEngine; +import org.apache.predictionio.controller.java.JavaSimpleEngineBuilder; +import org.apache.predictionio.controller.java.JavaEngineParams; +import org.apache.predictionio.controller.java.JavaEngineParamsBuilder; +import org.apache.predictionio.controller.java.JavaWorkflow; +import org.apache.predictionio.controller.java.WorkflowParamsBuilder; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithm.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithm.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithm.java index 35ecc7e..0aa12f3 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithm.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithm.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; -import io.prediction.controller.java.LJavaAlgorithm; +import org.apache.predictionio.controller.java.LJavaAlgorithm; import org.apache.commons.math3.linear.RealVector; import org.apache.commons.math3.linear.ArrayRealVector; import org.apache.commons.math3.linear.OpenMapRealVector; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithmParams.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithmParams.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithmParams.java index 6da986d..ca9dc2f 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithmParams.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringAlgorithmParams.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; -import io.prediction.controller.java.JavaParams; +import org.apache.predictionio.controller.java.JavaParams; public class CollaborativeFilteringAlgorithmParams implements JavaParams { public double threshold; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringModel.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringModel.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringModel.java index 62c1b75..523f44a 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringModel.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/CollaborativeFilteringModel.java @@ -1,4 +1,4 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; import java.io.Serializable; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSource.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSource.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSource.java index 6853a32..f3938f2 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSource.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSource.java @@ -1,8 +1,8 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; import java.util.Arrays; -import io.prediction.controller.java.LJavaDataSource; -import io.prediction.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.LJavaDataSource; +import org.apache.predictionio.controller.java.EmptyParams; import scala.Tuple2; import scala.Tuple3; import java.io.File; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSourceParams.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSourceParams.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSourceParams.java index c31b757..322bb68 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSourceParams.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/DataSourceParams.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; -import io.prediction.controller.java.JavaParams; +import org.apache.predictionio.controller.java.JavaParams; public class DataSourceParams implements JavaParams { public String dir; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/EngineFactory.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/EngineFactory.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/EngineFactory.java index b06b0a2..e88fa83 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/EngineFactory.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/EngineFactory.java @@ -1,9 +1,9 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; -import io.prediction.controller.java.EmptyParams; -import io.prediction.controller.java.IJavaEngineFactory; -import io.prediction.controller.java.JavaEngine; -import io.prediction.controller.java.JavaEngineBuilder; +import org.apache.predictionio.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.IJavaEngineFactory; +import org.apache.predictionio.controller.java.JavaEngine; +import org.apache.predictionio.controller.java.JavaEngineBuilder; public class EngineFactory implements IJavaEngineFactory { public JavaEngine<TrainingData, EmptyParams, PreparedData, Query, Float, Object> apply() { http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithm.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithm.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithm.java index cf35237..e51d821 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithm.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithm.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; -import io.prediction.controller.java.LJavaAlgorithm; +import org.apache.predictionio.controller.java.LJavaAlgorithm; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithmParams.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithmParams.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithmParams.java index 300f95e..4f31fa6 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithmParams.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedAlgorithmParams.java @@ -1,6 +1,6 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; -import io.prediction.controller.java.JavaParams; +import org.apache.predictionio.controller.java.JavaParams; // actual score = (rating - drift) / scale if min <= rating <= max // if rating is outside [min, max], that scoring will not be used. http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedModel.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedModel.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedModel.java index 7d13974..b598c38 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedModel.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/FeatureBasedModel.java @@ -1,4 +1,4 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; import java.io.Serializable; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/Preparator.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/Preparator.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/Preparator.java index 9ff4119..3ccce53 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/Preparator.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/Preparator.java @@ -1,7 +1,7 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; -import io.prediction.controller.java.LJavaPreparator; -import io.prediction.controller.java.EmptyParams; +import org.apache.predictionio.controller.java.LJavaPreparator; +import org.apache.predictionio.controller.java.EmptyParams; import java.util.Arrays; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/6d160b6b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/PreparedData.java ---------------------------------------------------------------------- diff --git a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/PreparedData.java b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/PreparedData.java index c416eaf..35c46ea 100644 --- a/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/PreparedData.java +++ b/examples/experimental/java-local-tutorial/src/main/java/recommendations/tutorial4/PreparedData.java @@ -1,4 +1,4 @@ -package io.prediction.examples.java.recommendations.tutorial4; +package org.apache.predictionio.examples.java.recommendations.tutorial4; import java.util.Map; import org.apache.commons.math3.linear.RealVector;
