Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

moved JSP21 support compilation into 'grails-web' subproject

  • Loading branch information...
commit c4e9d6b31465cf9e9d03545058f89c29bd1ef865 1 parent a52db8f
@graemerocher graemerocher authored
View
37 build.gradle
@@ -17,45 +17,13 @@ sourceCompatibility = "1.5"
targetCompatibility = "1.5"
archivesBaseName = 'grails'
-configurations {
- compile.transitive = false
- jsp21.extendsFrom compile
-}
repositories {
mavenRepo urls:"http://maven.springframework.org/release"
}
sourceSets {
- main {
- java {
- srcDirs = []
- }
- groovy {
- srcDirs = ['src/java']
- }
- resources {
- srcDirs = ['src/java']
- include '**/*.properties', '**/*.xsd', '**/*.dtd'
- }
- }
- jsp21 {
- compileClasspath = files(configurations.jsp21, main.classes)
- groovy.srcDirs = ['src/jsp21']
- resources.srcDirs = []
- }
- test {
- java {
- srcDirs = []
- }
- groovy {
- srcDirs = ['src/test']
- }
- resources {
- srcDirs = ['src/test', 'src/jar']
- exclude '**/*.java', '**/*.groovy'
- }
- }
+
buildScripts {
compileClasspath = sourceSets.main.compileClasspath + main.classes
classesDir = "$buildDir/compiled-scripts" as File
@@ -204,9 +172,6 @@ subprojects {
}
-jsp21Classes.dependsOn classes
-task allClasses(dependsOn: [classes, jsp21Classes, buildScriptsClasses])
-
configure([compileGroovy, compileTestGroovy]) {
groovyOptions.fork(memoryInitialSize: '128M', memoryMaximumSize: '1G')
groovyOptions.encoding = "UTF-8"
View
2  build.properties
@@ -1,3 +1,5 @@
+grails.version=1.4.0.BUILD-SNAPSHOT
+
# Bundlor dependency versions
bundlor.javax.persistence.version=1.0.2.GA
bundlor.webflow.version=2.0.8
View
12 gradle/assemble.gradle
@@ -27,14 +27,14 @@ task libs(dependsOn: getTasksByName("jar", true)) {
destinationDir = 'dist'
doLast {
- subprojects.each { project ->
- copy {
+ copy {
+ for(project in subprojects) {
from( project.libsDir ) {
- includes "*-${version}.jar"
+ include "*-${version}.jar"
}
- into 'dist'
- }
- }
+ }
+ into 'dist'
+ }
}
}
View
7 grails-bootstrap/build.gradle
@@ -4,4 +4,11 @@ repositories {
dependencies {
groovy group: 'org.codehaus.groovy', name: 'groovy-all', version: '1.8.0-beta-4'
}
+
+compileGroovy.doFirst {
+ ant.mkdir(dir:sourceSets.main.classesDir)
+ ant.propertyfile(file:"${sourceSets.main.classesDir}/grails.build.properties") {
+ entry key:"grails.version", value:version
+ }
+}
jar.appendix = 'bootstrap'
View
5 grails-core/build.gradle
@@ -1,7 +1,12 @@
dependencies {
compile project(":grails-bootstrap"), project(":grails-spring")
}
+
compileGroovy.doFirst {
delete("${buildDir}/classes/main/META-INF")
+ ant.mkdir(dir:sourceSets.main.classesDir)
+ ant.propertyfile(file:"${sourceSets.main.classesDir}/grails.build.properties") {
+ entry key:"grails.version", value:version
+ }
}
jar.appendix = 'core'
View
23 grails-web/build.gradle
@@ -1,4 +1,27 @@
+configurations {
+ jsp21.extendsFrom compile
+}
dependencies {
+ jsp21 'javax.servlet.jsp:jsp-api:2.1'
+
compile project(":grails-bootstrap"), project(":grails-core"), project(":grails-spring")
}
+sourceSets {
+ jsp21 {
+ compileClasspath = files(configurations.jsp21, main.classes)
+ groovy.srcDirs = ['src/jsp21/groovy']
+ resources.srcDirs = []
+ }
+}
+
+task addJsp21Classes(dependsOn:compileJsp21Groovy) {
+ doFirst {
+ copy {
+ from sourceSets.jsp21.classes
+ into sourceSets.main.classesDir
+ }
+ }
+}
+assemble.dependsOn addJsp21Classes
+
jar.appendix = 'web'
View
0  ...ges/ext/jsp/GroovyPagesJspApplicationContext.java → ...ges/ext/jsp/GroovyPagesJspApplicationContext.java
File renamed without changes
View
0  .../web/pages/ext/jsp/GroovyPagesJspFactory21.groovy → .../web/pages/ext/jsp/GroovyPagesJspFactory21.groovy
File renamed without changes
View
0  ...web/pages/ext/jsp/GroovyPagesPageContext21.groovy → ...web/pages/ext/jsp/GroovyPagesPageContext21.groovy
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.