Browse Source

Migrate documentation to asciidoctor

This commit migrates to asciidoctor to ease writing documentation.

Issues: SPR-10960
pull/404/head
Rob Winch 12 years ago
parent
commit
fd0b6caf9e
  1. 1
      .gitignore
  2. 28
      CONTRIBUTING-DOCUMENTATION.adoc
  3. 32
      build.gradle
  4. 16
      src/asciidoc/Guardfile
  5. 0
      src/asciidoc/images/DataAccessException.gif
  6. 0
      src/asciidoc/images/aop-proxy-call.png
  7. 0
      src/asciidoc/images/aop-proxy-plain-pojo-call.png
  8. 0
      src/asciidoc/images/aop-uml.gif
  9. 0
      src/asciidoc/images/bean-lifecycle-overview.gif
  10. 0
      src/asciidoc/images/bind1.jpg
  11. 0
      src/asciidoc/images/bind2.jpg
  12. 0
      src/asciidoc/images/container-magic.png
  13. 0
      src/asciidoc/images/eclipse-setup-1.png
  14. 0
      src/asciidoc/images/eclipse-setup-2.png
  15. 0
      src/asciidoc/images/eclipse-setup-3.png
  16. 0
      src/asciidoc/images/ejb.gif
  17. 0
      src/asciidoc/images/ejb.png
  18. 0
      src/asciidoc/images/ejb.svg
  19. 0
      src/asciidoc/images/full.gif
  20. 0
      src/asciidoc/images/full.png
  21. 0
      src/asciidoc/images/full.svg
  22. 0
      src/asciidoc/images/idea-setup-1.png
  23. 0
      src/asciidoc/images/idea-setup-2.png
  24. 0
      src/asciidoc/images/idea-setup-3.png
  25. 0
      src/asciidoc/images/idea-setup-4.png
  26. 0
      src/asciidoc/images/idea-setup-5.png
  27. 0
      src/asciidoc/images/idea-setup-6.png
  28. 0
      src/asciidoc/images/mvc-contexts.gif
  29. 0
      src/asciidoc/images/mvc.png
  30. 0
      src/asciidoc/images/overview-ejb.graffle
  31. 0
      src/asciidoc/images/overview-ejb.png
  32. 0
      src/asciidoc/images/overview-full.graffle
  33. 0
      src/asciidoc/images/overview-full.png
  34. 0
      src/asciidoc/images/overview-remoting.graffle
  35. 0
      src/asciidoc/images/overview-remoting.png
  36. 0
      src/asciidoc/images/overview-thirdparty-web.graffle
  37. 0
      src/asciidoc/images/overview-thirdparty-web.png
  38. 0
      src/asciidoc/images/oxm-exceptions.graffle
  39. 0
      src/asciidoc/images/oxm-exceptions.png
  40. 0
      src/asciidoc/images/prototype.png
  41. 0
      src/asciidoc/images/remoting.gif
  42. 0
      src/asciidoc/images/remoting.png
  43. 0
      src/asciidoc/images/remoting.svg
  44. 0
      src/asciidoc/images/singleton.png
  45. 0
      src/asciidoc/images/spring-overview.gif
  46. 0
      src/asciidoc/images/spring-overview.graffle
  47. 0
      src/asciidoc/images/spring-overview.png
  48. 0
      src/asciidoc/images/spring-overview.svg
  49. 0
      src/asciidoc/images/spring-overview.vsd
  50. 0
      src/asciidoc/images/spring.sxd
  51. 0
      src/asciidoc/images/thirdparty-web.gif
  52. 0
      src/asciidoc/images/thirdparty-web.png
  53. 0
      src/asciidoc/images/thirdparty-web.svg
  54. 0
      src/asciidoc/images/tx.png
  55. 0
      src/asciidoc/images/tx_prop_required.png
  56. 0
      src/asciidoc/images/tx_prop_requires_new.png
  57. 37199
      src/asciidoc/index.adoc

1
.gitignore vendored

@ -20,6 +20,7 @@ activemq-data/ @@ -20,6 +20,7 @@ activemq-data/
/build
buildSrc/build
/spring-*/build
/src/asciidoc/build
target/
# Eclipse artifacts, including WTP generated manifests

28
CONTRIBUTING-DOCUMENTATION.adoc

