You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2011/03/20 11:05:17 UTC

svn commit: r1083386 - in /tapestry/tapestry5/trunk: build.gradle settings.gradle tapestry-core/build.gradle tapestry-spring/build.gradle tapestry-upload/build.gradle

Author: hlship
Date: Sun Mar 20 10:05:17 2011
New Revision: 1083386

URL: http://svn.apache.org/viewvc?rev=1083386&view=rev
Log:
TAP5-116: Add tapestry-upload and tapestry-spring to Gradle build

Added:
    tapestry/tapestry5/trunk/tapestry-spring/build.gradle
    tapestry/tapestry5/trunk/tapestry-upload/build.gradle
Modified:
    tapestry/tapestry5/trunk/build.gradle
    tapestry/tapestry5/trunk/settings.gradle
    tapestry/tapestry5/trunk/tapestry-core/build.gradle

Modified: tapestry/tapestry5/trunk/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1083386&r1=1083385&r2=1083386&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/build.gradle (original)
+++ tapestry/tapestry5/trunk/build.gradle Sun Mar 20 10:05:17 2011
@@ -8,6 +8,7 @@ jettyVersion = '7.0.0.v20091005'
 tomcatVersion = '6.0.30'
 testngVersion = '5.14.9'
 easymockVersion = '3.0'
+servletAPIVersion = '2.4'
 
 subprojects {
     apply plugin: 'java'
@@ -31,9 +32,19 @@ subprojects {
     }
     
     configurations {
+		provided
         deployerJars
     }
+
+    // See http://jira.codehaus.org/browse/GRADLE-784
+    
+    sourceSets {
+      main { 
+        compileClasspath += configurations.provided 
+      }
+    }
     
+
     dependencies {
         groovy "org.codehaus.groovy:groovy-all:1.7.4"
         

Modified: tapestry/tapestry5/trunk/settings.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/settings.gradle?rev=1083386&r1=1083385&r2=1083386&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/settings.gradle (original)
+++ tapestry/tapestry5/trunk/settings.gradle Sun Mar 20 10:05:17 2011
@@ -1,5 +1,5 @@
 include "tapestry-annotations", "tapestry-test", "tapestry-func", "tapestry-ioc", "tapestry-json", "tapestry-core"
-include "tapestry-hibernate-core", "tapestry-hibernate", "tapestry-jmx"
-// TODO: , tapestry-upload, tapestry-spring, tapestry-beanvalidator
+include "tapestry-hibernate-core", "tapestry-hibernate", "tapestry-jmx", "tapestry-upload", "tapestry-spring"
+// TODO: tapestry-beanvalidator
 // TODO (LATER): tapestry-component-report, quickstart
 

Modified: tapestry/tapestry5/trunk/tapestry-core/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/build.gradle?rev=1083386&r1=1083385&r2=1083386&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/build.gradle (original)
+++ tapestry/tapestry5/trunk/tapestry-core/build.gradle Sun Mar 20 10:05:17 2011
@@ -13,9 +13,8 @@ dependencies {
   compile project(':tapestry-ioc')
   compile project(':tapestry-json')
   
-  // Should be "provided" as per Maven POM
-  compile project(":tapestry-test")
-  compile "javax.servlet:servlet-api:2.4"
+  provided project(":tapestry-test")
+  provided "javax.servlet:servlet-api:$servletAPIVersion"
 
   compile "commons-codec:commons-codec:1.3"
 

Added: tapestry/tapestry5/trunk/tapestry-spring/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/build.gradle?rev=1083386&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/build.gradle (added)
+++ tapestry/tapestry5/trunk/tapestry-spring/build.gradle Sun Mar 20 10:05:17 2011
@@ -0,0 +1,16 @@
+description = "Integration of Tapestry with the Spring Inversion Of Control Container"
+
+dependencies {
+  compile project(':tapestry-core')
+  compile "org.springframework:spring-web:3.0.0.RELEASE"
+
+  provided "javax.servlet:servlet-api:$servletAPIVersion"
+
+  testCompile project(':tapestry-test')
+}
+
+jar {
+    manifest {
+        attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.spring.SpringModule'
+    }
+}
\ No newline at end of file

Added: tapestry/tapestry5/trunk/tapestry-upload/build.gradle
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/build.gradle?rev=1083386&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/build.gradle (added)
+++ tapestry/tapestry5/trunk/tapestry-upload/build.gradle Sun Mar 20 10:05:17 2011
@@ -0,0 +1,16 @@
+description = "File Upload component, with supporting services"
+
+dependencies {
+  compile project(':tapestry-core')
+  compile "commons-fileupload:commons-fileupload:1.2"
+  compile "commons-io:commons-io:1.3"
+  provided "javax.servlet:servlet-api:$servletAPIVersion"
+
+  testCompile project(':tapestry-test')
+}
+
+jar {
+    manifest {
+        attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.upload.services.UploadModule'
+    }
+}
\ No newline at end of file