Merge commit '1ae722ad339bd86859eb1bc8cc43090ed89a2539' into dependen…

…cy-management-refactor Conflicts: grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
grails · Mar 31, 2011 · d6af8cb · d6af8cb
2 parents 1717e98 + 1ae722a
commit d6af8cb
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 28 deletions.
diff --git a/build.properties b/build.properties
@@ -13,7 +13,7 @@ bundlor.servlet.version=2.5.0
 bundlor.jndi.version=1.2.0
 bundlor.servlet.jsp.version=2.1.0
 bundlor.radeox.version=1.0.0.b2
-bundlor.groovy.version=1.8.0.beta4
+bundlor.groovy.version=1.8.0.rc-1
 bundlor.spring.version=3.0.5.RELEASE
 bundlor.ant.version=1.8.1
 bundlor.ivy.version=2.0.0

diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
@@ -17,12 +17,17 @@ dependencyCache = {
 				project.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each(includeClosure) 
 				project.configurations.findByName("jsp21")?.resolvedConfiguration?.resolvedArtifacts?.each(includeClosure) 
 			}
-
 			includes = dependencyIncludes as List
-			exclude "org.grails/**"
+          exclude "org.grails/**"
 		}
 		into "$projectDir/lib"
 	}
+	copy {
+	    from ( cacheLocation ) {
+	        includes = ['org.grails/grails-datastore-gorm/jars/grails-datastore-gorm-*.jar']
+	    }
+	    into "$projectDir/lib"
+	}
 
 }
 

