From 5a7ca059b315a3b08e6f751d6fbcd6a64f197777 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Wed, 29 Apr 2009 21:09:37 +0000
Subject: [PATCH] - put bigbluebutton web server url into properties file

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1339 af16638f-c34d-0410-8cfa-b39d5352b314
---
 .../grails-app/conf/bigbluebutton.properties          |  2 ++
 .../PublicScheduledSessionController.groovy           | 11 +++++++----
 .../web/controllers/ScheduledSessionController.groovy |  4 +++-
 .../grails-app/views/scheduledSession/show.gsp        |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
index 2a13f0d9f0..b1286986ea 100644
--- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
+++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -5,6 +5,8 @@ asterisk.host=192.168.0.101
 ami.user=ralam
 ami.password=secure
 
+bigbluebutton.web.serverURL=http://localhost:8080
+
 # we separate these so we can inject it manually
 # to test PresentationService.groovy
 swfTools=C:/swftools-0.9
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
index 244857460a..7b75a0d5a6 100644
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
@@ -2,8 +2,10 @@ package org.bigbluebutton.web.controllers
 
 import org.bigbluebutton.web.domain.ScheduledSession
 import grails.converters.*
+import org.codehaus.groovy.grails.commons.*
 
-class PublicScheduledSessionController {
+class PublicScheduledSessionController {
+		
 	def index = {
 	    redirect(action:show)
 	}
@@ -23,7 +25,8 @@ class PublicScheduledSessionController {
 	        redirect(action:joinIn)
 	    }
 	    else { 
-	      	def hostUrl = grailsApplication.config.grails.serverURL
+	    	def config = ConfigurationHolder.config
+        	def hostUrl = config.bigbluebutton.web.serverURL
 	       	def now = new Date().time
 	       	
 	       	def inSession = ((now > scheduledSessionInstance.startDateTime.time) && (now < scheduledSessionInstance.endDateTime.time))
@@ -90,8 +93,8 @@ class PublicScheduledSessionController {
 			}
 		    	
 		    println 'rendering signIn'
-		    //render(view:"signIn")
-		    def hostUrl = grailsApplication.config.grails.serverURL
+		    def config = ConfigurationHolder.config
+        	def hostUrl = config.bigbluebutton.web.serverURL
 		    redirect(url:"$hostUrl/client/BigBlueButton.html")			
 		}
 		
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ScheduledSessionController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ScheduledSessionController.groovy
index eafefd181a..51e9c57ded 100644
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ScheduledSessionController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ScheduledSessionController.groovy
@@ -4,6 +4,7 @@ import org.bigbluebutton.web.domain.ScheduledSession
 import java.util.UUID
 import org.bigbluebutton.web.domain.User
 import org.bigbluebutton.web.domain.Conference
+import org.codehaus.groovy.grails.commons.*
 
 class ScheduledSessionController {
     
@@ -25,7 +26,8 @@ class ScheduledSessionController {
             redirect(action:list)
         }
         else { 
-        	def hostUrl = grailsApplication.config.grails.serverURL
+        	def config = ConfigurationHolder.config
+        	def hostUrl = config.bigbluebutton.web.serverURL
         	
         	return [ scheduledSessionInstance : scheduledSessionInstance, hostUrl:hostUrl ] 
         }
diff --git a/bigbluebutton-web/grails-app/views/scheduledSession/show.gsp b/bigbluebutton-web/grails-app/views/scheduledSession/show.gsp
index 9618aa45a5..304d6174f0 100644
--- a/bigbluebutton-web/grails-app/views/scheduledSession/show.gsp
+++ b/bigbluebutton-web/grails-app/views/scheduledSession/show.gsp
@@ -38,7 +38,7 @@
                         <tr class="prop">
                             <td valign="top" class="name">Link:</td>                            
                             <td valign="top" class="value">
-                            	${hostUrl}/${scheduledSessionInstance.tokenId}
+                            	${hostUrl}/conference-session/joinIn/${scheduledSessionInstance.tokenId}
 							</td>                            
                         </tr>