adding anti-xml back for test suite webid
authorHenry Story <henry.story@bblfish.net>
Tue, 03 Apr 2012 21:48:11 +0200
branchwebid
changeset 184 213512a4f137
parent 183 dd93cae6a6f1
child 185 b11844b0eea8
adding anti-xml back for test suite
project/build.scala
src/test/scala/auth/secure_specs.scala
--- a/project/build.scala	Tue Apr 03 11:27:56 2012 +0200
+++ b/project/build.scala	Tue Apr 03 21:48:11 2012 +0200
@@ -22,7 +22,7 @@
         <exclude org="net.databinder" module="dispatch-mime_2.9.0-1"/>
       </dependency>
     </dependencies>
-//  val antiXML = "com.codecommit" %% "anti-xml" % "0.4-SNAPSHOT" % "test"
+  val antiXML = "com.codecommit" %% "anti-xml" % "0.3" % "test"
   val jena = "org.apache.jena" % "jena-core" % "2.7.0-incubating"
   val arq = "org.apache.jena" % "jena-arq" % "2.9.0-incubating"
   val rdfa = "net.rootdev" % "java-rdfa" % "0.4.2-RC2"
@@ -46,7 +46,7 @@
 object Resolvers {
   val novus = "repo.novus snaps" at "http://repo.novus.com/snapshots/"
   val mavenLocal = "Local Maven Repository" at "file://" + (Path.userHome / ".m2" / "repository").absolutePath
-//  val typesafe = "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
+  val typesafeSnap = "Typesafe Repository" at "http://repo.typesafe.com/typesafe/snapshots/"
   val sonatype = "Sonatype Release" at "http://oss.sonatype.org/content/repositories/releases"
 //  val twitter = "Twitter Repository" at "http://maven.twttr.com/"
 }
@@ -105,34 +105,24 @@
 
   val projectSettings =
     Seq(
-      resolvers += mavenLocal,
-      resolvers += sonatype,
- //     resolvers += typesafe,
-      resolvers += ScalaToolsReleases,
-      resolvers += ScalaToolsSnapshots,
+      resolvers ++= Seq( mavenLocal, sonatype, typesafeSnap, ScalaToolsReleases, ScalaToolsSnapshots ) ,
       libraryDependencies += specs2,
       libraryDependencies += specs2_scalaz,
 //      libraryDependencies += unfiltered_spec,
       ivyXML := ivyUnfilteredSpec,
-      libraryDependencies += dispatch_http,
-      libraryDependencies += dispatch_nio,
-      libraryDependencies += unfiltered_filter,
-      libraryDependencies += unfiltered_jetty,
-      libraryDependencies += unfiltered_netty,
-
-      libraryDependencies += jena,
-      libraryDependencies += arq,
-      libraryDependencies += grizzled,
-      libraryDependencies += scalaz,
-      libraryDependencies += jsslutils,
-      libraryDependencies += argot,
-      libraryDependencies += guava,
-      libraryDependencies += scalate,
-      libraryDependencies += rdfa,
-      libraryDependencies += htmlparser,
-      libraryDependencies += slf4s,
-      libraryDependencies += async_http_client,
-      libraryDependencies += aalto_xml,
+      libraryDependencies ++= Seq(dispatch_http, dispatch_nio, unfiltered_filter,
+        unfiltered_jetty, unfiltered_netty,
+        jena, arq, rdfa,
+        grizzled,
+        scalaz,
+        jsslutils,
+        argot,
+        guava,
+        scalate,
+        htmlparser,
+        slf4s,
+        async_http_client,
+        aalto_xml, antiXML) ,
 
       jarName in assembly := "read-write-web.jar",
       mainClass in assembly := Some("org.w3.readwriteweb.netty.ReadWriteWebNetty")
--- a/src/test/scala/auth/secure_specs.scala	Tue Apr 03 11:27:56 2012 +0200
+++ b/src/test/scala/auth/secure_specs.scala	Tue Apr 03 21:48:11 2012 +0200
@@ -81,7 +81,7 @@
 
     val  sslContext = javax.net.ssl.SSLContext.getInstance("TLS");
   
-    sslContext.init(Array(km.asInstanceOf[KeyManager]), Array(AcceptAllTrustManager),null); // we are not trying to test our trust of localhost server
+    sslContext.init(Array[KeyManager](km), Array(AcceptAllTrustManager),null); // we are not trying to test our trust of localhost server
 
     import org.apache.http.conn.ssl._
     val sf = new SSLSocketFactory(sslContext, SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER)