Home Explore Help
Sign In
compsci-industry
/
TechEmpower.FrameworkBenchmarks
mirror of https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #2087 from mfirry/round-14

Spray Fixes
Nate 9 years ago
parent
097398acb0 f1127fb06f
commit
59a1fcb862
6 changed files with 26 additions and 36 deletions
Unified View Show Diff Stats
  1. 7 15
      frameworks/Scala/spray/build.sbt
  2. 1 1
      frameworks/Scala/spray/project/build.properties
  3. 1 3
      frameworks/Scala/spray/project/plugins.sbt
  4. 1 1
      frameworks/Scala/spray/setup.sh
  5. 1 1
      frameworks/Scala/spray/src/main/resources/logback.xml
  6. 15 15
      frameworks/Scala/spray/src/main/scala/spray/examples/BenchmarkService.scala

+ 7 - 15
frameworks/Scala/spray/build.sbt
View File 

@@ -1,27 +1,19 @@
 
-import spray.revolver.RevolverPlugin
 
-
 
 name := "spray-benchmark"
 
 name := "spray-benchmark"
 
 
 
 organization := "io.spray"
 
 organization := "io.spray"
 
 
 
-scalaVersion := "2.11.7"
 
+scalaVersion := "2.11.8"
 
 
 
 version := "1.0"
 
 version := "1.0"
 
 
 
 resolvers ++= Seq(
 
 resolvers ++= Seq(
 
-  "spray repo" at "http://repo.spray.io/",
 
-  "spray nightly repo" at "http://nightlies.spray.io/"
 
+  "spray repo" at "http://repo.spray.io/"
 
 )
 
 )
 
 
 
 libraryDependencies ++= Seq(
 
 libraryDependencies ++= Seq(
 
-  "io.spray" %% "spray-json" % "1.3.2",
 
-  "io.spray" % "spray-can" % "1.1-20130619",
 
-  "com.typesafe.akka" %%  "akka-actor" % "2.4.1",
 
-  "com.typesafe.akka" %%  "akka-slf4j" % "2.4.1",
 
-  "ch.qos.logback"% "logback-classic" % "1.0.12" % "runtime",
 
-  "org.scala-lang" % "scala-xml" % "2.11.0-M4"
 
+  "io.spray" %% "spray-json" % "1.3.1",
 
+  "io.spray" %% "spray-can" % "1.3.1",
 
+  "com.typesafe.akka" %%  "akka-actor" % "2.4.7",
 
+  "com.typesafe.akka" %%  "akka-slf4j" % "2.4.7",
 
+  "ch.qos.logback"% "logback-classic" % "1.0.12" % "runtime"
 
 )
 
 )
 
-
 
-RevolverPlugin.settings
 
-
 
-sbtassembly.AssemblyPlugin.assemblySettings

+ 1 - 1
frameworks/Scala/spray/project/build.properties
View File 

@@ -1 +1 @@
 
-sbt.version=0.13.9
 
+sbt.version=0.13.11

+ 1 - 3
frameworks/Scala/spray/project/plugins.sbt
View File 

@@ -1,5 +1,3 @@
 
-resolvers += "spray repo" at "http://repo.spray.io"
 
-
 
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
 
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
 
 
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1")
 
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")

+ 1 - 1
frameworks/Scala/spray/setup.sh
View File 

@@ -4,4 +4,4 @@ fw_depends java scala sbt
 
 
 
 sbt assembly -batch
 
 sbt assembly -batch
 
 
 
-java -jar target/scala-2.10/spray-benchmark-assembly-1.0.jar &
 
+java -jar target/scala-2.11/spray-benchmark-assembly-1.0.jar &

+ 1 - 1
frameworks/Scala/spray/src/main/resources/logback.xml
View File 

@@ -12,4 +12,4 @@
 
         <appender-ref ref="CONSOLE"/>
 
         <appender-ref ref="CONSOLE"/>
 
     </root>
 
     </root>
 
 
 
-</configuration>
 
+</configuration>

+ 15 - 15
frameworks/Scala/spray/src/main/scala/spray/examples/BenchmarkService.scala
View File 

@@ -35,21 +35,21 @@ class BenchmarkService extends Actor {
 
     // when a new connection comes in we register ourselves as the connection handler
 
     // when a new connection comes in we register ourselves as the connection handler
 
     case _: Http.Connected => sender ! Http.Register(self, fastPath = fastPath)
 
     case _: Http.Connected => sender ! Http.Register(self, fastPath = fastPath)
 
 
 
-    case HttpRequest(GET, Path("/"), _, _, _) => sender ! HttpResponse(
 
-      entity = HttpEntity(MediaTypes.`text/html`,
 
-        <html>
 
-          <body>
 
-            <h1>Tiny <i>spray-can</i> benchmark server</h1>
 
-            <p>Defined resources:</p>
 
-            <ul>
 
-              <li><a href="/json">/json</a></li>
 
-              <li><a href="/plaintext">/plaintext</a></li>
 
-              <li><a href="/stop">/stop</a></li>
 
-            </ul>
 
-          </body>
 
-        </html>.toString()
 
-      )
 
-    )
 
+    // case HttpRequest(GET, Path("/"), _, _, _) => sender ! HttpResponse(
 
+    //   entity = HttpEntity(MediaTypes.`text/html`,
 
+    //     <html>
 
+    //       <body>
 
+    //         <h1>Tiny <i>spray-can</i> benchmark server</h1>
 
+    //         <p>Defined resources:</p>
 
+    //         <ul>
 
+    //           <li><a href="/json">/json</a></li>
 
+    //           <li><a href="/plaintext">/plaintext</a></li>
 
+    //           <li><a href="/stop">/stop</a></li>
 
+    //         </ul>
 
+    //       </body>
 
+    //     </html>.toString()
 
+    //   )
 
+    // )
 
 
 
     case _: HttpRequest => sender ! unknownResource
 
     case _: HttpRequest => sender ! unknownResource
 
   }
 
   }