From de3b71bf34bb092ce3a5b6b3f8f496cb755ae8ec Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Thu, 21 Apr 2011 20:44:47 +0300
Subject: [PATCH] + update tasks with deployed plugins

---
 build.gradle      | 24 +++++++++++-------------
 docs/build.gradle |  3 +--
 maven.gradle      |  5 ++++-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index c36381edc..1ca52156f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,24 +7,24 @@ apply plugin: 'idea'
 
 buildscript {
     repositories {
-        add(new org.apache.ivy.plugins.resolver.FileSystemResolver()) {
-            name = "local"
-            addIvyPattern "e:/work/i21/gradle-plugins/build/repo/[organisation].[module]-ivy-[revision].xml"
-            addArtifactPattern "e:/work/i21/gradle-plugins/build/repo/[organisation].[module]-[revision](-[classifier]).[ext]"
-        }
-    
-//        add(new org.apache.ivy.plugins.resolver.URLResolver()) {
-//            name = "GitHub"
-//            addIvyPattern 'http://cloud.github.com/downloads/costin/gradle-stuff/[organization].[module]-[artifact]-[revision].[ext]'
-//            addArtifactPattern 'http://cloud.github.com/downloads/costin/gradle-stuff/[organization].[module]-[revision].[ext]'
+//        add(new org.apache.ivy.plugins.resolver.FileSystemResolver()) {
+//            name = "local"
+//            addIvyPattern "e:/work/i21/gradle-plugins/build/repo/[organisation].[module]-ivy-[revision].xml"
+//            addArtifactPattern "e:/work/i21/gradle-plugins/build/repo/[organisation].[module]-[revision](-[classifier]).[ext]"
 //        }
+    
+        add(new org.apache.ivy.plugins.resolver.URLResolver()) {
+            name = "GitHub"
+            addIvyPattern 'http://cloud.github.com/downloads/costin/gradle-stuff/[organization].[module]-[artifact]-[revision].[ext]'
+            addArtifactPattern 'http://cloud.github.com/downloads/costin/gradle-stuff/[organization].[module]-[revision].[ext]'
+        }
         mavenCentral()
         mavenRepo name: "springsource-org-release", urls: "http://repository.springsource.com/maven/bundles/release"
         mavenRepo name: "springsource-org-external", urls: "http://repository.springsource.com/maven/bundles/external"
     }
 
     dependencies {
-        classpath 'org.springframework:gradle-plugins:0.1-SNAPSHOT'
+        classpath 'org.springframework:gradle-stuff:0.1-20110421'
         classpath 'net.sf.docbook:docbook-xsl:1.75.2:ns-resources@zip'
     }
 }
@@ -90,8 +90,6 @@ configure(javaprojects) {
 	}
 	
 	apply from: "$rootDir/maven.gradle"
-	//sourceSets.main.classesDir = new File(buildDir, "classes/" + project.name.substring("spring-data".length() + 1))
-  
 }
 
 ideaProject {
diff --git a/docs/build.gradle b/docs/build.gradle
index 4dff6864e..48b78c7c1 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -8,13 +8,13 @@ apply plugin: 'docbook'
 assemble.dependsOn = ['api', 'docbook']
 
 
-docbookHtmlSingle.stylesheet = new File(projectDir, 'src/reference/resources/xsl/html-single-custom.xsl')
 [docbookHtml, docbookFoPdf, docbookHtmlSingle]*.sourceFileName = 'index.xml'
 [docbookHtml, docbookFoPdf, docbookHtmlSingle]*.sourceDirectory = new File(projectDir, 'src/reference/docbook')
 
 docbookHtml.stylesheet = new File(projectDir, 'src/reference/resources/xsl/html-custom.xsl')
 docbookHtmlSingle.stylesheet = new File(projectDir, 'src/reference/resources/xsl/html-single-custom.xsl')
 docbookFoPdf.stylesheet = new File(projectDir, 'src/reference/resources/xsl/pdf-custom.xsl')
+
 def imagesDir = new File(projectDir, 'src/reference/resources/images');
 docbookFoPdf.admonGraphicsPath = "${imagesDir}/admon"
 docbookFoPdf.imgSrcPath = "${imagesDir}"
@@ -109,7 +109,6 @@ task uploadApi(type: org.springframework.gradle.tasks.ScpUpload) {
     dependsOn api, docbook
     description = "Upload API Distribution"    
     remoteDir = "./static.spring/spring-data/data-keyvalue/docs/${project.version}"
-    println 'Uploading to ' + remoteDir
     login = docSiteLogin
 
     with(apiSpec)
diff --git a/maven.gradle b/maven.gradle
index 20b78ce25..922b47738 100644
--- a/maven.gradle
+++ b/maven.gradle
@@ -4,6 +4,7 @@ apply plugin: 'maven'
 task sourceJar(type: Jar) {
     classifier = 'sources'
     from sourceSets.main.java
+    from sourceSets.main.resources
 }
 
 artifacts {
@@ -49,7 +50,9 @@ uploadArchives {
 
     deployer = repositories.mavenDeployer {
         configuration = configurations.deployerJars
+        // releaseBuild
         if (releaseBuild) {
+            logger.info("Deploying to local Maven repo " + releaseRepositoryUrl)
             // "mavenSyncRepoDir" should be set in properties
             repository(url: releaseRepositoryUrl)
         } else {
@@ -71,5 +74,5 @@ uploadArchives {
           distribution "repo"
         }
       }
-    }
+  }
 }
\ No newline at end of file