Merge pull request #516 from bigbluebutton/remove-collector-actor

- remote CollectorActor as we don't use it. Found that sometimes it's s...

bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala

@@ -5,14 +5,12 @@ import java.util.concurrent.CountDownLatch
 import scala.actors.Actor
 import scala.actors.Actor._
 
-class BigBlueButtonGateway(outGW: MessageOutGateway, collGW: CollectorGateway) {
+class BigBlueButtonGateway(outGW: MessageOutGateway) {
   
   private val bbbActor = new BigBlueButtonActor(outGW)
   bbbActor.start
   
-  def accept(msg: InMessage):Unit = {
-    collGW.collectInMessage(msg)
-    
+  def accept(msg: InMessage):Unit = {  
     bbbActor ! msg
     
   }

bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml

@@ -84,7 +84,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
               
     <bean id="bbbGW" class="org.bigbluebutton.core.BigBlueButtonGateway">
         <constructor-arg index="0" ref="outMsgGW"/>
-        <constructor-arg index="1" ref="collectorGW"/>
     </bean>
     
     <bean id="collectorGW" class="org.bigbluebutton.core.CollectorGateway">
@@ -120,8 +119,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
                 <ref bean="chatRedisRecorder"/>
                 <ref bean="chatRedisPublisher"/>
                 <ref bean="fsConfService"/>                    
-                <ref bean="whiteboardEventRedisPublisher"/>
-                <ref bean="collectorGW"/>                   
+                <ref bean="whiteboardEventRedisPublisher"/>             
             </set>        
          </property> 
     </bean>