Migrated to Scala 2.10

Author: vaclavvondruska

.gitignore

@@ -48,3 +48,5 @@ project/plugins/project/
 
 
 
+
+.DS_Store

build.sbt

@@ -2,7 +2,7 @@ name := "SCALA-DNS"
 
 version := "1.0"
 
-scalaVersion := "2.9.2"
+scalaVersion := "2.10.0"
 
 resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
 
@@ -16,14 +16,14 @@ libraryDependencies += "com.typesafe.akka" % "akka-actor" % "2.0.3"
 
 libraryDependencies += "com.typesafe.akka" % "akka-remote" % "2.0.3"
 
-libraryDependencies += "org.scalatest" %% "scalatest" % "1.8" % "test"
+libraryDependencies += "org.scalatest" %% "scalatest" % "1.9" % "test"
 
 libraryDependencies += "org.skife.com.typesafe.config" % "typesafe-config" % "0.3.0"
 
 libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.0.3"
 
-libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala" % "2.1.2"
+libraryDependencies += "com.fasterxml.jackson.module" % "jackson-module-scala_2.10" % "2.1.3"
 
-libraryDependencies += "com.fasterxml.jackson.core" % "jackson-core" % "2.1.2"
+libraryDependencies += "com.fasterxml.jackson.core" % "jackson-core" % "2.1.3"
 
 // libraryDependencies += "org.apache.servicemix.bundles" % "org.apache.servicemix.bundles.aws-java-sdk" % "1.3.27"

src/main/scala/payload/Name.scala

@@ -103,7 +103,7 @@ object Name {
 
     val newName = if(existingName.isEmpty) name else name.take(name.indexOfSlice(existingName))
 
-    val trailer = if(existingName.isEmpty) Array() else RRData.shortToBytes((names(nameToString(existingName)) + (MASK_POINTER << 8)).toShort)
+    val trailer = if(existingName.isEmpty) Array[Byte]() else RRData.shortToBytes((names(nameToString(existingName)) + (MASK_POINTER << 8)).toShort)
     (bytes ++ toByteArray(newName) ++ trailer, if(newName.isEmpty) names else names ++ storeNewName(newName))
   }
 

src/main/scala/records/A.scala

@@ -26,7 +26,7 @@ case class A(record: Long) extends AbstractRecord {
   lazy val address = RRData.intToBytes(record.toInt).map(b => if (b < 0) b + 256 else b).reverse.mkString(".")
 
   def toByteArray = RRData.intToBytes(record.toInt)
-  def addressToByteArray = Array()
+  def addressToByteArray = Array[Byte]()
 
   def isEqualTo(any: Any) = any match {
     case r: A => r.record == record

src/main/scala/server/http/HttpHandler.scala

@@ -66,6 +66,7 @@ object HttpHandler extends SimpleChannelUpstreamHandler {
   val indexFiles = "index.html" :: "index.htm" :: Nil
   mimeTypesMap.addMimeTypes("application/x-javascript js JS")
   mimeTypesMap.addMimeTypes("text/css css CSS")
+  mimeTypesMap.addMimeTypes("text/html html htm HTML HTM")
 
   def sanitizeURI(uri: String) = {
     val decUri = try {