Moved FileUtil back into scalatron.scalatron.impl

Author: scalatron

Scalatron/src/scalatron/core/Scalatron.scala

@@ -6,7 +6,7 @@ package scalatron.core
 
 import scalatron.core.Scalatron.{Sample, User, SourceFileCollection}
 import java.io.{FileWriter, File}
-import scalatron.util.FileUtil
+import scalatron.scalatron.impl.FileUtil
 import FileUtil.use
 
 

Scalatron/src/scalatron/scalatron/api/ScalatronOutwardDemo.scala

@@ -6,7 +6,8 @@ package scalatron.scalatron.api
 import scalatron.core.Scalatron.Constants._
 import java.io.{IOException, File}
 import akka.actor.ActorSystem
-import scalatron.util.FileUtil
+import scalatron.scalatron.impl.FileUtil
+import scalatron.scalatron.impl.FileUtil
 import scalatron.core.Scalatron
 
 

Scalatron/src/scalatron/scalatron/impl/ConfigFile.scala

@@ -2,7 +2,6 @@ package scalatron.scalatron.impl
 
 import java.io.{File, FileWriter}
 import scala.io.Source
-import scalatron.util.FileUtil
 import FileUtil.use
 
 

Scalatron/src/scalatron/util/FileUtil.scala renamed to Scalatron/src/scalatron/scalatron/impl/FileUtil.scala

@@ -1,4 +1,4 @@
-package scalatron.util
+package scalatron.scalatron.impl
 
 import scala.io.Source
 import java.io.{FileInputStream, FileOutputStream, File}

Scalatron/src/scalatron/scalatron/impl/ScalatronSample.scala

@@ -1,6 +1,5 @@
 package scalatron.scalatron.impl
 
-import scalatron.util.FileUtil
 import FileUtil.deleteRecursively
 import scalatron.core.Scalatron
 import Scalatron.SourceFile

Scalatron/src/scalatron/scalatron/impl/ScalatronUser.scala

@@ -14,7 +14,7 @@ import akka.util.Timeout
 import akka.dispatch.Await
 
 
-import scalatron.util.FileUtil._
+import scalatron.scalatron.impl.FileUtil._
 import ConfigFile.loadConfigFile
 import ConfigFile.updateConfigFileMulti
 import ScalatronUser.buildSourceFilesIntoJar

Scalatron/src/scalatron/webServer/servelets/BaseServlet.scala

@@ -4,7 +4,8 @@ import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
 import io.Source
 import java.net.URL
 import java.io.{InputStream, BufferedOutputStream, BufferedInputStream}
-import scalatron.util.FileUtil
+import scalatron.scalatron.impl.FileUtil
+import scalatron.scalatron.impl.FileUtil
 
 
 trait BaseServlet extends HttpServlet {

Scalatron/test/scalatron/scalatron/api/ScalatronApiSpec.scala

@@ -7,7 +7,8 @@ import scalatron.core.Scalatron.Constants._
 import scalatron.core.Scalatron
 import ScalatronApiTest._
 import org.specs2.execute.Result
-import scalatron.util.FileUtil
+import scalatron.scalatron.impl.FileUtil
+import scalatron.scalatron.impl.FileUtil
 
 class ScalatronApiSpec extends mutable.Specification
 {