move all code to submodules that depend on grails-web-common

.gitignore

@@ -75,3 +75,5 @@ target
 /grails-web-jsp/bin/
 /grails-web-mvc/bin/
 /grails-web-sitemesh/bin/
+/grails-project-api/bin/
+/grails-web-common/bin/

grails-web-common/build.gradle

@@ -0,0 +1,40 @@
+dependencies {
+    compile project(":grails-core"),
+            project(":grails-spring"),
+            project(":grails-async"),
+            project(":grails-databinding"),
+            project(':grails-plugin-domain-class')
+
+    compile('commons-fileupload:commons-fileupload:1.3.1')
+    compile "commons-collections:commons-collections:${commonsCollectionsVersion}"
+
+    compile( "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${concurrentlinkedhashmapVersion}" ) {
+        exclude group: 'commons-logging', module:'commons-logging'
+    }
+
+    compile "org.springframework:spring-webmvc:${springVersion}"
+    compile "org.springframework:spring-context-support:${springVersion}"
+
+    // Needed by GSP tag library resolver
+    compile 'xpp3:xpp3_min:1.1.4c'
+
+    compile 'com.google.code.gson:gson:2.2.4'
+
+    // Required for AspectJ support
+    runtime "org.springframework:spring-aspects:${springVersion}"
+    runtime "org.aspectj:aspectjrt:$aspectjVersion",
+            "org.aspectj:aspectjweaver:$aspectjVersion"
+
+
+    optional "junit:junit:${junitVersion}"
+    optional "org.apache.ant:ant:${antVersion}"
+    optional "jline:jline:$jlineVersion"
+    optional "org.fusesource.jansi:jansi:$jansiVersion"
+
+    optional("org.codehaus.gant:gant_groovy1.8:${gantVersion}") {
+        exclude group:'commons-cli', module:'commons-cli'
+    }
+
+    compile 'org.objenesis:objenesis:1.4'
+}
+

grails-web-gsp/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    compile project(":grails-web-common")
+}

grails-web-jsp/build.gradle

@@ -1,3 +1,51 @@
+configurations {
+    jsp21.extendsFrom compile
+    optional
+}
+
 dependencies {
-    compile project(":grails-web")
+    compile project(":grails-web-common")
+
+    // Required for JSP support
+    jsp21 'javax.servlet.jsp:jsp-api:2.1'
+    compile 'javax.servlet:jsp-api:2.0', {
+        ext.notInPom = true
+        exclude group: 'javax.servlet', module:'servlet-api'
+    }
+
+    // Required for tag library support
+    runtime 'taglibs:standard:1.1.2'
+    runtime "javax.servlet:jstl:1.1.2"
+}
+
+sourceSets {
+    main {
+        compileClasspath += files(configurations.optional)
+    }
+    jsp21 {
+        compileClasspath = files(configurations.jsp21, main.output)
+        groovy.srcDirs = ['src/jsp21/groovy']
+        resources.srcDirs = []
+    }
+}
+
+javadoc.classpath += files(configurations.optional)
+jar {
+    from compileJsp21Groovy.outputs.files
+}
+
+eclipse {
+    classpath {
+        plusConfigurations += configurations.jsp21
+        file {
+            whenMerged { classpath ->
+                // move jsp-api-2.1 to the last one in entries so that it appears after -2.0
+                def jsp21 = classpath.entries.find { entry -> entry?.path =~ /jsp-api-2.1.jar$/ }
+                if (jsp21) {
+                    classpath.entries.remove(jsp21)
+                    classpath.entries << jsp21
+                }
+            }
+        }
+    }
 }

grails-web-mvc/build.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    compile project(":grails-web")
+    compile project(":grails-web-common")
 }

grails-web-sitemesh/build.gradle

@@ -1,3 +1,5 @@
 dependencies {
-    compile project(":grails-web")
+    compile project(":grails-web-common")
+
+    compile 'opensymphony:sitemesh:2.4'
 }

grails-web/build.gradle

@@ -1,89 +1,7 @@
-configurations {
-    jsp21.extendsFrom compile
-    optional
-}
-
 dependencies {
-    compile project(":grails-core"),
-            project(":grails-spring"),
-            project(":grails-async"),
-            project(":grails-databinding"),
-            project(':grails-plugin-domain-class')
-
-    compile('commons-fileupload:commons-fileupload:1.3.1')
-    compile "commons-collections:commons-collections:${commonsCollectionsVersion}"
-
-    compile( "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${concurrentlinkedhashmapVersion}" ) {
-        exclude group: 'commons-logging', module:'commons-logging'
-    }
-    compile 'opensymphony:sitemesh:2.4'
-    compile "junit:junit:${junitVersion}"
-
-    compile "org.springframework:spring-webmvc:${springVersion}"
-    compile "org.springframework:spring-context-support:${springVersion}"
-
-    // Required for JSP support
-    jsp21 'javax.servlet.jsp:jsp-api:2.1'
-    compile 'javax.servlet:jsp-api:2.0', {
-        ext.notInPom = true
-        exclude group: 'javax.servlet', module:'servlet-api'
-    }
-
-    // Needed by GSP tag library resolver
-    compile 'xpp3:xpp3_min:1.1.4c'
-
-    compile 'com.google.code.gson:gson:2.2.4'
-
-    // Required for tag library support
-    runtime 'taglibs:standard:1.1.2'
-    runtime "javax.servlet:jstl:1.1.2"
-
-    // Required for AspectJ support
-    runtime "org.springframework:spring-aspects:${springVersion}"
-    runtime "org.aspectj:aspectjrt:$aspectjVersion",
-            "org.aspectj:aspectjweaver:$aspectjVersion"
-
-
-
-    optional "org.apache.ant:ant:${antVersion}"
-    optional "jline:jline:$jlineVersion"
-    optional "org.fusesource.jansi:jansi:$jansiVersion"
-
-    optional("org.codehaus.gant:gant_groovy1.8:${gantVersion}") {
-        exclude group:'commons-cli', module:'commons-cli'
-    }
-
-    compile 'org.objenesis:objenesis:1.4'
-}
-
-sourceSets {
-    main {
-        compileClasspath += files(configurations.optional)
-    }
-    jsp21 {
-        compileClasspath = files(configurations.jsp21, main.output)
-        groovy.srcDirs = ['src/jsp21/groovy']
-        resources.srcDirs = []
-    }
-}
-
-javadoc.classpath += files(configurations.optional)
-jar {
-    from compileJsp21Groovy.outputs.files
-}
-
-eclipse {
-    classpath {
-        plusConfigurations += configurations.jsp21
-        file {
-            whenMerged { classpath ->
-                // move jsp-api-2.1 to the last one in entries so that it appears after -2.0
-                def jsp21 = classpath.entries.find { entry -> entry?.path =~ /jsp-api-2.1.jar$/ }
-                if (jsp21) {
-                    classpath.entries.remove(jsp21)
-                    classpath.entries << jsp21
-                }
-            }
-        }
-    }
+    compile project(":grails-web-common")
+    compile project(":grails-web-gsp")
+    compile project(":grails-web-jsp")
+    compile project(":grails-web-mvc")
+    compile project(":grails-web-sitemesh")
 }

settings.gradle

@@ -13,6 +13,7 @@ include 'grails-aether',
         'grails-spring',
         'grails-test',
         'grails-web',
+        'grails-web-common',
         'grails-web-mvc',
         'grails-web-gsp',
         'grails-web-sitemesh',