@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
= How to contribute to the reference
The Spring reference now uses http://asciidoctor.org/[asciidoctor]. This document describes how to contribute documentation updates to the Spring reference.
== Building with Gradle
You can build the documentation using gradle using the `asciidoc` task. For example, from the project root execute the following command:
gradlew asciidoc
the output will be available at `spring-framework/build/asciidoc/index.html`
== Live editing
One of the nice features about using asciidoctor is the support for live editing.
You will find a Guardfile already present at `spring-framework/src/asciidoc/Guardfile`. Then ensure to follow the setup instructions within the http://asciidoctor.org/docs/editing-asciidoc-with-live-preview/[Editing AsciiDoc with Live Preview] document.
When running `guard start` within the `src/asciidoc/` folder, any changes to the `src/asciidoc/index.adoc` file will automatically be written at `src/asciidoc/build/index.html`.
== Documentation notes
Some notes on documentation
* It is important to keep whitespaces to a minimum to make it simple to edit files. This means use an editor with line wrapping rather than manually inserting hard returns.
* http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[Asciidoctor Quick Reference]
* http://asciidoctor.org/docs/user-manual/[Asciidoctor Manual]
* http://asciidoctor.org/docs/asciidoc-writers-guide/[Asciidoctor Writers Guide]

32
build.gradle

