Prepare for release 0.2

slicebox · May 5, 2015 · 76c5698 · 76c5698
2 parents 4970ba0 + 09be57c
commit 76c5698
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,12 @@
 ![](./docs/logo_white_framed.png "Slicebox") Slicebox
 =====================================================
 
-[![Build Status](https://travis-ci.org/KarlSjostrand/slicebox.svg?branch=develop)](https://travis-ci.org/KarlSjostrand/slicebox.svg?branch=develop) [![Join the chat at https://gitter.im/KarlSjostrand/slicebox](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/KarlSjostrand/slicebox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+Service | Status | Description
+------- | ------ | -----------
+Travis  | [![Build Status](https://travis-ci.org/KarlSjostrand/slicebox.svg?branch=master)](https://travis-ci.org/KarlSjostrand/slicebox.svg?branch=develop) | Tests
+Bintray | [ ![Download](https://api.bintray.com/packages/karlsjostrand/slicebox/universal/images/download.svg) ](https://bintray.com/karlsjostrand/slicebox/universal/_latestVersion) | Latest Version on Bintray
+Gitter | [![Join the chat at https://gitter.im/KarlSjostrand/slicebox](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/KarlSjostrand/slicebox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | Chatroom
+
 
 Slicebox is a microservice for safe sharing and easy access to medical images. The goal of the project is to facilitate research and collaboration between hospitals and universities. The service makes it easy to send images from the hosptial's PACS (image archive) to collaborators on the outside. Anonymization is handled automatically, releaving the hospital staff of the burden of making sure patient information does not leave the hospital network.
 
@@ -21,9 +26,9 @@ Images can now be exported from PACS to the local slicebox instance easily. Expo
 Installation
 ------------
 
-* Download a zipped distribution of slicebox from the [dist/](./dist) folder.
+* Download a zipped distribution of slicebox from [Bintray](https://bintray.com/karlsjostrand/slicebox/universal/_latestVersion).
 * Unzip onto a suitable server computer. Any computer which is always on and which has a fixed (local or public) IP address will do.
-* Configure the service by editing the [conf/slicebox.conf](./src/main/resources/slicebox.conf) and [conf/http.conf](./src/main/resources/http.conf). The former contains the administrator username and password while the latter specifies hostname and port of the service.
+* Configure the service by editing [conf/slicebox.conf](./src/main/resources/application.conf). In particular, the administrator (superuser) username and password can be configured as well as the hostname and port of the service.
 * The `bin` folder contains start scripts for Windows and Linux/Unix/Mac OS. Make sure the service is started on server startup. 
 
 Integration with Applications

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import de.heikoseeberger.sbtheader.license.Apache2_0
 
 	name := "slicebox"
 
-	version := "0.1"
+	version := "0.2"
 
 	organization := "se.nimsa"
 
@@ -19,14 +19,12 @@ import de.heikoseeberger.sbtheader.license.Apache2_0
 	packageDescription in Universal := "Slicebox is a service for sharing medical image data with collaborators while protecting patient information"
 
 	mappings in Universal <+= (packageBin in Compile, sourceDirectory ) map { (_, src) =>
-		val sliceboxConf = src / "main" / "resources" / "slicebox.conf"
-		sliceboxConf -> "conf/slicebox.conf"
+		val httpConf = src / "main" / "resources" / "application.conf"
+		httpConf -> "conf/slicebox.conf"
 	}
 
-	mappings in Universal <+= (packageBin in Compile, sourceDirectory ) map { (_, src) =>
-		val httpConf = src / "main" / "resources" / "http.conf"
-		httpConf -> "conf/http.conf"
-	}
+	bashScriptExtraDefines += """addJava "-Dconfig.file=${app_home}/../conf/slicebox.conf" """
+	batScriptExtraDefines += """set _JAVA_OPTS=%_JAVA_OPTS% -Dconfig.file=%SLICEBOX_HOME%\\conf\\slicebox.conf"""
 
 	val licenceYear = "2015"
 	val licencedTo = "Karl Sjöstrand"
@@ -76,8 +74,6 @@ import de.heikoseeberger.sbtheader.license.Apache2_0
 
 	lazy val slicebox = (project in file(".")).enablePlugins(SbtWeb, JavaServerAppPackaging, GitBranchPrompt)
 
-	GitPlugin.autoImport.git.baseVersion := "1.0.0"
-
 	updateOptions := updateOptions.value.withCachedResolution(true)
 
 	WebKeys.packagePrefix in Assets := "public/"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -10,7 +10,7 @@ addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "3.0.0")
 
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.0-RC1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.0")
 
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "1.5.0")
 

diff --git a/src/main/public/images/Thumbs.db b/src/main/public/images/Thumbs.db
diff --git a/src/main/public/images/favicons/Thumbs.db b/src/main/public/images/favicons/Thumbs.db
diff --git a/src/main/resources/.gitignore b/src/main/resources/.gitignore
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -12,45 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 akka {
 	loglevel = DEBUG
 	stdout-loglevel = INFO
@@ -103,24 +64,19 @@ spray {
 }
 
 http {
-
 	host = "localhost"
 	port = 5000
 
-	include "http.conf"
-
 	host = ${?HOST}
 	port = ${?PORT}
 }
 
 slicebox {
-
 	storage = "storage"
 
 	superuser {
 		user = "admin"
 		password = "admin"
 	}
 
-	include "slicebox.conf"
 }
diff --git a/src/main/resources/http.conf b/src/main/resources/http.conf
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -16,7 +16,7 @@
 	<logger name="org.dcm4che3" level="ERROR" />
     <logger name="se.nimsa.sbx" level="WARN" />
 
-    <root level="WARN">
+    <root level="INFO">
         <appender-ref ref="CONSOLE"/>
     </root>
 </configuration>
diff --git a/src/main/resources/slicebox.conf b/src/main/resources/slicebox.conf
diff --git a/src/main/scala/se/nimsa/sbx/app/UserServiceActor.scala b/src/main/scala/se/nimsa/sbx/app/UserServiceActor.scala
@@ -110,11 +110,11 @@ class UserServiceActor(dbProps: DbProps, superUser: String, superPassword: Strin
 
   def addSuperUser() =
     db.withSession { implicit session =>
-      dao.userByName(superUser)
-        .getOrElse {
-          dao.listUsers.filter(_.role == UserRole.SUPERUSER).foreach(superUser => dao.removeUser(superUser.id))
-          dao.insert(ApiUser(-1, superUser, UserRole.SUPERUSER).withPassword(superPassword))
-        }
+      val superUsers = dao.listUsers.filter(_.role == UserRole.SUPERUSER)
+      if (superUsers.isEmpty || superUsers(0).user != superUser || !superUsers(0).passwordMatches(superPassword)) {
+        superUsers.foreach(superUser => dao.removeUser(superUser.id))
+        dao.insert(ApiUser(-1, superUser, UserRole.SUPERUSER).withPassword(superPassword))
+      }
     }
 
   def generateNewTokens(user: ApiUser, numberOfTokens: Int): List[AuthToken] = {

diff --git a/src/main/scala/se/nimsa/sbx/box/BoxServiceActor.scala b/src/main/scala/se/nimsa/sbx/box/BoxServiceActor.scala
@@ -322,8 +322,10 @@ class BoxServiceActor(dbProps: DbProps, storage: Path, apiBaseURL: String) exten
       boxDao.updateInbox(remoteBoxId, transactionId, sequenceNumber, totalImageCount)
     }
 
-    if (sequenceNumber == totalImageCount)
-      SbxLog.info("Box", s"Receiving ${totalImageCount} images from box ${boxById(remoteBoxId)} completed.")
+    if (sequenceNumber == totalImageCount) {
+      val boxName = boxById(remoteBoxId).map(_.name).getOrElse(remoteBoxId.toString)
+      SbxLog.info("Box", s"Receiving ${totalImageCount} images from box $boxName completed.")
+    }
   }
 
   def updatePollBoxesOnlineStatus(): Unit = {