[Qtitools-commits] SF.net SVN: qtitools:[2456] trunk/projects/QTIEngine/grails-app

[<bar...@us...>]

Revision: 2456
          http://qtitools.svn.sourceforge.net/qtitools/?rev=2456&view=rev
Author:   bartnagel
Date:     2010-04-14 17:35:29 +0000 (Wed, 14 Apr 2010)

Log Message:
-----------
set default serverURL strings

Modified Paths:
--------------
    trunk/projects/QTIEngine/grails-app/conf/Config.groovy
    trunk/projects/QTIEngine/grails-app/controllers/RestController.groovy
    trunk/projects/QTIEngine/grails-app/services/RestService.groovy

Modified: trunk/projects/QTIEngine/grails-app/conf/Config.groovy
===================================================================
--- trunk/projects/QTIEngine/grails-app/conf/Config.groovy	2010-04-13 10:17:59 UTC (rev 2455)
+++ trunk/projects/QTIEngine/grails-app/conf/Config.groovy	2010-04-14 17:35:29 UTC (rev 2456)
@@ -35,8 +35,11 @@
 // set per-environment serverURL stem for creating absolute links
 environments {
     production {
-        grails.serverURL = "http://www.changeme.com"
+        grails.serverURL = "http://qtiengine.qtitools.org"
     }
+	development {
+		grails.serverURL = "http://localhost:8080"
+	}
 }
 
 // log4j configuration

Modified: trunk/projects/QTIEngine/grails-app/controllers/RestController.groovy
===================================================================
--- trunk/projects/QTIEngine/grails-app/controllers/RestController.groovy	2010-04-13 10:17:59 UTC (rev 2455)
+++ trunk/projects/QTIEngine/grails-app/controllers/RestController.groovy	2010-04-14 17:35:29 UTC (rev 2456)
@@ -218,7 +218,7 @@
 			Map itemParams = new HashMap();
 			itemParams.put("showInternalState", true);
 			itemParams.put("displayTitle", true);
-			itemParams.put("appletCodebase", grailsApplication.config.server.url.toString()+"/applets");
+			itemParams.put("appletCodebase", grailsApplication.config.grails.serverURL.toString()+"/applets");
 			if (validation) itemParams.put("validation", validation)
 
 			Map assessmentParams = new HashMap();

Modified: trunk/projects/QTIEngine/grails-app/services/RestService.groovy
===================================================================
--- trunk/projects/QTIEngine/grails-app/services/RestService.groovy	2010-04-13 10:17:59 UTC (rev 2455)
+++ trunk/projects/QTIEngine/grails-app/services/RestService.groovy	2010-04-14 17:35:29 UTC (rev 2456)
@@ -86,12 +86,12 @@
 
 		//change script src
 		xml.head.script.each {
-			it.@src = it...@sr...().replaceAll("\\.\\./\\.\\.", grailsApplication.config.server.url.toString())
+			it.@src = it...@sr...().replaceAll("\\.\\./\\.\\.", grailsApplication.config.grails.serverURL.toString())
 		}
 
 		//change link href
 		xml.head.link.each {
-			it.@href = it...@hr...().replaceAll("\\.\\./\\.\\.", grailsApplication.config.server.url.toString())
+			it.@href = it...@hr...().replaceAll("\\.\\./\\.\\.", grailsApplication.config.grails.serverURL.toString())
 		}
 
 		//We may also need javascript later
@@ -126,7 +126,7 @@
 		{
 			xml.body.'**'.findAll{it.name() == "img"}.each {
 				println "img"
-				it.@sr...@sr...().replaceAll("\\.\\./\\.\\.", grailsApplication.config.server.url.toString())
+				it.@sr...@sr...().replaceAll("\\.\\./\\.\\.", grailsApplication.config.grails.serverURL.toString())
 			}
 		}
 
@@ -138,10 +138,10 @@
 
 		//change java applet codedbase
 		xml.body.'**'.findAll{it.name() == "applet"}.each{ applet->
-			applet.@codebase = ap...@co...().replaceAll("\\.\\./\\.\\.", grailsApplication.config.server.url.toString())
+			applet.@codebase = ap...@co...().replaceAll("\\.\\./\\.\\.", grailsApplication.config.grails.serverURL.toString())
 			applet.'**'.findAll{it.name() == "param"}.each{ param->
 				//replace .. with server url, this might now be correct in some cases
-				param.@value = pa...@va...().replaceAll("\\.\\.", grailsApplication.config.server.url.toString())
+				param.@value = pa...@va...().replaceAll("\\.\\.", grailsApplication.config.grails.serverURL.toString())
 			}
 		}
 		return xml


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.