fix for GRAILS-1541

git-svn-id: https://svn.codehaus.org/grails/trunk@5332 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/groovy/org/codehaus/groovy/grails/plugins/web/mapping/UrlMappingsGrailsPlugin.groovy

@@ -18,12 +18,16 @@ package org.codehaus.groovy.grails.plugins.web.mapping;
 import grails.util.GrailsUtil
 import org.codehaus.groovy.grails.web.mapping.*
 import org.codehaus.groovy.grails.commons.*
+import org.springframework.context.ApplicationContext
+import org.springframework.aop.target.HotSwappableTargetSource
+import org.springframework.aop.framework.ProxyFactoryBean
+
 /**
- * A plug-in that handles the configuration of URL mappings for Grails
- *
- * @author Graeme Rocher
- * @since 0.4
- */
+* A plug-in that handles the configuration of URL mappings for Grails
+*
+* @author Graeme Rocher
+* @since 0.4
+*/
 class UrlMappingsGrailsPlugin {
 
 	def watchedResources = ["file:./grails-app/conf/*UrlMappings.groovy"]
@@ -32,24 +36,31 @@ class UrlMappingsGrailsPlugin {
 	def dependsOn = [core:version]
 
 	def doWithSpring = {
-		grailsUrlMappingsHolder(UrlMappingsHolderFactoryBean) {
+		grailsUrlMappingsHolderBean(UrlMappingsHolderFactoryBean) {
             grailsApplication = ref("grailsApplication", true)
-        }		
-	}   
-	
-    def doWithApplicationContext = { ctx ->
-        def beans = beans {
-            grailsUrlMappingsHolder(UrlMappingsHolderFactoryBean) {
-                grailsApplication = ref("grailsApplication", true)
-            }
         }
-        ctx.registerBeanDefinition(UrlMappingsHolder.BEAN_ID, beans.getBeanDefinition(UrlMappingsHolder.BEAN_ID))	
+        urlMappingsTargetSource(org.springframework.aop.target.HotSwappableTargetSource, grailsUrlMappingsHolderBean)
+        grailsUrlMappingsHolder(ProxyFactoryBean) {
+            targetSource = urlMappingsTargetSource
+            proxyInterfaces = [org.codehaus.groovy.grails.web.mapping.UrlMappingsHolder]
+        }
+	}
+
+    def doWithApplicationContext = { ApplicationContext ctx ->
+        def beans = beans(doWithSpring)
+        beans.registerBeans(ctx)        	
 	}
 
 	def onChange = { event ->
 	    if(application.isUrlMappingsClass(event.source)) {
 	        application.addArtefact( UrlMappingsArtefactHandler.TYPE, event.source )	        
-			doWithApplicationContext(event.ctx)
+
+			def factory = new UrlMappingsHolderFactoryBean(grailsApplication:application)
+			factory.afterPropertiesSet()
+			def mappings = factory.getObject()
+
+			HotSwappableTargetSource ts = event.ctx.getBean("urlMappingsTargetSource")
+			ts.swap mappings			
         }
 	}
 }

src/groovy/org/codehaus/groovy/grails/plugins/web/taglib/ApplicationTagLib.groovy

@@ -25,11 +25,15 @@ package org.codehaus.groovy.grails.plugins.web.taglib
 import org.springframework.validation.Errors;
 import org.springframework.context.NoSuchMessageException;
 import org.springframework.web.servlet.support.RequestContextUtils as RCU;
-import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU;
+import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU
+import org.springframework.context.ApplicationContextAware
+import org.springframework.context.ApplicationContext;
 
-class ApplicationTagLib { 
-	
-	def grailsUrlMappingsHolder
+class ApplicationTagLib implements ApplicationContextAware {
+
+    ApplicationContext applicationContext
+
+    def grailsUrlMappingsHolder
 
     /**
      * Creates a link to a resource, generally used as a method rather than a tag.
@@ -100,7 +104,8 @@ class ApplicationTagLib {
 		}
         def url
         if(id != null) params.id = id
-        def mapping = grailsUrlMappingsHolder.getReverseMapping(controller,action,params)
+        def urlMappings = applicationContext.getBean("grailsUrlMappingsHolder")
+        def mapping = urlMappings.getReverseMapping(controller,action,params)
         url = mapping.createURL(controller, action, params, request.characterEncoding)
         out << response.encodeURL(url)
     }