From ce339707bbddf05892ac1d50dc20352f51eebc2b Mon Sep 17 00:00:00 2001
From: Denis Zgonjanin <me.snap@gmail.com>
Date: Tue, 7 Jul 2009 14:37:09 +0000
Subject: [PATCH] git-svn-id:
 http://bigbluebutton.googlecode.com/svn/trunk@1844
 af16638f-c34d-0410-8cfa-b39d5352b314

---
 bigbluebutton-client/src/conf/config.xml  | 22 ++++-----
 bigbluebutton-client/src/conf/modules.xml | 55 -----------------------
 2 files changed, 11 insertions(+), 66 deletions(-)
 delete mode 100644 bigbluebutton-client/src/conf/modules.xml

diff --git a/bigbluebutton-client/src/conf/config.xml b/bigbluebutton-client/src/conf/config.xml
index 4df4cbd1d6..aaeb66955c 100644
--- a/bigbluebutton-client/src/conf/config.xml
+++ b/bigbluebutton-client/src/conf/config.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" ?>
 <config>
     <version>0.4</version>
-    <porttest host="192.168.0.124" application="oflaDemo"/>    
+    <porttest host="localhost" application="oflaDemo"/>    
 	<modules>
 		<module name="VideoModule" url="VideoModule.swf" 
-			uri="rtmp://192.168.0.124/oflaDemo"
+			uri="rtmp://localhost/oflaDemo"
 			onUserJoinedEvent="START"
 			onUserLogoutEvent="STOP"	
 			loadNextModule="DeskShareModule"	
 		/>
 		<module name="ChatModule" url="ChatModule.swf" 
-			uri="rtmp://192.168.0.124/bigbluebutton" 
+			uri="rtmp://localhost/bigbluebutton" 
 			loadNextModule="PresentationModule"	
 			onUserJoinedEvent="START"
 			onUserLogoutEvent="STOP"		 
 		/>
 		<module name="ViewersModule" url="ViewersModule.swf" 
-			uri="rtmp://192.168.0.124/bigbluebutton" 
-			host="conf/join-mock.xml"
+			uri="rtmp://localhost/bigbluebutton" 
+			host="http://localhost/bigbluebutton/conference-session/enter"
 			onAppInitEvent="LOAD" loadNextModule="ChatModule"
 			onAppStartEvent="START"
 			onUserLogoutEvent="STOP"
 		/>
 		<module name="ListenersModule" url="ListenersModule.swf" 
-			uri="rtmp://192.168.0.124/bigbluebutton" 
-			recordingHost="http://192.168.0.124"
+			uri="rtmp://localhost/bigbluebutton" 
+			recordingHost="http://localhost"
 			loadNextModule="VideoModule"
 			onUserJoinedEvent="START"
 			onUserLogoutEvent="STOP"
 		/>
 		<module name="PresentationModule" url="PresentationModule.swf" 
-			uri="rtmp://192.168.0.124/bigbluebutton" 
-			host="http://192.168.0.124" 
+			uri="rtmp://localhost/bigbluebutton" 
+			host="http://localhost" 
 			loadNextModule="ListenersModule"
 			onUserJoinedEvent="START" 
 			onUserLogoutEvent="STOP"
 		/>
 
 		<module name="DeskShareModule" url="DeskShareModule.swf" 
-			uri="rtmp://192.168.0.124/deskShare" 
+			uri="rtmp://localhost/deskShare" 
 			onUserJoinedEvent="START" 
 			onUserLogoutEvent="STOP"
 		/>
 		
 		<!--module name="PhoneModule" url="PhoneModule.swf" 
-			uri="rtmp://192.168.0.124/sip" 
+			uri="rtmp://localhost/sip" 
 			onUserJoinedEvent="START" 
 			onUserLogoutEvent="STOP"
 		/-->
diff --git a/bigbluebutton-client/src/conf/modules.xml b/bigbluebutton-client/src/conf/modules.xml
deleted file mode 100644
index c62f5ed6a3..0000000000
--- a/bigbluebutton-client/src/conf/modules.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<modules version="0.4a">
-	<!--module name="LoginModule" url="LoginModule.swf" 
-			uri="http://localhost:8080/bigbluebutton/join/signIn" 
-			onAppInitEvent="LOAD" loadNextModule="ChatModule"
-			onAppStartEvent="START"
-			onUserLogoutEvent="STOP"
-			uri="http://localhost:8080/bigbluebutton/conference-session/enter"
-	/-->
-<!--
-	<module name="JoinModule" url="JoinModule.swf" 
-			uri="conf/join-mock.xml" 
-			onAppInitEvent="LOAD"
-			onAppStartEvent="START"
-			onUserLogoutEvent="STOP"
-	/>
-	host="http://localhost:8080/bigbluebutton/conference-session/enter"
--->
-
-	<module name="VideoModule" url="VideoModule.swf" 
-			uri="rtmp://localhost/oflaDemo"
-			onUserJoinedEvent="START"
-			onUserLogoutEvent="STOP"
-	/>
-	<module name="ChatModule" url="ChatModule.swf" 
-			uri="rtmp://localhost/bigbluebutton" 
-			loadNextModule="PresentationModule"	
-			onUserJoinedEvent="START"
-			onUserLogoutEvent="STOP"		 
-	/>
-
-	<module name="ViewersModule" url="ViewersModule.swf" 
-			uri="rtmp://localhost/bigbluebutton" 
-			host="conf/join-mock.xml"
-			onAppInitEvent="LOAD" loadNextModule="ChatModule"
-			onAppStartEvent="START"
-			onUserLogoutEvent="STOP"
-	/>
-	
-
-	<module name="ListenersModule" url="ListenersModule.swf" 
-			uri="rtmp://localhost/bigbluebutton" 
-			recordingHost="http://localhost"
-			loadNextModule="VideoModule"
-			onUserJoinedEvent="START"
-			onUserLogoutEvent="STOP"
-	/>
-	<module name="PresentationModule" url="PresentationModule.swf" 
-			uri="rtmp://localhost/bigbluebutton" 
-			host="http://localhost:8080" 
-			loadNextModule="ListenersModule"
-			onUserJoinedEvent="START" 
-			onUserLogoutEvent="STOP"
-	/>
-
-</modules>
\ No newline at end of file