Fix class import.

bbb-screenshare/app/src/main/webapp/WEB-INF/red5-web.xml

@@ -35,9 +35,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     </property>
   </bean>
   
-  <import resource="bbb-redis-messaging.xml"/>
-  
-  
   <bean id="screenShareApplication" class="org.bigbluebutton.app.screenshare.ScreenShareApplication">
     <constructor-arg index="0" ref="messageBus"/>
     <constructor-arg index="1" value="${jnlpFile}"/>
@@ -106,4 +103,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       </property>
   </bean>
 
+   <import resource="bbb-redis-messaging.xml"/>
+
 </beans>

bbb-video/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java

@@ -12,7 +12,7 @@ import org.bigbluebutton.common2.msgs.UserBroadcastCamStopMsg;
 import org.bigbluebutton.common2.msgs.UserBroadcastCamStopMsgBody;
 import org.bigbluebutton.common2.msgs.ValidateConnAuthTokenSysMsg;
 import org.bigbluebutton.common2.msgs.ValidateConnAuthTokenSysMsgBody;
-import org.bigbluebutton.common2.redis.MessageSender;
+import org.bigbluebutton.common2.redis.pubsub.MessageSender;
 
 import com.google.gson.Gson;
 

bbb-video/src/main/webapp/WEB-INF/bbb-redis-messaging.xml

@@ -63,7 +63,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		<property name="clientName" value="BbbRed5VideoSender" />
     </bean>
     
-      <bean id="redisPublisher" class="org.bigbluebutton.red5.pubsub.MessagePublisher">
+    <bean id="redisPublisher" class="org.bigbluebutton.red5.pubsub.MessagePublisher">
         <property name="messageSender" ref="redisSender"/>
     </bean>
     

bbb-voice/build.gradle

@@ -69,7 +69,6 @@ war.doLast {
   ant.unzip(src: war.archivePath, dest: "$buildDir/sip")
 }
 
-
 task deploy() << {
 	def red5AppsDir = '/usr/share/red5/webapps'
 	def sipDir = new File("${red5AppsDir}/sip")
@@ -80,4 +79,3 @@ task deploy() << {
     	fileset(dir: "$buildDir/sip")
     }
 }
-

bbb-voice/src/main/webapp/WEB-INF/bbb-redis-messaging.xml

@@ -24,8 +24,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 			http://www.springframework.org/schema/util 
-			http://www.springframework.org/schema/util/spring-util-2.0.xsd
-			">
+			http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 	
 	<bean id="redisMessageDistributor" class="org.bigbluebutton.common2.redis.pubsub.MessageDistributor">
 		<property name="messageHandler"> <ref local="redisMessageHandler"/> </property>