diff --git a/build.gradle b/build.gradle
index 2e9001628..4506b42b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,6 @@ def buildSrcDir = "$rootDir/buildSrc"
apply from: "$buildSrcDir/wrapper.gradle"
apply from: "$buildSrcDir/maven-root-pom.gradle"
-
assemble.dependsOn generatePom
allprojects {
@@ -27,26 +26,25 @@ allprojects {
version = new Version(springDataKeyValueVersion)
}
-subprojects {
+javaprojects = subprojects.findAll { project ->
+ project.path.startsWith(':spring-data-')
+}
+
+configure(javaprojects) {
apply plugin: "java"
apply plugin: "maven"
apply plugin: 'eclipse' // `gradle eclipse` to generate .classpath/.project
apply plugin: 'idea' // `gradle idea` to generate .ipr/.iml
apply plugin: 'bundlor' // all core projects should be OSGi-compliant
+ // set up dedicated directories for jars and source jars.
+ // this makes it easier when putting together the distribution
+ libsBinDir = new File(libsDir, 'bin')
+ libsSrcDir = new File(libsDir, 'src')
- releaseType = "M2"
- version = "1.0.0.$releaseType"
[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:all"]
-
- // all core projects should be OSGi-compliant bundles
- // add the bundlor task to ensure proper manifests
- apply from: "$rootDir/gradle/bundlor.gradle"
-
- project.checkForProps = { Map args ->
- requiredPropSets.add args
- }
+ assemble.dependsOn generatePom
// add tasks for creating source jars and generating poms etc
apply from: "$buildSrcDir/maven-deployment.gradle"
@@ -55,8 +53,6 @@ subprojects {
apply from: "$buildSrcDir/schema-publication.gradle"
repositories {
- // Read user's local Maven repo first
- mavenRepo name: "mavenLocal", urls: new File(System.getProperty("user.home"), ".m2/repository").toURL().toString()
// Public Spring artefacts
mavenRepo name: "springsource-org-release", urls: "http://repository.springsource.com/maven/bundles/release"
mavenRepo name: "spring-release", urls: "http://maven.springframework.org/release"
diff --git a/docs/src/api/javadoc.options b/docs/src/api/javadoc.options
new file mode 100644
index 000000000..aa1eefc05
--- /dev/null
+++ b/docs/src/api/javadoc.options
@@ -0,0 +1,12 @@
+-breakiterator
+-header "Spring Data Key-Value"
+-source 1.6
+-protected
+-quiet
+-docfilessubdirs
+-group "Spring Data Key Value Core" "org.springframework.data.keyvalue*"
+-group "Spring Data Redis Support" "org.springframework.data.keyvalue.redis*"
+-group "Spring Data Riak Support" "org.springframework.data.keyvalue.riak*"
+-link http://static.springframework.org/spring/docs/3.0.x/javadoc-api
+-link http://download.oracle.com/javase/6/docs/api/
+
diff --git a/docs/src/reference/docbook/appendix/appendix-schema.xml b/docs/src/reference/docbook/appendix/appendix-schema.xml
index ef7ce9efe..e5b2b9e0f 100644
--- a/docs/src/reference/docbook/appendix/appendix-schema.xml
+++ b/docs/src/reference/docbook/appendix/appendix-schema.xml
@@ -6,7 +6,7 @@
Spring Data Key Value Schema(s)
Spring Data - Redis support
-
+
FIXME: REDIS SCHEMA LOCATION/NAME CHANGED
diff --git a/docs/src/reference/docbook/index.xml b/docs/src/reference/docbook/index.xml
index 0d1b02b26..0728d0cad 100644
--- a/docs/src/reference/docbook/index.xml
+++ b/docs/src/reference/docbook/index.xml
@@ -4,7 +4,9 @@
Spring Data Key-Value - Reference Documentation
+ Spring Data Key-Value ${version}
&version;
+ Spring Data Key-Value
diff --git a/docs/src/reference/resources/xsl/html-custom.xsl b/docs/src/reference/resources/xsl/html-custom.xsl
new file mode 100644
index 000000000..575267e3c
--- /dev/null
+++ b/docs/src/reference/resources/xsl/html-custom.xsl
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+ '5'
+ '1'
+
+
+ 1
+
+
+ 1
+
+
+ 1
+ 0
+ 1
+
+
+
+ images/admon/
+ .png
+
+ 120
+ images/callouts/
+ .png
+
+
+ css/manual.css
+ text/css
+ book toc,title
+
+ text-align: left
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Begin Google Analytics code
+
+
+ End Google Analytics code
+
+
+
+
+ Begin LoopFuse code
+
+
+ End LoopFuse code
+
+
+
\ No newline at end of file
diff --git a/docs/src/reference/resources/xsl/html-single-custom.xsl b/docs/src/reference/resources/xsl/html-single-custom.xsl
new file mode 100644
index 000000000..264d9a81f
--- /dev/null
+++ b/docs/src/reference/resources/xsl/html-single-custom.xsl
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+ 1
+
+
+ 1
+ 0
+ 1
+
+
+
+ images/admon/
+ .png
+
+ 120
+ images/callouts/
+ .png
+
+
+ css/manual.css
+ text/css
+ book toc,title
+
+ text-align: left
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Begin Google Analytics code
+
+
+End Google Analytics code
+
+
+
+
+Begin LoopFuse code
+
+
+End LoopFuse code
+
+
+
\ No newline at end of file
diff --git a/docs/src/reference/resources/xsl/pdf-custom.xsl b/docs/src/reference/resources/xsl/pdf-custom.xsl
new file mode 100644
index 000000000..fef198b51
--- /dev/null
+++ b/docs/src/reference/resources/xsl/pdf-custom.xsl
@@ -0,0 +1,485 @@
+
+
+
+
+
+
+
+
+
+
+ '1'
+ images/admon/
+ .png
+
+
+
+
+ 24pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -5em
+ -5em
+
+
+
+
+
+ book toc,title
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ please define productname in your docbook file!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+ 0
+ 1
+
+
+
+
+ 0
+ 0
+ 0
+
+
+
+ false
+
+
+ 11
+ 8
+
+
+ 1.4
+
+
+
+ left
+ bold
+
+
+ pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.8em
+ 0.8em
+ 0.8em
+
+
+ pt
+
+ 0.1em
+ 0.1em
+ 0.1em
+
+
+ 0.6em
+ 0.6em
+ 0.6em
+
+
+ pt
+
+ 0.1em
+ 0.1em
+ 0.1em
+
+
+ 0.4em
+ 0.4em
+ 0.4em
+
+
+ pt
+
+ 0.1em
+ 0.1em
+ 0.1em
+
+
+ 0.3em
+ 0.3em
+ 0.3em
+
+
+ pt
+
+ 0.1em
+ 0.1em
+ 0.1em
+
+
+
+
+
+
+
+ 4pt
+ 4pt
+ 4pt
+ 4pt
+
+
+
+ 0.1pt
+ 0.1pt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ pt
+
+
+
+
+ 1em
+ 1em
+ 1em
+ 0.1em
+ 0.1em
+ 0.1em
+
+ #444444
+ solid
+ 0.1pt
+ 0.5em
+ 0.5em
+ 0.5em
+ 0.5em
+ 0.5em
+ 0.5em
+
+
+
+ 1
+
+ #F0F0F0
+
+
+
+ 0.1em
+ 0.1em
+ 0.1em
+ 0.1em
+ 0.1em
+ 0.1em
+
+
+
+ 0.5em
+ 0.5em
+ 0.5em
+ 0.1em
+ 0.1em
+ 0.1em
+ always
+
+
+
+
+
+ normal
+ italic
+
+
+ pt
+
+ false
+ 0.1em
+ 0.1em
+ 0.1em
+
+
+
+
+
+ 0
+ 1
+
+
+ 90
+
+
+
+
+
+ figure after
+ example after
+ equation before
+ table before
+ procedure before
+
+
+
+ 1
+
+ 0pt
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/settings.gradle b/settings.gradle
index 8d1adbce1..f33374e3f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,6 @@
rootProject.name = 'spring-data-key-value'
+include 'docs'
include "spring-data-keyvalue-core",
"spring-data-redis",
"spring-data-riak"
\ No newline at end of file