Update examples for API changes.

Update PageRank and WordCount examples for changes in the API, specifically the change to ScoobiApp and the introduction of DObject. Also remove all other examples as they have been ported to be acceptance test specs.
NICTA · May 31, 2012 · c1fb514 · c1fb514
1 parent 7dafbb9
commit c1fb514
Show file tree

Hide file tree

Showing 22 changed files with 74 additions and 737 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ To use the sbt-scoobi plugin we need to include a `project/project/scoobi.scala`
     }
 ```
 
-And, we can add a pretty standard `build.sbt` that has a dependency on Scoobi:
+And, we can add a `build.sbt` that has a dependency on Scoobi:
 
 ```scala
     name := "MyApp"
@@ -38,7 +38,9 @@ And, we can add a pretty standard `build.sbt` that has a dependency on Scoobi:
 
     libraryDependencies += "com.nicta" %% "scoobi" % "0.4.0-SNAPSHOT" % "provided"
 
-    scalacOptions += "-deprecation"
+    scalacOptions ++= Seq("-Ydependent-method-types", "-deprecation")
+
+    resolvers += "snapshots" at "http://oss.sonatype.org/content/repositories/snapshots"
 ```
 
 The `provided` is added to the `scoobi` dependency to let sbt know that Scoobi

diff --git a/examples/averageAge/build.sbt b/examples/averageAge/build.sbt
diff --git a/examples/averageAge/project/project/build.scala b/examples/averageAge/project/project/build.scala
diff --git a/examples/averageAge/src/main/scala/AverageAge.scala b/examples/averageAge/src/main/scala/AverageAge.scala
diff --git a/examples/javaWordCount/build.sbt b/examples/javaWordCount/build.sbt
@@ -1,8 +1,10 @@
 name := "Java Word Count"
 
-version := "0.1"
+version := "1.0"
 
 scalaVersion := "2.9.2"
 
 libraryDependencies += "com.nicta" %% "scoobi" % "0.4.0-SNAPSHOT" % "provided"
 
+resolvers += "snapshots" at "http://oss.sonatype.org/content/repositories/snapshots"
+
diff --git a/examples/javaWordCount/src/main/java/WordCount.java b/examples/javaWordCount/src/main/java/WordCount.java
@@ -14,26 +14,12 @@
  * limitations under the License.
  */
 package com.nicta.scoobij.examples;
-/**
- * Copyright 2011 National ICT Australia Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 
 import com.nicta.scoobij.*;
 import java.io.*;
 import com.nicta.scoobij.io.text.*;
 
+
 public class WordCount {
 
 	public static void main(String[] args) throws java.io.IOException {
@@ -88,7 +74,7 @@ public Integer apply(Integer a, Integer b) {
 				}, WireFormats.string(), WireFormats.integer());
 
 		// We can evalute this, and write it to a text file
-		Scoobi.persist(TextOutput.toTextFile(reduced, outputPath,
+		Scoobi.persist(TextOutput.toTextFile(reduced, outputPath, false,
 				WireFormats.string(), WireFormats.integer()));
 	}
 

diff --git a/examples/joinExamples/build.sbt b/examples/joinExamples/build.sbt
diff --git a/examples/joinExamples/project/project/build.scala b/examples/joinExamples/project/project/build.scala
diff --git a/examples/joinExamples/src/main/scala/JoinExamples.scala b/examples/joinExamples/src/main/scala/JoinExamples.scala
diff --git a/examples/numberPartition/build.sbt b/examples/numberPartition/build.sbt
diff --git a/examples/numberPartition/project/project/build.scala b/examples/numberPartition/project/project/build.scala
diff --git a/examples/numberPartition/src/main/scala/NumberPartitioner.scala b/examples/numberPartition/src/main/scala/NumberPartitioner.scala
diff --git a/examples/pageRank/build.sbt b/examples/pageRank/build.sbt
@@ -1,7 +1,11 @@
 name := "PageRank"
 
-version := "0.1"
+version := "1.0"
 
 scalaVersion := "2.9.2"
 
+scalacOptions ++= Seq("-Ydependent-method-types", "-deprecation")
+
 libraryDependencies += "com.nicta" %% "scoobi" % "0.4.0-SNAPSHOT" % "provided"
+
+resolvers += "snapshots" at "http://oss.sonatype.org/content/repositories/snapshots"