Manifests

happyfella1 · Oct 25, 2012 · 022790a · 022790a
1 parent 3ff0ef5
commit 022790a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 32 deletions.
diff --git a/sbt/src/main/META-INF/aop.xml b/sbt/src/main/META-INF/aop.xml
diff --git a/sbt/src/main/META-INF/spring/module-context.xml b/sbt/src/main/META-INF/spring/module-context.xml
diff --git a/sbt/src/main/resources/META-INF/MANIFEST.MF b/sbt/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Implementation-Title: Akka Paterns
+Implementation-Version: 1.0
+Implementation-Build: 100
diff --git a/sbt/src/main/scala/org/cakesolutions/akkapatterns/api/home.scala b/sbt/src/main/scala/org/cakesolutions/akkapatterns/api/home.scala
@@ -6,8 +6,10 @@ import akka.pattern.ask
 import spray.httpx.marshalling.MetaMarshallers
 import spray.routing.Directives
 import org.cakesolutions.akkapatterns.core.application.{ PoisonPill, GetImplementation, Implementation }
+import java.util.Date
+import scala.concurrent.ExecutionContext.Implicits._
 
-case class SystemInfo(implementation: Implementation, host: String)
+case class SystemInfo(implementation: Implementation, host: String, timestamp: Long)
 
 class HomeService(implicit val actorSystem: ActorSystem) extends Directives with Marshalling with MetaMarshallers with DefaultTimeout {
 
@@ -17,9 +19,8 @@ class HomeService(implicit val actorSystem: ActorSystem) extends Directives with
     path(Slash) {
       get {
         complete {
-          import scala.concurrent.ExecutionContext.Implicits._
           (applicationActor ? GetImplementation()).mapTo[Implementation].map {
-            SystemInfo(_, InetAddress.getLocalHost.getCanonicalHostName)
+            SystemInfo(_, InetAddress.getLocalHost.getCanonicalHostName, new Date().getTime)
           }
         }
       }

diff --git a/sbt/src/main/scala/org/cakesolutions/akkapatterns/api/marshalling.scala b/sbt/src/main/scala/org/cakesolutions/akkapatterns/api/marshalling.scala
@@ -30,5 +30,5 @@ trait Marshalling extends DefaultJsonProtocol with UuidMarshalling with SprayJso
   implicit val RegisteredCustomerFormat = jsonFormat2(RegisteredCustomer)
 
   implicit val ImplementationFormat = jsonFormat3(Implementation)
-  implicit val SystemInfoFormat = jsonFormat2(SystemInfo)
+  implicit val SystemInfoFormat = jsonFormat3(SystemInfo)
 }
diff --git a/sbt/src/main/scala/org/cakesolutions/akkapatterns/core/application/application.scala b/sbt/src/main/scala/org/cakesolutions/akkapatterns/core/application/application.scala
@@ -15,9 +15,9 @@ class ApplicationActor extends Actor {
     case GetImplementation() =>
       val manifestStream = getClass.getResourceAsStream("/META-INF/MANIFEST.MF")
       val manifest = new java.util.jar.Manifest(manifestStream)
-      val title = manifest.getMainAttributes.getValue("Implementation-Title")
-      val version = manifest.getMainAttributes.getValue("Implementation-Version")
-      val build = manifest.getMainAttributes.getValue("Implementation-Build")
+      val title = "Akka-Patterns" // manifest.getMainAttributes.getValue("Implementation-Title")
+      val version = "1.0" // manifest.getMainAttributes.getValue("Implementation-Version")
+      val build = "1.0" //manifest.getMainAttributes.getValue("Implementation-Build")
       manifestStream.close()
 
       sender ! Implementation(title, version, build)