From 0776a4d2b19bcce0bcd68932426eb2ed838bac15 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Tue, 2 Jun 2009 17:33:50 +0000
Subject: [PATCH] - need to use AGI to get conference number when someone joins
 the voice conference

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1522 af16638f-c34d-0410-8cfa-b39d5352b314
---
 .../grails-app/conf/spring/resources.xml      | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/bigbluebutton-web/grails-app/conf/spring/resources.xml b/bigbluebutton-web/grails-app/conf/spring/resources.xml
index 888fc5c45f..0cd95905f9 100644
--- a/bigbluebutton-web/grails-app/conf/spring/resources.xml
+++ b/bigbluebutton-web/grails-app/conf/spring/resources.xml
@@ -4,7 +4,7 @@
        xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-<!--
+
    <bean class="org.asteriskjava.fastagi.AgiServerThread"
       init-method="startup" destroy-method="shutdown">
       <property name="agiServer" ref="agiServer"/>
@@ -14,27 +14,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
       <property name="bindPort" value="4573"/>
       <property name="mappingStrategy" ref="mappingStrategy" />
    </bean>
--->
-<!--
-   <bean class="org.bigbluebutton.pbx.asterisk.ConferenceAttendanceRecorder"
-      init-method="startup" destroy-method="shutdown">
-      <property name="asteriskServer" ref="asteriskServer"/>
-      <property name="dataSource" ref="dataSource"/>
-   </bean> 
-
-
-   <bean class="org.bigbluebutton.pbx.PbxLive"
-      init-method="startup" destroy-method="shutdown">
-      <property name="asteriskServer" ref="asteriskServer"/>
-   </bean> 
--->
-<!--     
-   <bean id="asteriskServer" class="org.asteriskjava.live.DefaultAsteriskServer">
-		<constructor-arg index="0" value="${asterisk.host}"/>
-		<constructor-arg index="1" value="${ami.user}"/>
-		<constructor-arg index="2" value="${ami.password}"/>  		
-   </bean>
-
    
 	<bean id="mappingStrategy" class="org.asteriskjava.fastagi.SimpleMappingStrategy">
 		<property name="mappings">
@@ -43,8 +22,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
 			</map>
 		</property>
 	</bean>
-
 			
 	<bean id="asteriskAgi" class="org.bigbluebutton.pbx.asterisk.AsteriskAgiService" />
--->
+
 </beans>
\ No newline at end of file
-- 
GitLab