fix for GRAILS-1262

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

Author: graeme

scripts/Package.groovy

@@ -25,6 +25,7 @@
 import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU
 import groovy.text.SimpleTemplateEngine
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver
+import org.springframework.core.io.*
 import org.codehaus.groovy.grails.plugins.*
 import org.codehaus.groovy.grails.commons.*
 import org.codehaus.groovy.control.*    
@@ -156,7 +157,7 @@ task( generateWebXml : "Generates the web.xml file") {
 
         def classLoader = new GroovyClassLoader(parentLoader,compConfig,true)
 
-        pluginManager = new DefaultGrailsPluginManager(["*GrailsPlugin.groovy", "plugins/*/*GrailsPlugin.groovy"] as String[], new DefaultGrailsApplication(new Class[0], classLoader))
+        pluginManager = new DefaultGrailsPluginManager(pluginResources as Resource[], new DefaultGrailsApplication(new Class[0], classLoader))
     	PluginManagerHolder.setPluginManager(pluginManager)
 
     	def webXml = resolver.getResource("file:${basedir}/web-app/WEB-INF/web.template.xml")

scripts/PackagePlugins.groovy

@@ -28,7 +28,8 @@ GCL = new GroovyClassLoader()
 Ant.property(environment:"env")   
 grailsHome = Ant.antProject.properties."env.GRAILS_HOME"    
 
-includeTargets << new File ( "${grailsHome}/scripts/Init.groovy" )
+includeTargets << new File ( "${grailsHome}/scripts/Init.groovy" ) 
+pluginResources = []
 
 task ( "default" : "Performs packaging of Grails plugins for when they are distributed as part of a WAR") {
    packagePlugins()                                                      
@@ -38,12 +39,17 @@ task( packagePlugins : "Packages any Grails plugins that are installed for this
 	depends( classpath )   
 	Ant.mkdir(dir:"${basedir}/web-app/WEB-INF/lib")
 	try {
-	   	def plugins = resolveResources("**GrailsPlugin.groovy").toList()
-	    def basePlugin 
-	    if(plugins)basePlugin = plugins[0]
-	
-		plugins += resolveResources("plugins/*/*GrailsPlugin.groovy").toList()
-	   	plugins?.each { p ->  	   
+	  
+	    def basePluginFile = baseFile.listFiles().find { it.name.endsWith("GrailsPlugin.groovy")}
+		def basePlugin = null
+
+		if(basePluginFile) {
+			basePlugin = new org.springframework.core.io.FileSystemResource(basePluginFile)
+			pluginResources << basePlugin			
+		}                        
+
+		pluginResources += resolveResources("plugins/*/*GrailsPlugin.groovy").toList()
+	   	pluginResources?.each { p ->  	   
 	   		def pluginBase = p.file.parentFile.canonicalFile
 	     	def pluginPath = pluginBase.absolutePath
 			def pluginName = pluginBase.name