Merged scala 2.10 upgrade

Author: devans

admin-shell/src/main/scala/org/totalgrid/reef/shell/admin/AdminCommands.scala

@@ -100,7 +100,7 @@ class ResetDatabaseCommand extends ReefCommandSupport {
         }
       }
     } catch {
-      case ex => println("Reset failed: " + ex.toString)
+      case ex: Throwable => println("Reset failed: " + ex.toString)
     }
 
     mstore.disconnect()

application-framework/src/main/scala/org/totalgrid/reef/app/ConnectionCloseManagerEx.scala

@@ -18,7 +18,7 @@
  */
 package org.totalgrid.reef.app
 
-import com.weiglewilczek.slf4s.Logging
+import com.typesafe.scalalogging.slf4j.Logging
 import net.agileautomata.executor4s._
 import org.totalgrid.reef.broker.{ BrokerConnectionFactory }
 import org.totalgrid.reef.client.settings.AmqpSettings

application-framework/src/main/scala/org/totalgrid/reef/app/KeyedMap.scala

@@ -18,7 +18,7 @@
  */
 package org.totalgrid.reef.app
 
-import com.weiglewilczek.slf4s.Logging
+import com.typesafe.scalalogging.slf4j.Logging
 
 /**
  * simple interface that KeyedMap implements to hide implementation details from consumers

application-framework/src/main/scala/org/totalgrid/reef/app/ServiceContext.scala

@@ -22,7 +22,7 @@ import net.agileautomata.executor4s.Cancelable
 
 import org.totalgrid.reef.client.proto.Envelope.SubscriptionEventType
 
-import com.weiglewilczek.slf4s.Logging
+import com.typesafe.scalalogging.slf4j.Logging
 import org.totalgrid.reef.client.{ SubscriptionResult, SubscriptionEvent, SubscriptionEventAcceptor }
 
 object ServiceContext {

application-framework/src/main/scala/org/totalgrid/reef/app/impl/LoginProcessTree.scala

@@ -24,7 +24,7 @@ import org.totalgrid.reef.app.process._
 import org.totalgrid.reef.client.service.proto.Application.ApplicationConfig
 import org.totalgrid.reef.app.ConnectedApplication
 import net.agileautomata.executor4s._
-import com.weiglewilczek.slf4s.Logging
+import com.typesafe.scalalogging.slf4j.Logging
 
 /**
  * Handles the multi stage application login process.

application-framework/src/main/scala/org/totalgrid/reef/app/impl/SimpleConnectedApplicationManager.scala

@@ -19,7 +19,7 @@
 package org.totalgrid.reef.app.impl
 
 import org.totalgrid.reef.client.settings.{ NodeSettings, UserSettings }
-import com.weiglewilczek.slf4s.Logging
+import com.typesafe.scalalogging.slf4j.Logging
 import org.totalgrid.reef.client.Connection
 import org.totalgrid.reef.app.{ ConnectedApplication, ConnectionConsumer, ConnectedApplicationManager, ConnectionProvider }
 import net.agileautomata.executor4s.{ Cancelable, Executor }

application-framework/src/main/scala/org/totalgrid/reef/app/process/TaskState.scala

@@ -18,7 +18,7 @@
  */
 package org.totalgrid.reef.app.process
 
-import com.weiglewilczek.slf4s.Logging
+import com.typesafe.scalalogging.slf4j.Logging
 
 import net.agileautomata.executor4s._
 import scala.collection.immutable.Queue

application-framework/src/main/scala/org/totalgrid/reef/procstatus/ProcessHeartbeatActor.scala

@@ -21,7 +21,7 @@ package org.totalgrid.reef.procstatus
 import org.totalgrid.reef.client.service.proto.ProcessStatus.StatusSnapshot
 
 import org.totalgrid.reef.client.service.proto.Application.HeartbeatConfig
-import com.weiglewilczek.slf4s.Logging
+import com.typesafe.scalalogging.slf4j.Logging
 
 import org.totalgrid.reef.client.sapi.rpc.ApplicationService
 import org.totalgrid.reef.client.exception.ReefServiceException

application-whiteboard/src/main/scala/org/totalgrid/reef/app/whiteboard/AppWhiteboardActivator.scala

@@ -20,7 +20,7 @@ package org.totalgrid.reef.app.whiteboard
 
 import org.osgi.framework.BundleContext
 import net.agileautomata.executor4s.Executor
-import com.weiglewilczek.scalamodules._
+import org.totalgrid.reef.osgi.Helpers._
 import org.totalgrid.reef.app._
 
 /**
@@ -31,13 +31,13 @@ import org.totalgrid.reef.app._
 class AppWhiteboardActivator extends ConnectedApplicationBundleActivator {
 
   def addApplication(context: BundleContext, connectionManager: ConnectionProvider, appManager: ConnectedApplicationManager, executor: Executor) {
-    context watchServices withInterface[ConnectionConsumer] andHandle {
-      case AddingService(p, _) => connectionManager.addConsumer(p)
+    context.watchServices(classOf[ConnectionConsumer]) {
+      case ServiceAdded(p, _) => connectionManager.addConsumer(p)
       case ServiceRemoved(p, _) => connectionManager.removeConsumer(p)
     }
 
-    context watchServices withInterface[ConnectedApplication] andHandle {
-      case AddingService(p, _) => appManager.addConnectedApplication(p)
+    context.watchServices(classOf[ConnectedApplication]) {
+      case ServiceAdded(p, _) => appManager.addConnectedApplication(p)
       case ServiceRemoved(p, _) => appManager.removeConnectedApplication(p)
     }
   }

application-whiteboard/src/main/scala/org/totalgrid/reef/app/whiteboard/ConnectedApplicationBundleActivator.scala

@@ -19,7 +19,7 @@
 package org.totalgrid.reef.app.whiteboard
 
 import org.totalgrid.reef.osgi.ExecutorBundleActivator
-import com.weiglewilczek.slf4s.Logging
+import com.typesafe.scalalogging.slf4j.Logging
 import org.osgi.framework.BundleContext
 import net.agileautomata.executor4s.Executor
 import org.totalgrid.reef.osgi.OsgiConfigReader