Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Started migrating base test harnesses into new test-suite subproject

  • Loading branch information...
commit a8a051cd9d111397eff77b88ecda9cafad9e0c7f 1 parent eccd8ca
graemerocher graemerocher authored
14 build.gradle
@@ -69,12 +69,20 @@ subprojects {
69 69 apply plugin: 'eclipse'
70 70 apply plugin: 'maven'
71 71
  72 + manifest.mainAttributes(
  73 + "Built-By": System.properties['user.name'],
  74 + "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")",
  75 + "Implementation-Title": "Grails",
  76 + "Ant-Version": 'Apache Ant 1.7.1', // todo we just have this property to make it easy to compare manifests. Remove it when this build is life
  77 + "Implementation-Version": version,
  78 + "Implementation-Vendor": 'grails.org')
  79 +
72 80 group = "org.grails"
73 81 version = grailsVersion
74 82 archivesBaseName = "grails"
75 83
76 84 configurations {
77   - compile.transitive = false
  85 + compile.transitive = true
78 86 jsp21.extendsFrom compile
79 87 }
80 88 repositories {
@@ -210,9 +218,9 @@ configure([compileJava, compileTestJava]) {
210 218 apply {
211 219 from 'gradle/docs.gradle'
212 220 from 'gradle/assemble.gradle'
213   - from 'gradle/unit-test.gradle'
  221 +/* from 'gradle/unit-test.gradle'
214 222 from 'gradle/maven.gradle'
215   - from 'gradle/findbugs.gradle'
  223 + from 'gradle/findbugs.gradle'*/
216 224 }
217 225
218 226 clean {
219 gradle/assemble.gradle
... ... @@ -1,19 +1,5 @@
1 1 import org.apache.tools.ant.filters.ReplaceTokens
2 2
3   -// todo Ask why startGrails and startGrails.bat live in two different locations (one with placeholder, the other probably manually maintained)
4   -// todo Retrieve bundlor zip via dependency DSL
5   -// todo Retrieve svn plugins via dependency DSL (ask regarding SNAPSHOTS)
6   -// todo Add correct description to all Jar tasks
7   -
8   -manifest.mainAttributes(
9   - "Built-By": System.properties['user.name'],
10   - "Created-By": System.properties['java.vm.version'] + " (" + System.properties['java.vm.vendor'] + ")",
11   - "Implementation-Title": "Grails",
12   - "Ant-Version": 'Apache Ant 1.7.1', // todo we just have this property to make it easy to compare manifests. Remove it when this build is life
13   - "Implementation-Version": version,
14   - "Implementation-Vendor": 'grails.org')
15   -
16   -// todo Once the base Java plugin is out, we will use this and then there will be no default jar and we can remove this line.
17 3 jar.enabled = false
18 4
19 5 tasks.withType(Jar).allObjects {jar ->
@@ -22,68 +8,6 @@ tasks.withType(Jar).allObjects {jar ->
22 8 jar.appFileJar = false
23 9 }
24 10
25   -task sharedFilesJar(type: Jar, description: 'Package up the files that are shared by both applications and plugins.') {
26   - appendix = "shared-files"
27   - appFileJar = true
28   - from("src/war/WEB-INF") {
29   - into "web-app/WEB-INF"
30   - include "applicationContext.xml", "sitemesh.xml", "tld/*.tld"
31   - }
32   - from("src/grails/grails-app/conf") {
33   - into "grails-app/conf"
34   - include "DataSource.groovy", "UrlMappings.groovy"
35   - }
36   -}
37   -
38   -task sharedApplicationFilesJar(type: Jar, description: 'Package up the files that are exclusive to applications.') {
39   - appendix = "app-files"
40   - appFileJar = true
41   - from("src/war") {
42   - into "web-app"
43   - exclude "WEB-INF/**"
44   - }
45   - from("src/grails/grails-app") {
46   - into "grails-app"
47   - exclude "taglib/**", "utils/**", "conf/DataSource.groovy", "conf/UrlMappings.groovy"
48   - }
49   -}
50   -
51   -task sharedPluginFilesJar(type: Jar, description: 'Package up the files that are exclusive to plugins.') {
52   - appendix = "plugin-files"
53   - appFileJar = true
54   - from("src/grails/templates/plugins")
55   - from("src/grails") {
56   - include "grails-app/conf/BuildConfig.groovy", "grails-app/views/error.gsp"
57   - }
58   - from("src/grails/plugin")
59   -}
60   -
61   -task docGeneratingFilesJar(type: Jar, description: 'Package up files used for generating documentation.') {
62   - appendix = "doc-files"
63   - appFileJar = true
64   - from("src/grails/docs")
65   -}
66   -
67   -task integrationFilesJar(type: Jar, description: 'Files to integrate Grails with IDEs and build systems.') {
68   - appendix = "integration-files"
69   - appFileJar = true
70   - from("src/grails/templates/ide-support", "src/grails/ant")
71   -}
72   -
73   -appFilesJars = tasks.withType(Jar).matching({ jar -> jar.appFileJar } as Spec)
74   -
75   -appFilesJars.allObjects {jar ->
76   - configure(jar) {
77   - version = ''
78   - destinationDir = "$buildDir/appFileJars" as File
79   - }
80   -}
81   -
82   -task appFilesJars {
83   - dependsOn { appFilesJars.all }
84   -}
85   -
86   -distJars = tasks.withType(Jar).matching({ jar -> !jar.appFileJar } as Spec)
87 11 dependencyCache = {
88 12 def cacheLocation = new File(gradle.gradleUserHomeDir, "cache")
89 13 copy {
@@ -112,137 +36,6 @@ task libs {
112 36 destinationDir = 'dist'
113 37 dependsOn { distJars.all }
114 38 }
115   -
116   -distJars.allObjects {jar ->
117   - jar.baseName = "grails"
118   - jar.destinationDir = libs.destinationDir as File
119   -}
120   -
121   -
122   -handlersAndSchemasMetaInf = {
123   - from 'src/jar/META-INF'
124   - include '**/*.handlers', '**/*.schemas'
125   -}
126   -
127   -task testJar(type: Jar, description: 'Package up the Grails testing jar') {
128   - appendix = "test"
129   - metaInf handlersAndSchemasMetaInf
130   - with mainClassesIncludeSpec("grails/test/**", "**/groovy/grails/test/**")
131   - osgify = true
132   - mavenArtifact = true
133   -}
134   -
135   -task docsJar(type: Jar, dependsOn: docGeneratingFilesJar, description: 'Package up files used for generating documentation.') {
136   - appendix = "docs"
137   - metaInf handlersAndSchemasMetaInf
138   - with mainClassesIncludeSpec("grails/doc/**", "**/groovy/grails/documentation/**")
139   - from docGeneratingFilesJar.archivePath
140   - osgify = true
141   - mavenArtifact = true
142   -}
143   -
144   -task springJar(type: Jar, description: 'Package up the Spring related Grails classes') {
145   - appendix = "spring"
146   - metaInf handlersAndSchemasMetaInf
147   - with mainClassesIncludeSpec("grails/spring/**", "**/groovy/grails/commons/spring/**")
148   - osgify = true
149   - mavenArtifact = true
150   -}
151   -
152   -task bootstrapJar(type: Jar, description: 'Package up the classes used to bootstrap Grails') {
153   - appendix = "bootstrap"
154   - metaInf handlersAndSchemasMetaInf
155   - with mainClassesIncludeSpec("grails/util/AbstractBuildSettings*","grails/util/BuildSettings*", "grails/util/GrailsNameUtils*", "grails/util/Environment*", "grails/util/Metadata*",
156   - "grails/util/BuildScope*", "grails/util/GrailsMain*", "grails/ant/**/*", "**/groovy/grails/cli/**/*", "**/groovy/grails/resolve/**/*",
157   - "grails/build/**")
158   - from "build.properties"
159   - rename "build.properties", "grails.build.properties"
160   - mavenArtifact = true
161   -}
162   -
163   -task scriptsJar(type: Jar, description: 'Package up files used for generating documentation.') {
164   - appendix = "scripts"
165   - from sourceSets.buildScripts.classes
166   - osgify = true
167   - mavenArtifact = true
168   -}
169   -
170   -task gormJar(type: Jar, description: 'Package up GORM related classes.') {
171   - appendix = "gorm"
172   - metaInf handlersAndSchemasMetaInf
173   - with mainClassesIncludeSpec("grails/orm/**", "**/groovy/grails/orm/hibernate/**", "**/groovy/grails/plugins/orm/hibernate/**",
174   - "**/groovy/grails/validation/Hibernate**")
175   - osgify = true
176   - mavenArtifact = true
177   -}
178   -
179   -task webJar(type: Jar, description: 'Package up web related classes.') {
180   - appendix = "web"
181   - from(sourceSets.main.classes) {
182   - include "grails/converters/**", "grails/util/**", "grails/web/**", "**/groovy/grails/web/**", "**/groovy/grails/plugins/web/**",
183   - "**/groovy/grails/plugins/converters/**", "**/groovy/grails/webflow/executor/support/GrailsConventionsFlowExecutorArgumentHandler*"
184   - exclude "grails/util/Generate**"
185   - }
186   - from(sourceSets.jsp21.classes)
187   - osgify = true
188   - mavenArtifact = true
189   -}
190   -
191   -task webflowJar(type: Jar, description: 'Package up Web Flow integration classes.') {
192   - appendix = "webflow"
193   - with mainClassesIncludeSpec("**/groovy/grails/webflow/**", "**/groovy/grails/plugins/webflow/**")
194   - osgify = true
195   - mavenArtifact = true
196   -}
197   -
198   -task crudJar(type: Jar, description: 'Package up scaffolding related classes.') {
199   - appendix = "crud"
200   - with mainClassesIncludeSpec("**/groovy/grails/scaffolding/**", "**/groovy/grails/plugins/scaffolding/**")
201   - osgify = true
202   - mavenArtifact = true
203   -}
204   -
205   -task resourcesJar(type: Jar, dependsOn: [sharedFilesJar, sharedApplicationFilesJar, integrationFilesJar, sharedPluginFilesJar],
206   - description: 'Package up JAR containing all Grails templates and static resources.') {
207   - appendix = "resources"
208   - from(projectDir) {
209   - include "conf/webdefault.xml", "src/grails/templates/artifacts/**", "src/grails/templates/scaffolding/**",
210   - "src/war/WEB-INF/web*.template.xml", "src/war/WEB-INF/tld/*/*.tld"
211   - }
212   - from(sharedApplicationFilesJar.archivePath)
213   - from(integrationFilesJar.archivePath)
214   - from(sharedPluginFilesJar.archivePath)
215   - from(sharedFilesJar.archivePath)
216   - osgify = true
217   - mavenArtifact = true
218   -}
219   -
220   -task coreJar(type: Jar, description: 'Package up core JAR containing the central APIs of the framework') {
221   - appendix = "core"
222   - metaInf {
223   - from "src/jar/META-INF"
224   - include 'services/**'
225   - }
226   - from(sourceSets.main.classes) {
227   - include "grails/ui/**", "grails/util/**", "grails/validation/**", "grails/persistence/**",
228   - "**/groovy/grails/aop/framework/**", "**/groovy/grails/beans/factory/**", "**/groovy/grails/commons/**",
229   - "**/groovy/grails/context/**", "**/groovy/grails/compiler/**", "**/groovy/grails/orm/support/**",
230   - "**/groovy/grails/exceptions/**", "**/groovy/grails/support/**", "**/groovy/grails/test/**",
231   - "**/groovy/grails/validation/**", "**/groovy/grails/plugins/**"
232   - exclude "grails/util/BuildSettings*", "grails/util/GrailsNameUtils*", "grails/util/Environment*",
233   - "grails/util/Metadata*", "grails/util/BuildScope*", "grails/util/GrailsMain*", "**/groovy/grails/commons/spring/**",
234   - "**/groovy/grails/plugins/orm/hibernate**", "**/groovy/grails/plugins/web/**", "**/groovy/grails/plugins/converters/**",
235   - "**/groovy/grails/plugins/webflow/**", "**/groovy/grails/plugins/scaffolding/**", "**/groovy/grails/validation/Hibernate**",
236   - "grails/test/**", "**/groovy/grails/test/**"
237   - }
238   - mavenArtifact = true
239   -}
240   -
241   -task osgiJar(type: Jar, dependsOn: [bootstrapJar, coreJar], description: 'Create an OSGi jar that merges the core and bootstrap JARs for OSGi comptabibility.') {
242   - appendix = "osgi"
243   - from bootstrapJar.archivePath, coreJar.archivePath
244   - osgify = true
245   -}
246 39
247 40 tasks.withType(Jar).allTasks { jarTask ->
248 41 jarTask.manifest.from project.manifest
@@ -255,7 +48,7 @@ task initBundlor(type: Copy) {
255 48 into dir
256 49 }
257 50
258   -distJars.matching({ jar -> jar.osgify } as Spec).allObjects {task ->
  51 +/*distJars.matching({ jar -> jar.osgify } as Spec).allObjects {task ->
259 52 task.dependsOn initBundlor
260 53 task.doLast {
261 54 if(new File("${initBundlor.dir}/bundlor-${initBundlor.version}").exists()) {
@@ -286,15 +79,7 @@ distJars.matching({ jar -> jar.osgify } as Spec).allObjects {task ->
286 79 }
287 80
288 81 }
289   -}
290   -
291   -def mainClassesIncludeSpec(String[] args) {
292   - copySpec {
293   - from(sourceSets.main.classes) {
294   - args.each { include it }
295   - }
296   - }
297   -}
  82 +}*/
298 83
299 84 task pluginsFromSvn {
300 85 dir = "$buildDir/pluginsFromSvn"
3  grails-hibernate/build.gradle
... ... @@ -1,5 +1,6 @@
1 1 dependencies {
2   - compile project(":grails-core"),project(":grails-web")
  2 +
  3 + compile project(":grails-bootstrap"), project(":grails-core"), project(":grails-spring"),project(":grails-web")
3 4
4 5 // Hibernate related
5 6 compile 'org.hibernate:hibernate-annotations:3.4.0.GA',
0  src/test/grails/util/MockHttpServletResponse.java → ...n/groovy/grails/util/MockHttpServletResponse.java
File renamed without changes
0  .../grails/commons/test/AbstractGrailsMockTests.java → .../grails/commons/test/AbstractGrailsMockTests.java
File renamed without changes
0  ...orm/hibernate/AbstractGrailsHibernateTests.groovy → ...orm/hibernate/AbstractGrailsHibernateTests.groovy
File renamed without changes
10 ...roovy/grails/plugins/MockGrailsPluginManager.java → ...roovy/grails/plugins/MockGrailsPluginManager.java
@@ -15,6 +15,8 @@
15 15 */
16 16 package org.codehaus.groovy.grails.plugins;
17 17
  18 +import grails.util.BuildSettings;
  19 +import grails.util.PluginBuildSettings;
18 20 import groovy.lang.GroovyClassLoader;
19 21
20 22 import java.io.File;
@@ -127,4 +129,12 @@ public void expectCheckForChanges() {
127 129 public void verify() {
128 130 Assert.assertFalse(this.checkForChangesExpected);
129 131 }
  132 +
  133 + public BuildSettings getBuildSettings() {
  134 + return null;
  135 + }
  136 +
  137 + public PluginBuildSettings getPluginBuildSettings() {
  138 + return null;
  139 + }
130 140 }
0  ...ails/plugins/web/AbstractGrailsPluginTests.groovy → ...ails/plugins/web/AbstractGrailsPluginTests.groovy
File renamed without changes
0  ...ils/web/mapping/AbstractGrailsMappingTests.groovy → ...ils/web/mapping/AbstractGrailsMappingTests.groovy
File renamed without changes
0  .../servlet/mvc/AbstractGrailsControllerTests.groovy → .../servlet/mvc/AbstractGrailsControllerTests.groovy
File renamed without changes
0  ...y/grails/web/taglib/AbstractGrailsTagTests.groovy → ...y/grails/web/taglib/AbstractGrailsTagTests.groovy
File renamed without changes
2  grails-web/build.gradle
... ... @@ -1,4 +1,4 @@
1 1 dependencies {
2   - compile project(":grails-core")
  2 + compile project(":grails-bootstrap"), project(":grails-core"), project(":grails-spring")
3 3 }
4 4 jar.appendix = 'web'
6 settings.gradle
@@ -24,4 +24,8 @@ include 'grails-bootstrap',
24 24 'grails-plugin-datasource',
25 25 'grails-plugin-services',
26 26 'grails-plugin-scaffolding',
27   - 'grails-plugin-testing'
  27 + 'grails-plugin-testing',
  28 +
  29 + // Test Suite
  30 + 'grails-test-suite-base'
  31 +

0 comments on commit a8a051c

Please sign in to comment.
Something went wrong with that request. Please try again.