diff --git a/bbb-apps-common/build.sbt b/bbb-apps-common/build.sbt new file mode 100755 index 000000000000..f0d12e601c7d --- /dev/null +++ b/bbb-apps-common/build.sbt @@ -0,0 +1,118 @@ +name := "bbb-apps-common" + +organization := "org.bigbluebutton" + +version := "0.0.1-SNAPSHOT" + +scalaVersion := "2.12.2" + +scalacOptions ++= Seq( + "-unchecked", + "-deprecation", + "-Xlint", + "-Ywarn-dead-code", + "-language:_", + "-target:jvm-1.8", + "-encoding", "UTF-8" +) + +// We want to have our jar files in lib_managed dir. +// This way we'll have the right path when we import +// into eclipse. +retrieveManaged := true + +testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "html", "console", "junitxml") + +testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-h", "target/scalatest-reports") + +val scalaV = "2.12.2" + +libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaV +libraryDependencies += "org.scala-lang" % "scala-library" % scalaV +libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaV + +libraryDependencies += "org.bigbluebutton" % "bbb-common-message_2.12" % "0.0.19-SNAPSHOT" + +libraryDependencies += "redis.clients" % "jedis" % "2.7.2" +libraryDependencies += "com.google.code.gson" % "gson" % "2.5" + +// https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 +libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.5" +libraryDependencies += "commons-io" % "commons-io" % "2.4" + +libraryDependencies += "org.apache.commons" % "commons-pool2" % "2.3" +libraryDependencies += "commons-io" % "commons-io" % "2.4" + +libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.5" + +libraryDependencies += "org.pegdown" % "pegdown" % "1.4.0" % "test" +libraryDependencies += "junit" % "junit" % "4.12" % "test" +libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" +// https://mvnrepository.com/artifact/org.mockito/mockito-core +libraryDependencies += "org.mockito" % "mockito-core" % "2.7.12" % "test" +libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.1" % "test" +libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test" + +seq(Revolver.settings: _*) + +//----------- +// Packaging +// +// Reference: +// http://xerial.org/blog/2014/03/24/sbt/ +// http://www.scala-sbt.org/sbt-pgp/usage.html +// http://www.scala-sbt.org/0.13/docs/Using-Sonatype.html +// http://central.sonatype.org/pages/requirements.html +// http://central.sonatype.org/pages/releasing-the-deployment.html +//----------- + +// Build pure Java lib (i.e. without scala) +// Do not append Scala versions to the generated artifacts +crossPaths := false + +// This forbids including Scala related libraries into the dependency +autoScalaLibrary := false + +/*************************** +* When developing, change the version above to x.x.x-SNAPSHOT then use the file resolver to +* publish to the local maven repo using "sbt publish" +*/ +// Uncomment this to publish to local maven repo while commenting out the nexus repo +publishTo := Some(Resolver.file("file", new File(Path.userHome.absolutePath+"/.m2/repository"))) + + +// Comment this out when publishing to local maven repo using SNAPSHOT version. +// To push to sonatype "sbt publishSigned" +//publishTo := { +// val nexus = "https://oss.sonatype.org/" +// if (isSnapshot.value) +// Some("snapshots" at nexus + "content/repositories/snapshots") +// else +// Some("releases" at nexus + "service/local/staging/deploy/maven2") +//} + +// Enables publishing to maven repo +publishMavenStyle := true + +publishArtifact in Test := false + +pomIncludeRepository := { _ => false } + +pomExtra := ( + + git@github.com:bigbluebutton/bigbluebutton.git + scm:git:git@github.com:bigbluebutton/bigbluebutton.git + + + + ritzalam + Richard Alam + http://www.bigbluebutton.org + + ) + +licenses := Seq("LGPL-3.0" -> url("http://opensource.org/licenses/LGPL-3.0")) + +homepage := Some(url("http://www.bigbluebutton.org")) + + diff --git a/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.core/jackson-annotations/jackson-annotations-2.8.8.jar b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.core/jackson-annotations/jackson-annotations-2.8.8.jar new file mode 100644 index 000000000000..bd3ba9d236b2 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.core/jackson-annotations/jackson-annotations-2.8.8.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.core/jackson-core/jackson-core-2.8.8.jar b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.core/jackson-core/jackson-core-2.8.8.jar new file mode 100644 index 000000000000..2a66a6f039e4 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.core/jackson-core/jackson-core-2.8.8.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.core/jackson-databind/jackson-databind-2.8.8.jar b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.core/jackson-databind/jackson-databind-2.8.8.jar new file mode 100644 index 000000000000..91f068e502f2 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.core/jackson-databind/jackson-databind-2.8.8.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.module/jackson-module-paranamer/jackson-module-paranamer-2.8.8.jar b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.module/jackson-module-paranamer/jackson-module-paranamer-2.8.8.jar new file mode 100644 index 000000000000..e7e584447d49 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.module/jackson-module-paranamer/jackson-module-paranamer-2.8.8.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.module/jackson-module-scala_2.12/jackson-module-scala_2.12-2.8.8.jar b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.module/jackson-module-scala_2.12/jackson-module-scala_2.12-2.8.8.jar new file mode 100644 index 000000000000..9f729611bd60 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/com.fasterxml.jackson.module/jackson-module-scala_2.12/jackson-module-scala_2.12-2.8.8.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/com.thoughtworks.paranamer/paranamer/paranamer-2.8.jar b/bbb-apps-common/lib_managed/bundles/com.thoughtworks.paranamer/paranamer/paranamer-2.8.jar new file mode 100644 index 000000000000..0bf659b93e74 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/com.thoughtworks.paranamer/paranamer/paranamer-2.8.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/org.parboiled/parboiled-core/parboiled-core-1.1.5.jar b/bbb-apps-common/lib_managed/bundles/org.parboiled/parboiled-core/parboiled-core-1.1.5.jar new file mode 100644 index 000000000000..d98d54890f85 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/org.parboiled/parboiled-core/parboiled-core-1.1.5.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/org.parboiled/parboiled-java/parboiled-java-1.1.5.jar b/bbb-apps-common/lib_managed/bundles/org.parboiled/parboiled-java/parboiled-java-1.1.5.jar new file mode 100644 index 000000000000..306b3d3be2a0 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/org.parboiled/parboiled-java/parboiled-java-1.1.5.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/org.scala-lang.modules/scala-parser-combinators_2.12/scala-parser-combinators_2.12-1.0.4.jar b/bbb-apps-common/lib_managed/bundles/org.scala-lang.modules/scala-parser-combinators_2.12/scala-parser-combinators_2.12-1.0.4.jar new file mode 100644 index 000000000000..56fa393cb436 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/org.scala-lang.modules/scala-parser-combinators_2.12/scala-parser-combinators_2.12-1.0.4.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/org.scala-lang.modules/scala-xml_2.12/scala-xml_2.12-1.0.6.jar b/bbb-apps-common/lib_managed/bundles/org.scala-lang.modules/scala-xml_2.12/scala-xml_2.12-1.0.6.jar new file mode 100644 index 000000000000..fcd9fc807736 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/org.scala-lang.modules/scala-xml_2.12/scala-xml_2.12-1.0.6.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/org.scalactic/scalactic_2.12/scalactic_2.12-3.0.1.jar b/bbb-apps-common/lib_managed/bundles/org.scalactic/scalactic_2.12/scalactic_2.12-3.0.1.jar new file mode 100644 index 000000000000..0526f2474d00 Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/org.scalactic/scalactic_2.12/scalactic_2.12-3.0.1.jar differ diff --git a/bbb-apps-common/lib_managed/bundles/org.scalatest/scalatest_2.12/scalatest_2.12-3.0.1.jar b/bbb-apps-common/lib_managed/bundles/org.scalatest/scalatest_2.12/scalatest_2.12-3.0.1.jar new file mode 100644 index 000000000000..1fa54ea1d2fc Binary files /dev/null and b/bbb-apps-common/lib_managed/bundles/org.scalatest/scalatest_2.12/scalatest_2.12-3.0.1.jar differ diff --git a/bbb-apps-common/lib_managed/jars/com.google.code.gson/gson/gson-2.5.jar b/bbb-apps-common/lib_managed/jars/com.google.code.gson/gson/gson-2.5.jar new file mode 100644 index 000000000000..5c35c5d5ca82 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/com.google.code.gson/gson/gson-2.5.jar differ diff --git a/bbb-apps-common/lib_managed/jars/com.novocode/junit-interface/junit-interface-0.11.jar b/bbb-apps-common/lib_managed/jars/com.novocode/junit-interface/junit-interface-0.11.jar new file mode 100644 index 000000000000..9af6c7b37a5a Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/com.novocode/junit-interface/junit-interface-0.11.jar differ diff --git a/bbb-apps-common/lib_managed/jars/commons-io/commons-io/commons-io-2.4.jar b/bbb-apps-common/lib_managed/jars/commons-io/commons-io/commons-io-2.4.jar new file mode 100644 index 000000000000..90035a4fe068 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/commons-io/commons-io/commons-io-2.4.jar differ diff --git a/bbb-apps-common/lib_managed/jars/jline/jline/jline-2.14.3.jar b/bbb-apps-common/lib_managed/jars/jline/jline/jline-2.14.3.jar new file mode 100644 index 000000000000..c1b44e490e75 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/jline/jline/jline-2.14.3.jar differ diff --git a/bbb-apps-common/lib_managed/jars/junit/junit/junit-4.12.jar b/bbb-apps-common/lib_managed/jars/junit/junit/junit-4.12.jar new file mode 100644 index 000000000000..3a7fc266c3e3 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/junit/junit/junit-4.12.jar differ diff --git a/bbb-apps-common/lib_managed/jars/net.bytebuddy/byte-buddy-agent/byte-buddy-agent-1.6.9.jar b/bbb-apps-common/lib_managed/jars/net.bytebuddy/byte-buddy-agent/byte-buddy-agent-1.6.9.jar new file mode 100644 index 000000000000..036c7798330b Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/net.bytebuddy/byte-buddy-agent/byte-buddy-agent-1.6.9.jar differ diff --git a/bbb-apps-common/lib_managed/jars/net.bytebuddy/byte-buddy/byte-buddy-1.6.9.jar b/bbb-apps-common/lib_managed/jars/net.bytebuddy/byte-buddy/byte-buddy-1.6.9.jar new file mode 100644 index 000000000000..99062ceee742 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/net.bytebuddy/byte-buddy/byte-buddy-1.6.9.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.apache.commons/commons-lang3/commons-lang3-3.5.jar b/bbb-apps-common/lib_managed/jars/org.apache.commons/commons-lang3/commons-lang3-3.5.jar new file mode 100644 index 000000000000..6328c8de419b Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.apache.commons/commons-lang3/commons-lang3-3.5.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.apache.commons/commons-pool2/commons-pool2-2.3.jar b/bbb-apps-common/lib_managed/jars/org.apache.commons/commons-pool2/commons-pool2-2.3.jar new file mode 100644 index 000000000000..5219e1cc231c Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.apache.commons/commons-pool2/commons-pool2-2.3.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.bigbluebutton/bbb-common-message_2.12/bbb-common-message_2.12-0.0.19-SNAPSHOT.jar b/bbb-apps-common/lib_managed/jars/org.bigbluebutton/bbb-common-message_2.12/bbb-common-message_2.12-0.0.19-SNAPSHOT.jar new file mode 100644 index 000000000000..a72e4e1bb09a Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.bigbluebutton/bbb-common-message_2.12/bbb-common-message_2.12-0.0.19-SNAPSHOT.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.hamcrest/hamcrest-core/hamcrest-core-1.3.jar b/bbb-apps-common/lib_managed/jars/org.hamcrest/hamcrest-core/hamcrest-core-1.3.jar new file mode 100644 index 000000000000..9d5fe16e3dd3 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.hamcrest/hamcrest-core/hamcrest-core-1.3.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.mockito/mockito-core/mockito-core-2.7.12.jar b/bbb-apps-common/lib_managed/jars/org.mockito/mockito-core/mockito-core-2.7.12.jar new file mode 100644 index 000000000000..71ea2f442c15 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.mockito/mockito-core/mockito-core-2.7.12.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.objenesis/objenesis/objenesis-2.5.jar b/bbb-apps-common/lib_managed/jars/org.objenesis/objenesis/objenesis-2.5.jar new file mode 100644 index 000000000000..7b60a8b432b6 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.objenesis/objenesis/objenesis-2.5.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm-analysis/asm-analysis-4.1.jar b/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm-analysis/asm-analysis-4.1.jar new file mode 100644 index 000000000000..315845388907 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm-analysis/asm-analysis-4.1.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm-tree/asm-tree-4.1.jar b/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm-tree/asm-tree-4.1.jar new file mode 100644 index 000000000000..9383d994d21a Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm-tree/asm-tree-4.1.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm-util/asm-util-4.1.jar b/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm-util/asm-util-4.1.jar new file mode 100644 index 000000000000..4d0777e4818c Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm-util/asm-util-4.1.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm/asm-4.1.jar b/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm/asm-4.1.jar new file mode 100644 index 000000000000..4ede5c99af40 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.ow2.asm/asm/asm-4.1.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.pegdown/pegdown/pegdown-1.4.0.jar b/bbb-apps-common/lib_managed/jars/org.pegdown/pegdown/pegdown-1.4.0.jar new file mode 100644 index 000000000000..a133d8361a26 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.pegdown/pegdown/pegdown-1.4.0.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.scala-lang/scala-compiler/scala-compiler-2.12.2.jar b/bbb-apps-common/lib_managed/jars/org.scala-lang/scala-compiler/scala-compiler-2.12.2.jar new file mode 100644 index 000000000000..993fd6ef7b9d Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.scala-lang/scala-compiler/scala-compiler-2.12.2.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.scala-lang/scala-library/scala-library-2.12.2.jar b/bbb-apps-common/lib_managed/jars/org.scala-lang/scala-library/scala-library-2.12.2.jar new file mode 100644 index 000000000000..ca0ed38faa94 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.scala-lang/scala-library/scala-library-2.12.2.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.scala-lang/scala-reflect/scala-reflect-2.12.2.jar b/bbb-apps-common/lib_managed/jars/org.scala-lang/scala-reflect/scala-reflect-2.12.2.jar new file mode 100644 index 000000000000..7ef5d1b563ad Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.scala-lang/scala-reflect/scala-reflect-2.12.2.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.scala-sbt/test-interface/test-interface-1.0.jar b/bbb-apps-common/lib_managed/jars/org.scala-sbt/test-interface/test-interface-1.0.jar new file mode 100644 index 000000000000..96f9ce577bc5 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.scala-sbt/test-interface/test-interface-1.0.jar differ diff --git a/bbb-apps-common/lib_managed/jars/org.slf4j/slf4j-api/slf4j-api-1.7.5.jar b/bbb-apps-common/lib_managed/jars/org.slf4j/slf4j-api/slf4j-api-1.7.5.jar new file mode 100644 index 000000000000..8f004d3906fc Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/org.slf4j/slf4j-api/slf4j-api-1.7.5.jar differ diff --git a/bbb-apps-common/lib_managed/jars/redis.clients/jedis/jedis-2.7.2.jar b/bbb-apps-common/lib_managed/jars/redis.clients/jedis/jedis-2.7.2.jar new file mode 100644 index 000000000000..fcf2a5868f19 Binary files /dev/null and b/bbb-apps-common/lib_managed/jars/redis.clients/jedis/jedis-2.7.2.jar differ diff --git a/bbb-apps-common/project/Build.scala b/bbb-apps-common/project/Build.scala new file mode 100755 index 000000000000..e69de29bb2d1 diff --git a/bbb-apps-common/project/build.properties b/bbb-apps-common/project/build.properties new file mode 100755 index 000000000000..a6e117b61042 --- /dev/null +++ b/bbb-apps-common/project/build.properties @@ -0,0 +1 @@ +sbt.version=0.13.8 diff --git a/bbb-apps-common/project/plugins.sbt b/bbb-apps-common/project/plugins.sbt new file mode 100755 index 000000000000..d6beaa3759d5 --- /dev/null +++ b/bbb-apps-common/project/plugins.sbt @@ -0,0 +1,9 @@ +addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2") + +addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0") + +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") + +//addSbtPlugin("com.artima.supersafe" % "sbtplugin" % "1.1.2") + + diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java similarity index 94% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java index c0aebe017115..adf33d5ecefc 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/CaptionClientMessageSender.java @@ -8,7 +8,7 @@ import org.bigbluebutton.common.messages.SendCaptionHistoryReplyMessage; import org.bigbluebutton.common.messages.UpdateCaptionOwnerMessage; import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DirectClientMessage; import com.google.gson.Gson; @@ -16,9 +16,9 @@ import com.google.gson.JsonParser; public class CaptionClientMessageSender { - private ConnectionInvokerService service; + private IConnectionInvokerService service; - public CaptionClientMessageSender(ConnectionInvokerService service) { + public CaptionClientMessageSender(IConnectionInvokerService service) { this.service = service; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/ChatClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/ChatClientMessageSender.java similarity index 95% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/ChatClientMessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/ChatClientMessageSender.java index 70fdc2dea610..fb5ad6ecee69 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/ChatClientMessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/ChatClientMessageSender.java @@ -8,17 +8,17 @@ import org.bigbluebutton.common.messages.SendPrivateChatMessage; import org.bigbluebutton.common.messages.SendPublicChatMessage; import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DirectClientMessage; -import org.bigbluebutton.red5.service.ChatKeyUtil; +import org.bigbluebutton.red5.client.ChatKeyUtil; import java.util.HashMap; import java.util.Map; public class ChatClientMessageSender { - private ConnectionInvokerService service; + private IConnectionInvokerService service; - public ChatClientMessageSender(ConnectionInvokerService service) { + public ChatClientMessageSender(IConnectionInvokerService service) { this.service = service; } diff --git a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/ChatKeyUtil.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/ChatKeyUtil.java new file mode 100755 index 000000000000..b27a313e39df --- /dev/null +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/ChatKeyUtil.java @@ -0,0 +1,13 @@ +package org.bigbluebutton.red5.client; + +public class ChatKeyUtil { + public static final String CHAT_TYPE = "chatType"; + public static final String FROM_USERID = "fromUserID"; + public static final String FROM_USERNAME = "fromUsername"; + public static final String FROM_COLOR = "fromColor"; + public static final String FROM_TIME = "fromTime"; + public static final String FROM_TZ_OFFSET = "fromTimezoneOffset"; + public static final String TO_USERID = "toUserID"; + public static final String TO_USERNAME = "toUsername"; + public static final String MESSAGE = "message"; +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/DeskShareMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/DeskShareMessageSender.java old mode 100644 new mode 100755 similarity index 94% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/DeskShareMessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/DeskShareMessageSender.java index b94374355f57..0d58cbd098e8 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/DeskShareMessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/DeskShareMessageSender.java @@ -6,16 +6,16 @@ import org.bigbluebutton.common.messages.DeskShareNotifyASingleViewerEventMessage; import org.bigbluebutton.common.messages.DeskShareNotifyViewersRTMPEventMessage; import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DirectClientMessage; import com.google.gson.JsonObject; import com.google.gson.JsonParser; public class DeskShareMessageSender { - private ConnectionInvokerService service; + private IConnectionInvokerService service; - public DeskShareMessageSender(ConnectionInvokerService service) { + public DeskShareMessageSender(IConnectionInvokerService service) { this.service = service; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java similarity index 95% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java index 610d8fea8f8d..cd2e19214b1a 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/MeetingClientMessageSender.java @@ -16,7 +16,7 @@ import org.bigbluebutton.common.messages.NewPermissionsSettingMessage; import org.bigbluebutton.common.messages.UserLockedMessage; import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DirectClientMessage; import org.bigbluebutton.red5.client.messaging.DisconnectAllClientsMessage; import org.bigbluebutton.red5.client.messaging.DisconnectClientMessage; @@ -27,9 +27,9 @@ public class MeetingClientMessageSender { - private ConnectionInvokerService service; + private IConnectionInvokerService service; - public MeetingClientMessageSender(ConnectionInvokerService service) { + public MeetingClientMessageSender(IConnectionInvokerService service) { this.service = service; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/PollingClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/PollingClientMessageSender.java similarity index 94% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/PollingClientMessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/PollingClientMessageSender.java index 0017415e55d8..417c42fd3282 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/PollingClientMessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/PollingClientMessageSender.java @@ -5,16 +5,16 @@ import java.util.Map; import org.bigbluebutton.common.messages.*; import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DirectClientMessage; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; public class PollingClientMessageSender { - private ConnectionInvokerService service; + private IConnectionInvokerService service; - public PollingClientMessageSender(ConnectionInvokerService service) { + public PollingClientMessageSender(IConnectionInvokerService service) { this.service = service; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java similarity index 96% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java index b60d9f058c97..fb293f58a935 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/PresentationClientMessageSender.java @@ -16,7 +16,7 @@ import org.bigbluebutton.common.messages.PresentationRemovedMessage; import org.bigbluebutton.common.messages.PresentationSharedMessage; import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DirectClientMessage; import com.google.gson.Gson; @@ -24,9 +24,9 @@ import com.google.gson.JsonParser; public class PresentationClientMessageSender { - private ConnectionInvokerService service; + private IConnectionInvokerService service; - public PresentationClientMessageSender(ConnectionInvokerService service) { + public PresentationClientMessageSender(IConnectionInvokerService service) { this.service = service; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/SharedNotesClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/SharedNotesClientMessageSender.java old mode 100644 new mode 100755 similarity index 96% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/SharedNotesClientMessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/SharedNotesClientMessageSender.java index 4223fd49e6a1..2fb902c6eb38 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/SharedNotesClientMessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/SharedNotesClientMessageSender.java @@ -9,7 +9,7 @@ import org.bigbluebutton.common.messages.DestroyAdditionalNotesReplyMessage; import org.bigbluebutton.common.messages.SharedNotesSyncNoteReplyMessage; import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DirectClientMessage; import com.google.gson.Gson; @@ -17,9 +17,9 @@ import com.google.gson.JsonParser; public class SharedNotesClientMessageSender { - private ConnectionInvokerService service; + private IConnectionInvokerService service; - public SharedNotesClientMessageSender(ConnectionInvokerService service) { + public SharedNotesClientMessageSender(IConnectionInvokerService service) { this.service = service; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java similarity index 95% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java index 4cc42bf4fa60..f7272b7ed1ec 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java @@ -39,9 +39,8 @@ import org.bigbluebutton.messages.TimeRemainingUpdate; import org.bigbluebutton.messages.UpdateBreakoutUsers; import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DirectClientMessage; -import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import com.google.gson.Gson; @@ -49,11 +48,10 @@ import com.google.gson.JsonParser; public class UserClientMessageSender { - private static Logger log = Red5LoggerFactory.getLogger(UserClientMessageSender.class, "bigbluebutton"); - private ConnectionInvokerService service; + private IConnectionInvokerService service; - public UserClientMessageSender(ConnectionInvokerService service) { + public UserClientMessageSender(IConnectionInvokerService service) { this.service = service; } @@ -319,8 +317,7 @@ private void processValidateAuthTokenReply(ValidateAuthTokenReplyMessage msg) { Map message = new HashMap(); Gson gson = new Gson(); message.put("msg", gson.toJson(args)); - - log.info("validateAuthTokenReply - " + gson.toJson(args)); + DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.userId, "validateAuthTokenReply", message); service.sendMessage(m); } @@ -333,8 +330,7 @@ private void processValidateAuthTokenTimeoutMessage(ValidateAuthTokenTimeoutMess Map message = new HashMap(); Gson gson = new Gson(); message.put("msg", gson.toJson(args)); - - log.info("validateAuthTokenTimedOut - " + gson.toJson(args)); + DirectClientMessage m = new DirectClientMessage(msg.meetingId, msg.userId, "validateAuthTokenTimedOut", message); service.sendMessage(m); } @@ -360,7 +356,6 @@ private void processUserJoinedMessage(UserJoinedMessage msg) { message.put("msg", gson.toJson(args)); String userId = msg.user.get("userId").toString(); - log.info("joinMeetingReply - " + gson.toJson(args)); DirectClientMessage jmr = new DirectClientMessage(msg.meetingId, userId, "joinMeetingReply", message); service.sendMessage(jmr); diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/WhiteboardClientMessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/WhiteboardClientMessageSender.java similarity index 96% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/WhiteboardClientMessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/WhiteboardClientMessageSender.java index 1ee5b78250c1..154c79b2b787 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/WhiteboardClientMessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/WhiteboardClientMessageSender.java @@ -10,7 +10,7 @@ import org.bigbluebutton.common.messages.UndoWhiteboardReplyMessage; import org.bigbluebutton.common.messages.ModifiedWhiteboardAccessMessage; import org.bigbluebutton.red5.client.messaging.BroadcastClientMessage; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DirectClientMessage; import com.google.gson.Gson; @@ -18,9 +18,9 @@ import com.google.gson.JsonParser; public class WhiteboardClientMessageSender { - private ConnectionInvokerService service; + private IConnectionInvokerService service; - public WhiteboardClientMessageSender(ConnectionInvokerService service) { + public WhiteboardClientMessageSender(IConnectionInvokerService service) { this.service = service; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/BroadcastClientMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/BroadcastClientMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/BroadcastClientMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/BroadcastClientMessage.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ClientMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/ClientMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ClientMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/ClientMessage.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DirectClientMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/DirectClientMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DirectClientMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/DirectClientMessage.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllClientsMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllClientsMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllClientsMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllClientsMessage.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectAllMessage.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectClientMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectClientMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectClientMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/DisconnectClientMessage.java diff --git a/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/IConnectionInvokerService.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/IConnectionInvokerService.java new file mode 100755 index 000000000000..512a4121d993 --- /dev/null +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/IConnectionInvokerService.java @@ -0,0 +1,6 @@ +package org.bigbluebutton.red5.client.messaging; + + +public interface IConnectionInvokerService { + void sendMessage(final ClientMessage message); +} diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/SharedObjectClientMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/SharedObjectClientMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/SharedObjectClientMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/client/messaging/SharedObjectClientMessage.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsAliveMonitorService.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsAliveMonitorService.java similarity index 92% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsAliveMonitorService.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsAliveMonitorService.java index b89a8c020038..b24de6786825 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsAliveMonitorService.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsAliveMonitorService.java @@ -11,7 +11,7 @@ import org.bigbluebutton.common.messages.MessagingConstants; import org.bigbluebutton.common.messages.PubSubPingMessage; import org.bigbluebutton.common.messages.payload.PubSubPingMessagePayload; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.client.messaging.DisconnectAllMessage; import org.bigbluebutton.red5.pubsub.redis.MessageSender; import org.slf4j.Logger; @@ -31,7 +31,7 @@ public class BbbAppsIsAliveMonitorService { private volatile boolean processMessages = false; private KeepAliveTask task = new KeepAliveTask(); - private ConnectionInvokerService service; + private IConnectionInvokerService service; private Long lastKeepAliveMessage = 0L; private MessageSender sender; @@ -42,7 +42,7 @@ public void setMessageSender(MessageSender sender) { this.sender = sender; } - public void setConnectionInvokerService(ConnectionInvokerService s) { + public void setConnectionInvokerService(IConnectionInvokerService s) { this.service = s; } diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsKeepAliveHandler.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsKeepAliveHandler.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsKeepAliveHandler.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/BbbAppsIsKeepAliveHandler.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/CheckIsAliveTimer.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/CheckIsAliveTimer.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/CheckIsAliveTimer.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/CheckIsAliveTimer.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/IKeepAliveMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/IKeepAliveMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/IKeepAliveMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/IKeepAliveMessage.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/KeepAliveMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/KeepAliveMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/monitoring/KeepAliveMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/monitoring/KeepAliveMessage.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageDistributor.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageDistributor.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageDistributor.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageDistributor.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageHandler.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageHandler.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageHandler.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageHandler.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageReceiver.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageReceiver.java similarity index 91% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageReceiver.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageReceiver.java index 9054eca97486..7bef26a90c86 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageReceiver.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageReceiver.java @@ -4,7 +4,7 @@ import java.util.concurrent.Executors; import org.bigbluebutton.common.messages.MessagingConstants; -import org.red5.logging.Red5LoggerFactory; +import org.slf4j.LoggerFactory; import org.slf4j.Logger; import redis.clients.jedis.Jedis; @@ -12,7 +12,7 @@ import redis.clients.jedis.exceptions.JedisConnectionException; public class MessageReceiver { - private static Logger log = Red5LoggerFactory.getLogger(MessageReceiver.class, "bigbluebutton"); + private static Logger log = LoggerFactory.getLogger(MessageReceiver.class); private ReceivedMessageHandler handler; diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageSender.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageSender.java similarity index 92% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageSender.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageSender.java index fb3e674b14d7..4d6b4d9f26a1 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageSender.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageSender.java @@ -6,7 +6,7 @@ import java.util.concurrent.LinkedBlockingQueue; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; -import org.red5.logging.Red5LoggerFactory; +import org.slf4j.LoggerFactory; import org.slf4j.Logger; import redis.clients.jedis.Jedis; @@ -14,7 +14,7 @@ import redis.clients.jedis.Protocol; public class MessageSender { - private static Logger log = Red5LoggerFactory.getLogger(MessageSender.class, "bigbluebutton"); + private static Logger log = LoggerFactory.getLogger(MessageSender.class); private volatile boolean sendMessage = false; private final Executor msgSenderExec = Executors.newSingleThreadExecutor(); diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageToSend.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageToSend.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageToSend.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/MessageToSend.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessage.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessage.java similarity index 100% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessage.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessage.java diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessageHandler.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessageHandler.java similarity index 89% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessageHandler.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessageHandler.java index 09e0003ceb58..b94811acaaee 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessageHandler.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/ReceivedMessageHandler.java @@ -5,11 +5,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; -import org.red5.logging.Red5LoggerFactory; +import org.slf4j.LoggerFactory; import org.slf4j.Logger; public class ReceivedMessageHandler { - private static Logger log = Red5LoggerFactory.getLogger(ReceivedMessageHandler.class, "bigbluebutton"); + private static Logger log = LoggerFactory.getLogger(ReceivedMessageHandler.class); private BlockingQueue receivedMessages = new LinkedBlockingQueue(); diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java similarity index 90% rename from bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java rename to bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java index 6e140852d7e7..51a25bb0c4fa 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java +++ b/bbb-apps-common/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java @@ -10,15 +10,13 @@ import org.bigbluebutton.red5.client.WhiteboardClientMessageSender; import org.bigbluebutton.red5.client.CaptionClientMessageSender; import org.bigbluebutton.red5.client.DeskShareMessageSender; -import org.bigbluebutton.red5.client.messaging.ConnectionInvokerService; +import org.bigbluebutton.red5.client.messaging.IConnectionInvokerService; import org.bigbluebutton.red5.monitoring.BbbAppsIsKeepAliveHandler; -import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; public class RedisPubSubMessageHandler implements MessageHandler { - private static Logger log = Red5LoggerFactory.getLogger(RedisPubSubMessageHandler.class, "bigbluebutton"); - private ConnectionInvokerService service; + private IConnectionInvokerService service; private UserClientMessageSender userMessageSender; private MeetingClientMessageSender meetingMessageSender; private ChatClientMessageSender chatMessageSender; @@ -30,7 +28,7 @@ public class RedisPubSubMessageHandler implements MessageHandler { private CaptionClientMessageSender captionMessageSender; private SharedNotesClientMessageSender sharedNotesMessageSender; - public void setConnectionInvokerService(ConnectionInvokerService s) { + public void setConnectionInvokerService(IConnectionInvokerService s) { this.service = s; userMessageSender = new UserClientMessageSender(service); meetingMessageSender = new MeetingClientMessageSender(service); diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle index 1ef3488bd7ae..1317b4400714 100755 --- a/bigbluebutton-apps/build.gradle +++ b/bigbluebutton-apps/build.gradle @@ -64,6 +64,7 @@ dependencies { providedCompile 'org.apache.commons:commons-lang3:3.2' compile 'org.bigbluebutton:bbb-common-message:0.0.19-SNAPSHOT' + compile 'org.bigbluebutton:bbb-apps-common:0.0.1-SNAPSHOT' } test { diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java index 89471e30cce9..426f28e9507a 100755 --- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java +++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java @@ -30,7 +30,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.IConnection; import org.red5.server.api.scope.IScope; @@ -46,7 +45,7 @@ import org.slf4j.Marker; import org.slf4j.MarkerFactory; -public class ConnectionInvokerService { +public class ConnectionInvokerService implements IConnectionInvokerService { private static Logger log = Red5LoggerFactory.getLogger(ConnectionInvokerService.class, "bigbluebutton"); private final String CONN = "RED5-";