BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix bean wirings

Browse Source
This commit is contained in:
Richard Alam 2013-06-07 18:54:09 -04:00
parent 0dccadbbd6
commit 2d4d1a1b66
10 changed files with 31 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
View File

@ -266,7 +266,7 @@ public class WhiteboardApplication extends ApplicationAdapter implements IApplic
recordingService = recService; recordingService = recService;
} }
public void setConnInvokerService(ClientMessageSender connInvokerService) { public void setClientMessageSender(ClientMessageSender clientSender) {
this.clientSender = connInvokerService; this.clientSender = clientSender;
} }
} }

5
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRecordingService.java
View File

@ -20,15 +20,10 @@ package org.bigbluebutton.conference.service.whiteboard;
import org.bigbluebutton.conference.service.recorder.RecorderApplication; import org.bigbluebutton.conference.service.recorder.RecorderApplication;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.bigbluebutton.conference.service.whiteboard.IWhiteboardRoomListener;
import org.bigbluebutton.conference.service.whiteboard.Presentation;
import org.bigbluebutton.conference.service.whiteboard.redis.*; import org.bigbluebutton.conference.service.whiteboard.redis.*;
import org.bigbluebutton.conference.service.whiteboard.shapes.Annotation; import org.bigbluebutton.conference.service.whiteboard.shapes.Annotation;
public class WhiteboardRecordingService { public class WhiteboardRecordingService {
private static Logger log = Red5LoggerFactory.getLogger( WhiteboardRecordingService.class, "bigbluebutton" );
private RecorderApplication recorder;; private RecorderApplication recorder;;
public void setRecorderApplication(RecorderApplication recorder) { public void setRecorderApplication(RecorderApplication recorder) {

2
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-chat.xml
View File

@ -29,7 +29,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<bean id="chatHandler" class="org.bigbluebutton.conference.service.chat.ChatHandler"> <bean id="chatHandler" class="org.bigbluebutton.conference.service.chat.ChatHandler">
<property name="chatApplication"> <ref local="chatApplication"/></property> <property name="chatApplication"> <ref local="chatApplication"/></property>
<property name="recorderApplication"> <ref local="recorderApplication"/></property> <property name="recorderApplication"> <ref bean="recorderApplication"/></property>
</bean> </bean>
<bean id="chatApplication" class="org.bigbluebutton.conference.service.chat.ChatApplication"> <bean id="chatApplication" class="org.bigbluebutton.conference.service.chat.ChatApplication">

4
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-poll.xml
View File

@ -33,7 +33,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<ref local="pollApplication"/> <ref local="pollApplication"/>
</property> </property>
<property name="recorderApplication"> <property name="recorderApplication">
<ref local="recorderApplication"/> <ref bean="recorderApplication"/>
</property> </property>
</bean> </bean>
@ -56,7 +56,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<bean id="pollRecorder" <bean id="pollRecorder"
class="org.bigbluebutton.conference.service.recorder.polling.PollRecorder"> class="org.bigbluebutton.conference.service.recorder.polling.PollRecorder">
<property name="redisPool"> <property name="redisPool">
<ref local="redisPool" /> <ref bean="redisPool" />
</property> </property>
</bean> </bean>
</beans> </beans>

4
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-presentation.xml
View File

@ -35,7 +35,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<ref local="presentationApplication"/> <ref local="presentationApplication"/>
</property> </property>
<property name="recorderApplication"> <property name="recorderApplication">
<ref local="recorderApplication"/> <ref bean="recorderApplication"/>
</property> </property>
<property name="conversionUpdatesMessageListener"> <property name="conversionUpdatesMessageListener">
<ref local="conversionUpdatesMessageListener" /> <ref local="conversionUpdatesMessageListener" />
@ -48,7 +48,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</bean> </bean>
<bean id="presentation.service" class="org.bigbluebutton.conference.service.presentation.PresentationService"> <bean id="presentation.service" class="org.bigbluebutton.conference.service.presentation.PresentationService">
<property name="participantsApplication"> <ref local="participantsApplication"/></property> <property name="participantsApplication"> <ref bean="participantsApplication"/></property>
<property name="presentationApplication"> <ref local="presentationApplication"/></property> <property name="presentationApplication"> <ref local="presentationApplication"/></property>
</bean> </bean>

4
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-users.xml
View File

@ -28,7 +28,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
"> ">
<bean id="roomsManager" class="org.bigbluebutton.conference.RoomsManager"> <bean id="roomsManager" class="org.bigbluebutton.conference.RoomsManager">
<property name="messagingService" ref="messagingService"></property> <property name="messagingService"> <ref bean="messagingService"/></property>
<property name="conversionUpdatesMessageListener" ref="conversionUpdatesMessageListener"></property> <property name="conversionUpdatesMessageListener" ref="conversionUpdatesMessageListener"></property>
</bean> </bean>
@ -38,7 +38,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<bean id="participantsHandler" class="org.bigbluebutton.conference.service.participants.ParticipantsHandler"> <bean id="participantsHandler" class="org.bigbluebutton.conference.service.participants.ParticipantsHandler">
<property name="participantsApplication"> <ref local="participantsApplication"/></property> <property name="participantsApplication"> <ref local="participantsApplication"/></property>
<property name="recorderApplication"> <ref local="recorderApplication"/></property> <property name="recorderApplication"> <ref bean="recorderApplication"/></property>
</bean> </bean>
<bean id="participantsApplication" class="org.bigbluebutton.conference.service.participants.ParticipantsApplication"> <bean id="participantsApplication" class="org.bigbluebutton.conference.service.participants.ParticipantsApplication">

13
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-whiteboard.xml
View File

@ -27,11 +27,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
http://www.springframework.org/schema/util/spring-util-2.0.xsd http://www.springframework.org/schema/util/spring-util-2.0.xsd
"> ">
<bean id="whiteboardApplication" <bean id="whiteboardApplication" class="org.bigbluebutton.conference.service.whiteboard.WhiteboardApplication">
class="org.bigbluebutton.conference.service.whiteboard.WhiteboardApplication">
<property name="roomManager"> <ref local="whiteboardRoomManager"/></property>
<property name="recorderApplication"> <ref local="recorderApplication"/></property> <property name="recorderApplication"> <ref local="recorderApplication"/></property>
<property name="connInvokerService"> <ref bean="connInvokerService"/></property> <property name="clientSender"> <ref bean="connInvokerService"/></property>
</bean>
<bean id="whiteboardClientSender" class="org.bigbluebutton.conference.service.whiteboard.ClientMessageSender">
<property name="vonnectionInvokerService"> <ref local="connInvokerService"/></property>
</bean> </bean>
<bean id="whiteboard.service" class="org.bigbluebutton.conference.service.whiteboard.WhiteboardService"> <bean id="whiteboard.service" class="org.bigbluebutton.conference.service.whiteboard.WhiteboardService">
@ -40,4 +42,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<bean id="whiteboardRoomManager" class="org.bigbluebutton.conference.service.whiteboard.WhiteboardRoomManager"/> <bean id="whiteboardRoomManager" class="org.bigbluebutton.conference.service.whiteboard.WhiteboardRoomManager"/>
<bean id="whiteboardRecordingService" class="org.bigbluebutton.conference.service.whiteboard.WhiteboardRecordingService">
<property name="recorderApplication"> <ref bean="recorderApplication"/></property>
</bean>
</beans> </beans>

61
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-messaging.xml
View File

@ -28,65 +28,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
"> ">
<!-- RECORDER AND MESSAGING --> <bean id="redisMessageSender" class="org.bigbluebutton.conference.service.messaging.RedisMessagingService">
<property name="redisPool"> <ref bean="redisPool"/></property>
<bean id="recorderApplication" class="org.bigbluebutton.conference.service.recorder.RecorderApplication">
<property name="recorder"><ref local="redisRecorder" /> </property>
</bean> </bean>
<bean id="redisRecorder" class="org.bigbluebutton.conference.service.recorder.RedisDispatcher"> <bean id="redisMessageReceiver" class="org.bigbluebutton.conference.service.messaging.redis.MessageReceiver">
<property name="redisPool"><ref local="redisPool" /> </property> <property name="redisPool"> <ref bean="redisPool"/></property>
<property name="redisMessageHandler"> <ref local="messageHandler"/> </property>
</bean> </bean>
<bean id="messageSender" class="org.bigbluebutton.conference.service.messaging.RedisMessagingService"> <bean id="redisMessageHandler" class="org.bigbluebutton.conference.service.messaging.ReceivedMessageHandler"/>
<property name="redisPool" ref="redisPool"/>
</bean>
<bean id="messageReceiver" class="org.bigbluebutton.conference.service.messaging.redis.MessageReceiver">
<property name="redisPool" ref="redisPool"/>
<property name="messageHandler" ref="messageHandler"/>
</bean>
<bean id="messageHandler" class="org.bigbluebutton.conference.service.messaging.ReceivedMessageHandler"/>
<bean id="redisPool" class="redis.clients.jedis.JedisPool">
<constructor-arg index="0">
<bean factory-bean="config" factory-method="getConfig" />
</constructor-arg>
<constructor-arg index="1" value="${redis.host}"/>
<constructor-arg index="2" value="${redis.port}"/>
</bean>
<bean id="config" class="org.bigbluebutton.conference.service.recorder.GenericObjectPoolConfigWrapper">
<!-- Action to take when trying to acquire a connection and all connections are taken -->
<property name="whenExhaustedAction">
<!-- Fail-fast behaviour, we don't like to keep the kids waiting -->
<util:constant static-field="org.apache.commons.pool.impl.GenericObjectPool.WHEN_EXHAUSTED_FAIL" />
<!-- Default behaviour, block the caller until a resource becomes available -->
<!--<util:constant static-field="org.apache.commons.pool.impl.GenericObjectPool.WHEN_EXHAUSTED_BLOCK" />-->
</property>
<!-- Maximum active connections to Redis instance -->
<property name="maxActive" value="12" />
<!-- Number of connections to Redis that just sit there and do nothing -->
<property name="maxIdle" value="6" />
<!-- Minimum number of idle connections to Redis - these can be seen as always open and ready to serve -->
<property name="minIdle" value="1" />
<!-- Tests whether connection is dead when connection retrieval method is called -->
<property name="testOnBorrow" value="true" />
<!-- Tests whether connection is dead when returning a connection to the pool -->
<property name="testOnReturn" value="true" />
<!-- Tests whether connections are dead during idle periods -->
<property name="testWhileIdle" value="true" />
<!-- Maximum number of connections to test in each idle check -->
<property name="numTestsPerEvictionRun" value="12" />
<!-- Idle connection checking period -->
<property name="timeBetweenEvictionRunsMillis" value="60000" />
<!-- Maximum time, in milliseconds, to wait for a resource when exausted action is set to WHEN_EXAUSTED_BLOCK -->
<property name="maxWait" value="5000" />
</bean>
<!-- END RECORDER AND MESSAGING -->
</beans> </beans>

4
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-redis-recorder.xml
View File

@ -29,10 +29,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<bean id="recorderApplication" class="org.bigbluebutton.conference.service.recorder.RecorderApplication"> <bean id="recorderApplication" class="org.bigbluebutton.conference.service.recorder.RecorderApplication">
<property name="recorder"><ref local="redisRecorder" /> </property> <property name="recorder"><ref bean="redisRecorder" /> </property>
</bean> </bean>
<bean id="redisRecorder" class="org.bigbluebutton.conference.service.recorder.RedisDispatcher"> <bean id="redisRecorder" class="org.bigbluebutton.conference.service.recorder.RedisDispatcher">
<property name="redisPool"><ref local="redisPool" /> </property> <property name="redisPool"><ref bean="redisPool" /> </property>
</bean> </bean>
</beans> </beans>

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

@ -63,6 +63,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<bean id="connInvokerService" class="org.bigbluebutton.conference.ConnectionInvokerService" init-method="start" destroy-method="stop"/> <bean id="connInvokerService" class="org.bigbluebutton.conference.ConnectionInvokerService" init-method="start" destroy-method="stop"/>
<import resource="bbb-redis-pool.xml"/>
<import resource="bbb-redis-recorder.xml"/>
<import resource="bbb-app-chat.xml" /> <import resource="bbb-app-chat.xml" />
<import resource="bbb-app-layout.xml" /> <import resource="bbb-app-layout.xml" />
<import resource="bbb-app-poll.xml" /> <import resource="bbb-app-poll.xml" />
@ -71,7 +73,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<import resource="bbb-app-users.xml" /> <import resource="bbb-app-users.xml" />
<import resource="bbb-voice-app.xml" /> <import resource="bbb-voice-app.xml" />
<import resource="bbb-voice-freeswitch.xml" /> <import resource="bbb-voice-freeswitch.xml" />
<import resource="bbb-redis-recorder.xml"/>
<import resource="bbb-redis-messaging.xml"/> <import resource="bbb-redis-messaging.xml"/>
<import resource="bbb-redis-pool.xml"/>
</beans> </beans>