- fix some problem with creating default conference

- remove Asterisk AMI/AGI beans from resources.xml as we don't need it for now

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1520 af16638f-c34d-0410-8cfa-b39d5352b314

bigbluebutton-web/grails-app/conf/BootStrap.groovy

@@ -25,8 +25,8 @@ class BootStrap {
 		log.debug "Creating default conference"
 		def defaultConference = new Conference(
 				name:"Default Conference", conferenceNumber:new Integer(85115), 
-				user:adminUser, createdBy:createdBy, updatedBy:modifiedBy)
-     	defaultConference.save(flush:true)
+				user:adminUser, createdBy:createdBy, updatedBy:modifiedBy).save()
+//     	defaultConference.save()
 		
 		log.debug "Creating a Default session for the Default Conference"
 		
@@ -53,14 +53,15 @@ class BootStrap {
 		String attendeePassword = 'ap'
 		String voiceConferenceBridge = '85115'
 		
-		new ScheduledSession(
+		def defaultConfSession = new ScheduledSession(
 				name:name, description:description,
 				createdBy:createdBy, modifiedBy:modifiedBy, sessionId:sessionId, tokenId:tokenId,
 				numberOfAttendees:numberOfAttendees, timeLimited:timeLimited, startDateTime:startDateTime,
 				endDateTime:endDateTime, record:record, passwordProtect:passwordProtect, hostPassword:hostPassword,
 				moderatorPassword:moderatorPassword, attendeePassword:attendeePassword, 
 				voiceConferenceBridge:voiceConferenceBridge, conference:defaultConference
-			).save(flush:true)		
+			).save()
+//     	defaultConfSession.save()		
      }
      
      def destroy = {

bigbluebutton-web/grails-app/conf/bigbluebutton.properties

@@ -27,10 +27,4 @@ bigbluebutton.web.serverURL=http://localhost
 noPdfMarkWorkaround=/etc/bigbluebutton/nopdfmark.ps
 beans.presentationService.noPdfMarkWorkaround=${noPdfMarkWorkaround}
 
-#
-# This assumes that Asterisk is running locally
-#
-asterisk.host=localhost
-ami.user=bbb
-ami.password=secret
 

bigbluebutton-web/grails-app/conf/spring/resources.xml

@@ -4,6 +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"/>
@@ -13,7 +14,7 @@ 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">
@@ -27,7 +28,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
       <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}"/>
@@ -45,5 +46,5 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
 
 			
 	<bean id="asteriskAgi" class="org.bigbluebutton.pbx.asterisk.AsteriskAgiService" />
-
+-->
 </beans>
\ No newline at end of file