From 20890dc2612d5ef25831a526b3136bcfdf3c6bed Mon Sep 17 00:00:00 2001 From: Paul Trudel Date: Fri, 1 Sep 2023 20:03:39 +0000 Subject: [PATCH] Fixed some imports --- .../org/bigbluebutton/core2/voiceconf/VoiceConfActor.scala | 2 +- .../org/bigbluebutton/common2/bus/OldMessageEventBus.scala | 1 - .../main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala | 2 +- .../scala/org/bigbluebutton/api2/meeting/MeetingActor.scala | 4 ++-- .../org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/voiceconf/VoiceConfActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/voiceconf/VoiceConfActor.scala index a7349f270e..a1c9272bd3 100755 --- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/voiceconf/VoiceConfActor.scala +++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/voiceconf/VoiceConfActor.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.core2.voiceconf -import akka.actor.{ Actor, ActorLogging, FSM } +import org.apache.pekko.actor.{ Actor, ActorLogging, FSM } import org.bigbluebutton.SystemConfiguration sealed trait VoiceConfState diff --git a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala index c115ea555a..48ddab47a5 100755 --- a/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala +++ b/bbb-common-message/src/main/scala/org/bigbluebutton/common2/bus/OldMessageEventBus.scala @@ -2,7 +2,6 @@ package org.bigbluebutton.common2.bus import org.apache.pekko.actor.ActorRef import org.apache.pekko.event.{ EventBus, LookupClassification } -import akka.actor.actorRef2Scala case class OldReceivedJsonMessage(pattern: String, channel: String, msg: String) case class OldIncomingJsonMessage(val topic: String, val payload: OldReceivedJsonMessage) diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala index 4a21fecf1d..b55d19ccf3 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala @@ -27,7 +27,7 @@ class BbbWebApiGWApp( implicit val system = ActorSystem("bbb-web-common") - implicit val timeout = akka.util.Timeout(3 seconds) + implicit val timeout = org.apache.pekko.util.Timeout(3 seconds) val log = Logging(system, getClass) diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingActor.scala index 4ef6ce9f67..1352d0fd07 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingActor.scala @@ -1,7 +1,7 @@ package org.bigbluebutton.api2.meeting -import akka.actor.Actor -import akka.actor.ActorLogging +import org.apache.pekko.actor.Actor +import org.apache.pekko.actor.ActorLogging object MeetingActor { diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala index 6dda8d4be0..6f65be6f32 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/MeetingsManagerActor.scala @@ -1,6 +1,6 @@ package org.bigbluebutton.api2.meeting -import akka.actor.{ Actor, ActorLogging, Props } +import org.apache.pekko.actor.{ Actor, ActorLogging, Props } import org.bigbluebutton.api.domain.UserSession import org.bigbluebutton.api2.bus.MsgToAkkaAppsEventBus import org.bigbluebutton.common2.domain.DefaultProps