Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

Corey-Wang · Jul 15, 2010 · 1004daf · 1004daf
2 parents 3165006 + d5fd4eb
commit 1004daf
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 19 deletions.
diff --git a/bigbluebutton-client/resources/dev/join-mock.xml b/bigbluebutton-client/resources/dev/join-mock.xml
@@ -1,10 +1,15 @@
 <join>
 	<returncode>SUCCESS</returncode>
 	<fullname>Test User</fullname>
+  	<confname>Dev Meeting</confname>
+  	<meetingID>Dev Meeting</meetingID>
+  	<externUserID>kudzhwrszui9</externUserID>	
 	<role>MODERATOR</role>
 	<conference>conference-mock-default</conference>
 	<room>room-mock-default</room>
 	<voicebridge>85115</voicebridge>
+	<webvoiceconf>85115</webvoiceconf>
 	<mode>LIVE</mode>
-	<record>true</record>
+	<record>false</record>
+	<welcome>&lt;br&gt;Welcome to your BigBlueButton Dev Server.&lt;br&gt;&lt;br&gt;For help using BigBlueButton &lt;a href="event:http://www.bigbluebutton.org/content/videos"&gt;&lt;u&gt;check out these videos&lt;/u&gt;&lt;/a&gt;.&lt;br&gt;&lt;br&gt;</welcome>
 </join>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/PhoneLocalEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/PhoneLocalEventMap.mxml
@@ -81,11 +81,13 @@
     </EventHandlers>
 
 	<EventHandlers type="{CallConnectedEvent.CALL_CONNECTED_EVENT}">     
+		<MethodInvoker generator="{PhoneLocalEventMapDelegate}" method="disableToolbarButton"/>
 		<MethodInvoker generator="{PhoneManager}" method="callConnected" arguments="{event}"/>
     </EventHandlers>
 
     <EventHandlers type="{CallDisconnectedEvent.CALL_DISCONNECTED_EVENT}">   
     	<MethodInvoker generator="{PhoneManager}" method="hangup"/> 
+		<MethodInvoker generator="{PhoneLocalEventMapDelegate}" method="enableToolbarButton"/>
     </EventHandlers>
 
     <EventHandlers type="{ConnectionStatusEvent.CONNECTION_STATUS_EVENT}">        

diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/PhoneLocalEventMapDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/PhoneLocalEventMapDelegate.as
@@ -71,5 +71,14 @@ package org.bigbluebutton.modules.phone.maps
 
 		}
 