diff --git a/grails-bootstrap/build.gradle b/grails-bootstrap/build.gradle
@@ -14,7 +14,9 @@ dependencies {
             "org.apache.ivy:ivy:${ivyVersion}",
             'org.codehaus.gant:gant_groovy1.7:1.9.3'
 
-    runtime 'org.coconut.forkjoin:jsr166y:070108'
+    runtime 'org.coconut.forkjoin:jsr166y:070108',
+            'org.fusesource.jansi:jansi:1.2.1',
+            'jline:jline:0.9.94'
 }
 
 processResources{

diff --git a/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy b/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
@@ -514,7 +514,7 @@ class BuildSettings extends AbstractBuildSettings {
         coreDependencies = new GrailsCoreDependencies(grailsVersion)
 
         // If 'grailsHome' is set, add the JAR file dependencies.
-        defaultPluginMap = [hibernate:grailsVersion, tomcat:grailsVersion]
+        defaultPluginMap = [hibernate:grailsVersion, tomcat:grailsVersion, jquery:null]
         defaultPluginSet = defaultPluginMap.keySet()
 
         // Update the base directory. This triggers some extra config.

diff --git a/...-uber/src/test/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy b/...-uber/src/test/groovy/org/codehaus/groovy/grails/resolve/IvyDependencyManagerTests.groovy
@@ -557,7 +557,7 @@ class IvyDependencyManagerTests extends GroovyTestCase {
         }
 
         assertTrue( "all default dependencies should be inherited", manager.dependencyDescriptors.every { it.inherited == true } )
-        assertEquals 51, manager.dependencyDescriptors.findAll { it.scope == 'compile'}.size()
+        assertEquals 53, manager.dependencyDescriptors.findAll { it.scope == 'compile'}.size()
         assertEquals 17, manager.dependencyDescriptors.findAll { it.scope == 'runtime'}.size()
         assertEquals 4, manager.dependencyDescriptors.findAll { it.scope == 'test'}.size()
         assertEquals 19, manager.dependencyDescriptors.findAll { it.scope == 'build'}.size()
@@ -582,7 +582,7 @@ class IvyDependencyManagerTests extends GroovyTestCase {
         assertEquals 0, manager.dependencyDescriptors.findAll { it.scope == 'runtime'}.size()
         assertEquals 4, manager.dependencyDescriptors.findAll { it.scope == 'test'}.size()
         assertEquals 19, manager.dependencyDescriptors.findAll { it.scope == 'build'}.size()
-        assertEquals 70, manager.dependencyDescriptors.findAll { it.scope == 'provided'}.size()
+        assertEquals 72, manager.dependencyDescriptors.findAll { it.scope == 'provided'}.size()
         assertEquals 3, manager.dependencyDescriptors.findAll { it.scope == 'docs'}.size()
 
         manager = new IvyDependencyManager("project", "0.1",settings)
@@ -593,7 +593,7 @@ class IvyDependencyManagerTests extends GroovyTestCase {
             defaultDependencyClosure()
         }
 
-        assertEquals 51, manager.dependencyDescriptors.findAll { it.scope == 'compile'}.size()
+        assertEquals 53, manager.dependencyDescriptors.findAll { it.scope == 'compile'}.size()
         assertEquals 17, manager.dependencyDescriptors.findAll { it.scope == 'runtime'}.size()
         assertEquals 4, manager.dependencyDescriptors.findAll { it.scope == 'test'}.size()
         assertEquals 19, manager.dependencyDescriptors.findAll { it.scope == 'build'}.size()

diff --git a/scripts/_GrailsPluginDev.groovy b/scripts/_GrailsPluginDev.groovy
@@ -17,13 +17,14 @@
 import groovy.xml.MarkupBuilder
 import grails.util.GrailsNameUtils
 import grails.util.PluginBuildSettings
-import grails.util.GrailsUtil
+
 import org.apache.commons.io.FilenameUtils
 import org.apache.ivy.core.report.ArtifactDownloadReport
 
-import org.codehaus.groovy.grails.compiler.support.GrailsResourceLoaderHolder
 import org.codehaus.groovy.grails.plugins.GrailsPluginUtils
 import org.codehaus.groovy.grails.resolve.IvyDependencyManager
+
+import grails.util.GrailsUtil
 import org.codehaus.groovy.grails.plugins.publishing.PluginPackager
 
 /**
@@ -40,7 +41,7 @@ includeTargets << grailsScript("_GrailsPackage")
 pluginIncludes = PluginPackager.INCLUDED_RESOURCES
 pluginExcludes = PluginPackager.EXCLUDED_RESOURCES
 
-target(packagePlugin:"Implementation target") {
+target(packagePlugin: "Implementation target") {
     depends(checkVersion, parseArguments, packageApp)
 
     def pluginFile
@@ -53,17 +54,17 @@ target(packagePlugin:"Implementation target") {
 
     if (!pluginFile) ant.fail("Plugin file not found for plugin project")
 
-	def pluginBaseDir = pluginFile.parentFile.absolutePath
-	plugin = pluginSettings.getPluginInfo(pluginBaseDir)
+    def pluginBaseDir = pluginFile.parentFile.absolutePath
+    plugin = pluginSettings.getPluginInfo(pluginBaseDir)
     def resourceList = pluginSettings.getArtefactResourcesForOne(pluginBaseDir)
-
-	def packager = new PluginPackager(plugin,resourceList, new File(projectWorkDir))
-	packager.ant = ant
-	packager.resourcesDir = new File(resourcesDirPath)
-	packager.hasApplicationDependencies = grailsSettings.dependencyManager.hasApplicationDependencies()
 
-	def pluginGrailsVersion = "${GrailsUtil.grailsVersion} > *"	
-	def lowerVersion = GrailsPluginUtils.getLowerVersion(pluginGrailsVersion)
+    def packager = new PluginPackager(plugin, resourceList, new File(projectWorkDir))
+    packager.ant = ant
+    packager.resourcesDir = new File(resourcesDirPath)
+    packager.hasApplicationDependencies = grailsSettings.dependencyManager.hasApplicationDependencies()
+
+    def pluginGrailsVersion = "${GrailsUtil.grailsVersion} > *"
+    def lowerVersion = GrailsPluginUtils.getLowerVersion(pluginGrailsVersion)
 
     boolean supportsAtLeastVersion
     try {
@@ -83,19 +84,21 @@ target(packagePlugin:"Implementation target") {
         }
 
         if (deps) {
-			packager.jarFiles = deps.collect { it.localFile }
+            packager.jarFiles = deps.collect { it.localFile }
         }
     }
-		
+
     event("PackagePluginStart", [plugin.name])
 
     // Package plugin's zip distribution
-	if(argsMap.binary) {
-	    pluginZip = packager.packageBinary(plugin.name, classesDir, grailsSettings.projectTargetDir)		
-	}
-	else {
-	    pluginZip = packager.packagePlugin(plugin.name, classesDir, grailsSettings.projectTargetDir)
-	}
+    if (argsMap.binary) {
+        def descriptor = pluginSettings.getBasePluginDescriptor()
+        generatePluginXml(descriptor.file, false)
+        pluginZip = packager.packageBinary(plugin.name, classesDir, grailsSettings.projectTargetDir)
+    }
+    else {
+        pluginZip = packager.packagePlugin(plugin.name, classesDir, grailsSettings.projectTargetDir)
+    }
 
 
     event("PackagePluginEnd", [plugin.name])