@ -4,7 +4,7 @@ buildscript { @@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.4")
classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.7")
classpath("org.asciidoctor:asciidoctor-gradle-plugin:0.7.0")
}
}
@ -874,14 +874,28 @@ project("spring-aspects") { @@ -874,14 +874,28 @@ project("spring-aspects") {
configure(rootProject) {
description = "Spring Framework"
apply plugin: "docbook-reference"
apply plugin: "asciidoctor"
apply plugin: "groovy"
// apply plugin: "detect-split-packages"
apply from: "${gradleScriptDir}/jdiff.gradle"
reference {
sourceDir = file("src/reference/docbook")
pdfFilename = "spring-framework-reference.pdf"
asciidoctor {
options = [
eruby: 'erubis',
attributes: [
copycss : '',
icons : 'font',
'source-highlighter': 'prettify',
sectanchors : '',
toc2: '',
idprefix: '',
idseparator: '-',
doctype: 'book',
'spring-version' : project.version,
revnumber : project.version
]
]
}
// TODO: DetectSplitPackagesPlugin fails in line 154 due to method not found on java.io.File.
@ -953,7 +967,7 @@ configure(rootProject) { @@ -953,7 +967,7 @@ configure(rootProject) {
}
}
task docsZip(type: Zip) {
task docsZip(type: Zip, dependsOn: 'asciidoctor') {
group = "Distribution"
baseName = "spring-framework"
classifier = "docs"
@ -968,8 +982,10 @@ configure(rootProject) { @@ -968,8 +982,10 @@ configure(rootProject) {
into "javadoc-api"
}
from (reference) {
into "spring-framework-reference"
from (asciidoctor.outputDir) {
exclude "build"
exclude "Guardfile"
into "spring-framework-reference/htmlsingle"
}
}

16
src/asciidoc/Guardfile

@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
require 'asciidoctor'
require 'erb'
require 'fileutils'
FileUtils.mkdir_p('build')
FileUtils.cp_r('images','build')
guard 'shell' do
watch(/^.*\.adoc$/) {|m|
Asciidoctor.render_file(m[0], :to_dir => "build", :safe => Asciidoctor::SafeMode::UNSAFE, :attributes=> {'idprefix' => '', 'idseparator' => '-', 'copycss' => '', 'icons' => 'font', 'source-highlighter' => 'prettify', 'sectanchors' => '', 'doctype' => 'book','toc2' => '', 'spring-version' => '4.0.0.BUILD-SNAPSHOT', 'revnumber' => '4.0.0.BUILD-SNAPSHOT' })
}
end
guard 'livereload' do
watch(%r{build/.+\.(css|js|html)$})
end

0
src/reference/docbook/images/DataAccessException.gif → src/asciidoc/images/DataAccessException.gif

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
src/reference/docbook/images/aop-proxy-call.png → src/asciidoc/images/aop-proxy-call.png

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
src/reference/docbook/images/aop-proxy-plain-pojo-call.png → src/asciidoc/images/aop-proxy-plain-pojo-call.png

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

0
src/reference/docbook/images/aop-uml.gif → src/asciidoc/images/aop-uml.gif

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

0
src/reference/docbook/images/bean-lifecycle-overview.gif → src/asciidoc/images/bean-lifecycle-overview.gif

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

0
src/reference/docbook/images/bind1.jpg → src/asciidoc/images/bind1.jpg

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
src/reference/docbook/images/bind2.jpg → src/asciidoc/images/bind2.jpg

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
src/reference/docbook/images/container-magic.png → src/asciidoc/images/container-magic.png

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

0
src/reference/docbook/images/eclipse-setup-1.png → src/asciidoc/images/eclipse-setup-1.png

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

0
src/reference/docbook/images/eclipse-setup-2.png → src/asciidoc/images/eclipse-setup-2.png

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

0
src/reference/docbook/images/eclipse-setup-3.png → src/asciidoc/images/eclipse-setup-3.png

Before

Width:  |  Height:  |  Size: 192 KiB

After

Width:  |  Height:  |  Size: 192 KiB

0
src/reference/docbook/images/ejb.gif → src/asciidoc/images/ejb.gif

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
src/reference/docbook/images/ejb.png → src/asciidoc/images/ejb.png

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

0
src/reference/docbook/images/ejb.svg → src/asciidoc/images/ejb.svg

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

0
src/reference/docbook/images/full.gif → src/asciidoc/images/full.gif

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
src/reference/docbook/images/full.png → src/asciidoc/images/full.png

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

0
src/reference/docbook/images/full.svg → src/asciidoc/images/full.svg

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
src/reference/docbook/images/idea-setup-1.png → src/asciidoc/images/idea-setup-1.png

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 69 KiB

0
src/reference/docbook/images/idea-setup-2.png → src/asciidoc/images/idea-setup-2.png

Before

Width:  |  Height:  |  Size: 123 KiB

After

Width:  |  Height:  |  Size: 123 KiB

0
src/reference/docbook/images/idea-setup-3.png → src/asciidoc/images/idea-setup-3.png

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 122 KiB

0
src/reference/docbook/images/idea-setup-4.png → src/asciidoc/images/idea-setup-4.png

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 115 KiB

0
src/reference/docbook/images/idea-setup-5.png → src/asciidoc/images/idea-setup-5.png

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

0
src/reference/docbook/images/idea-setup-6.png → src/asciidoc/images/idea-setup-6.png

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

0
src/reference/docbook/images/mvc-contexts.gif → src/asciidoc/images/mvc-contexts.gif

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

0
src/reference/docbook/images/mvc.png → src/asciidoc/images/mvc.png

Before

Width:  |  Height:  |  Size: 124 KiB

After

Width:  |  Height:  |  Size: 124 KiB

0
src/reference/docbook/images/overview-ejb.graffle → src/asciidoc/images/overview-ejb.graffle

0
src/reference/docbook/images/overview-ejb.png → src/asciidoc/images/overview-ejb.png

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

0
src/reference/docbook/images/overview-full.graffle → src/asciidoc/images/overview-full.graffle

0
src/reference/docbook/images/overview-full.png → src/asciidoc/images/overview-full.png

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 94 KiB

0
src/reference/docbook/images/overview-remoting.graffle → src/asciidoc/images/overview-remoting.graffle

0
src/reference/docbook/images/overview-remoting.png → src/asciidoc/images/overview-remoting.png

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

0
src/reference/docbook/images/overview-thirdparty-web.graffle → src/asciidoc/images/overview-thirdparty-web.graffle

0
src/reference/docbook/images/overview-thirdparty-web.png → src/asciidoc/images/overview-thirdparty-web.png

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 71 KiB

0
src/reference/docbook/images/oxm-exceptions.graffle → src/asciidoc/images/oxm-exceptions.graffle

0
src/reference/docbook/images/oxm-exceptions.png → src/asciidoc/images/oxm-exceptions.png

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

0
src/reference/docbook/images/prototype.png → src/asciidoc/images/prototype.png

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 92 KiB

0
src/reference/docbook/images/remoting.gif → src/asciidoc/images/remoting.gif

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
src/reference/docbook/images/remoting.png → src/asciidoc/images/remoting.png

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
src/reference/docbook/images/remoting.svg → src/asciidoc/images/remoting.svg

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

0
src/reference/docbook/images/singleton.png → src/asciidoc/images/singleton.png

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 95 KiB

0
src/reference/docbook/images/spring-overview.gif → src/asciidoc/images/spring-overview.gif

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
src/reference/docbook/images/spring-overview.graffle → src/asciidoc/images/spring-overview.graffle

0
src/reference/docbook/images/spring-overview.png → src/asciidoc/images/spring-overview.png

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

0
src/reference/docbook/images/spring-overview.svg → src/asciidoc/images/spring-overview.svg

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
src/reference/docbook/images/spring-overview.vsd → src/asciidoc/images/spring-overview.vsd

0
src/reference/docbook/images/spring.sxd → src/asciidoc/images/spring.sxd

0
src/reference/docbook/images/thirdparty-web.gif → src/asciidoc/images/thirdparty-web.gif

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
src/reference/docbook/images/thirdparty-web.png → src/asciidoc/images/thirdparty-web.png

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

0
src/reference/docbook/images/thirdparty-web.svg → src/asciidoc/images/thirdparty-web.svg

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

0
src/reference/docbook/images/tx.png → src/asciidoc/images/tx.png

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB

0
src/reference/docbook/images/tx_prop_required.png → src/asciidoc/images/tx_prop_required.png

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

0
src/reference/docbook/images/tx_prop_requires_new.png → src/asciidoc/images/tx_prop_requires_new.png

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

37199
src/asciidoc/index.adoc

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save