+		public function disableToolbarButton():void {
+//			phoneButton.enabled = false;
+			phoneButton.selected = true;
+		}
+
+		public function enableToolbarButton():void {
+//			phoneButton.enabled = true;
+			phoneButton.selected = false;
+		}
 	}
 }
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
@@ -31,38 +31,29 @@
 
 	<mx:Script>
 		<![CDATA[
+			import org.bigbluebutton.modules.phone.events.LeaveVoiceConferenceEvent;
 			import org.bigbluebutton.main.events.BBBEvent;
-			import org.bigbluebutton.modules.phone.events.CallConnectedEvent;
 			import org.bigbluebutton.modules.phone.events.CallDisconnectedEvent;
+			import org.bigbluebutton.modules.phone.events.CallConnectedEvent;
 			import org.bigbluebutton.modules.phone.events.JoinVoiceConferenceEvent;
-			import org.bigbluebutton.modules.phone.events.LeaveVoiceConferenceEvent;
 			import org.bigbluebutton.modules.phone.views.assets.Images;
 			import org.bigbluebutton.util.i18n.ResourceUtil;
 			
 			private var images:Images = new Images();
 			private var localDispatcher:IEventDispatcher;
-			
-			private var connected:Boolean = false;
 			 
 			[Bindable] public var phoneIcon:Class = images.headset_icon;
 			
 			private function startPhone():void {
-				this.enabled = false;
+				//this.enabled = false;
 				if (this.selected) {
 					LogUtil.debug("Joining voice conference");
 					localDispatcher.dispatchEvent(new JoinVoiceConferenceEvent());					
 				} else {
 					LogUtil.debug("Leaving voice conference");
 					localDispatcher.dispatchEvent(new LeaveVoiceConferenceEvent());
 				}
-				
-				var t:Timer = new Timer(5000, 1);
-				t.addEventListener(TimerEvent.TIMER, reEnable);
-				t.start();
-			}
-			
-			private function reEnable(e:TimerEvent):void{
-				this.enabled = true;
+					
 			}
 			
 			public function setLocalDispatcher(dispatcher:IEventDispatcher):void {
@@ -71,13 +62,11 @@
 			
 			private function handleCallConnectedEvent(event:CallConnectedEvent):void {
 				//this.enabled = false;
-				this.connected = true;
 			}
 			
 			private function handleCallDisconnectedEvent(event:CallConnectedEvent):void {
 				//this.enabled = true;
 				this.selected = false;
-				this.connected = false;
 			}
 			
 			private function handleBBBJoinConferenceEvent(event:BBBEvent):void {

diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf
@@ -556,6 +556,16 @@ if [ $SETUPDEV ]; then
                 echo "# Copying /var/www/bigbluebutton/client/conf/config.xml to ${BBBCLIENTHOME}/src/conf/config.xml"
                 cp /var/www/bigbluebutton/client/conf/config.xml $BBBCLIENTHOME/src/conf/config.xml
 
+                echo "# Copying ${BBBCLIENTHOME}/resources/dev/join-mock.xml to ${BBBCLIENTHOME}/src/conf/join-mock.xml"
+                cp $BBBCLIENTHOME/resources/dev/join-mock.xml $BBBCLIENTHOME/src/conf/join-mock.xml
+
+		if [ ! -d /var/bigbluebutton/conference-mock-default/conference-mock-default/room-mock-default ]; then
+			echo "# Creating /var/bigbluebutton/conference-mock-default/conference-mock-default/room-mock-default"
+                        sudo mkdir -p /var/bigbluebutton/conference-mock-default/conference-mock-default/room-mock-default
+			echo "# chown /var/bigbluebutton/conference-mock-default to tomcat6"
+			sudo chown -R tomcat6.tomcat6 /var/bigbluebutton/conference-mock-default
+                fi
+
                 cd $BBBCLIENTHOME
 
                 echo "

diff --git a/bigbluebutton-config/web/index.html b/bigbluebutton-config/web/index.html
@@ -22,10 +22,11 @@
                 <div id="slogan"><h3>Demo Server</h3></div>
             </div>
             <div id="versionNum">
-                <p style="text-align:right;"><strong>What's new in version 0.70-dev</strong></p>
+                <p style="text-align:right;"><strong>What's new in version 0.70</strong></p>
                 <p style="text-align:right;">Whiteboard</p>
                 <p style="text-align:right;">Pointer in desktop sharing</p>
                 <p style="text-align:right;">New API calls</p>
+		<p style="text-align:right;"><a href="http://code.google.com/p/bigbluebutton/wiki/ReleaseNotes"><font color="#0000FF">more...</font></a></p>
             </div>
         </div>
     </div>
@@ -56,7 +57,7 @@ <h2>Join a Demo Meeting</h2>
             	    </form>
 	 <p class="content"></p>
                 <img src="images/arrow.png" width="15" height="17" border="0" />
-                <div style="margin-top:-17px; margin-left:20px;"><a href="http://bigbluebutton.org/content/videos">View Intro Videos</a></div>
+                <div style="margin-top:-17px; margin-left:20px;"><a href="http://bigbluebutton.org/content/videos">View Tutorial Videos</a></div>
         </div>
         <div id="about">
              <h2>About BigBlueButton</h2>

diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -62,7 +62,7 @@ defaultWelcomeMessage=<br>Welcome to this BigBlueButton Demo Server.<br><br>For
 # Inject values into grails service beans
 beans.presentationService.presentationDir=${presentationDir}
 beans.dynamicConferenceService.serviceEnabled=true
-beans.dynamicConferenceService.apiVersion=0.7-SNAPSHOT
+beans.dynamicConferenceService.apiVersion=0.7
 beans.dynamicConferenceService.minutesElapsedBeforeMeetingExpiration=60
 beans.dynamicConferenceService.securitySalt=5e5ff0968546b8aaacce0462a99bca30
 beans.dynamicConferenceService.defaultWelcomeMessage=${defaultWelcomeMessage}