~ merge
authorAlexandre Bertails <bertails@gmail.com>
Sun, 13 Nov 2011 22:46:39 -0500
changeset 118 df96d8590cd2
parent 116 bb4db35de6a7 (current diff)
parent 110 0e18d31cd4c1 (diff)
child 124 499a60bd845c
child 125 8080e0e2d0d3
child 212 849b8765f499
~ merge
.hgignore
project/build.scala
src/main/scala/Filesystem.scala
src/main/scala/Resource.scala
src/main/scala/plan.scala
--- a/project/build.scala	Sun Nov 13 21:55:08 2011 -0500
+++ b/project/build.scala	Sun Nov 13 22:46:39 2011 -0500
@@ -22,8 +22,7 @@
   val jena = "com.hp.hpl.jena" % "jena" % "2.6.4"
   val arq = "com.hp.hpl.jena" % "arq" % "2.8.8"
   val grizzled = "org.clapper" %% "grizzled-scala" % "1.0.8" % "test"
-  val scalaz = "org.scalaz" %% "scalaz-core" % "6.0.2"
-
+  val scalaz = "org.scalaz" %% "scalaz-core" % "6.0.3"
   val argot =  "org.clapper" %% "argot" % "0.3.5"
   val guava =  "com.google.guava" % "guava" % "10.0.1"
 //  val restlet = "org.restlet.dev" % "org.restlet" % "2.1-SNAPSHOT"
--- a/project/plugins/build.sbt	Sun Nov 13 21:55:08 2011 -0500
+++ b/project/plugins/build.sbt	Sun Nov 13 22:46:39 2011 -0500
@@ -8,3 +8,6 @@
 
 addSbtPlugin("com.github.siasia" % "xsbt-proguard-plugin" % "0.1")
 
+resolvers += "sbt-idea-repo" at "http://mpeltonen.github.com/maven/"
+
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "0.11.0")
\ No newline at end of file
--- a/src/main/scala/Filesystem.scala	Sun Nov 13 21:55:08 2011 -0500
+++ b/src/main/scala/Filesystem.scala	Sun Nov 13 22:46:39 2011 -0500
@@ -1,16 +1,16 @@
 package org.w3.readwriteweb
 
-import org.w3.readwriteweb.util._
-
 import java.io._
 import java.net.URL
 import org.slf4j.{Logger, LoggerFactory}
-import com.hp.hpl.jena.rdf.model.{Resource=>JResource,_}
+import com.hp.hpl.jena.rdf.model.{Resource => _, _}
 import com.hp.hpl.jena.shared.JenaException
 
-import scalaz.{Resource => SzResource, sys => _,  _}
+import scalaz.{Resource => _, _}
 import Scalaz._
 
+import scala.sys
+
 class Filesystem(
   baseDirectory: File,
   val basePath: String,
--- a/src/main/scala/Resource.scala	Sun Nov 13 21:55:08 2011 -0500
+++ b/src/main/scala/Resource.scala	Sun Nov 13 22:46:39 2011 -0500
@@ -4,7 +4,7 @@
 
 import java.net.URL
 import com.hp.hpl.jena.rdf.model._
-import scalaz._
+import scalaz.{Resource => _, _}
 import Scalaz._
 
 trait ResourceManager {
--- a/src/main/scala/plan.scala	Sun Nov 13 21:55:08 2011 -0500
+++ b/src/main/scala/plan.scala	Sun Nov 13 22:46:39 2011 -0500
@@ -8,7 +8,6 @@
 
 import org.slf4j.{Logger, LoggerFactory}
 
-import com.hp.hpl.jena.rdf.model.Model
 import com.hp.hpl.jena.query.{Query, QueryExecution, QueryExecutionFactory}
 import com.hp.hpl.jena.update.UpdateAction
 import Query.{QueryTypeSelect => SELECT,
@@ -21,6 +20,8 @@
 import unfiltered.Cycle
 import unfiltered.response._
 
+import com.hp.hpl.jena.rdf.model.Model
+
 //object ReadWriteWeb {
 //
 //  val defaultHandler: PartialFunction[Throwable, HttpResponse[_]] = {
@@ -170,4 +171,4 @@
     
   
 
-}
\ No newline at end of file
+}