Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/main/groovy/org/jboss/gradle/plugins/jdocbook/JDocBookConvention.groovy b/src/main/groovy/org/jboss/gradle/plugins/jdocbook/JDocBookConvention.groovy
- index 1907d61..ca847c9 100644
- --- a/src/main/groovy/org/jboss/gradle/plugins/jdocbook/JDocBookConvention.groovy
- +++ b/src/main/groovy/org/jboss/gradle/plugins/jdocbook/JDocBookConvention.groovy
- @@ -32,6 +32,7 @@ import org.gradle.api.logging.Logger
- import org.gradle.api.logging.Logging
- import org.gradle.listener.ActionBroadcast
- import org.jboss.gradle.plugins.jdocbook.book.Book
- +import org.jboss.gradle.plugins.jdocbook.book.BookConfiguration
- /**
- * @author Strong Liu
- @@ -41,6 +42,8 @@ class JDocBookConvention {
- final NamedDomainObjectContainer<Book> books;
- @Delegate
- Book commonBook
- + @Delegate
- + BookConfiguration bookConfiguration;
- Project project
- ActionBroadcast<Book> configBookActions = new ActionBroadcast<Book>();
- @@ -48,6 +51,8 @@ class JDocBookConvention {
- this.project = project
- this.books = books
- this.commonBook = new Book("", project)
- + this.bookConfiguration = new BookConfiguration(commonBook)
- + commonBook.setConfiguration(bookConfiguration)
- /**
- * if it is a mutil-books project, then we have to merge the info defined in the common book
- * area into each book, and also mark the internal common book as abstract
- diff --git a/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/MutilBooksSpock.groovy b/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/MutilBooksSpock.groovy
- index 7e1454a..6c7fd9e 100644
- --- a/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/MutilBooksSpock.groovy
- +++ b/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/MutilBooksSpock.groovy
- @@ -78,6 +78,8 @@ class MutilBooksSpock extends AbstractJDocbookSpock {
- checkFormat(format)
- }
- common.translations == ["zh-CN"]
- + !common.transformerParameters.isEmpty()
- + common.transformerParameters.get("a") == "b"
- //assert manual book
- def manual = convention.books.manual
- manual != null
- @@ -87,6 +89,8 @@ class MutilBooksSpock extends AbstractJDocbookSpock {
- checkFormat(format)
- }
- manual.translations == ["zh-CN"]
- + !manual.transformerParameters.isEmpty()
- + manual.transformerParameters.get("a") == "c"
- //assert devguide book
- def devguide = convention.books.devguide
- devguide != null
- @@ -96,6 +100,8 @@ class MutilBooksSpock extends AbstractJDocbookSpock {
- //FIXME formats should not contains PDF
- //devguide.formats
- devguide.formats.html.stylesheet == "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl"
- + !devguide.transformerParameters.isEmpty()
- + devguide.transformerParameters.get("a") == "b"
- //assert quickstart book
- def quickstart = convention.books.quickstart
- diff --git a/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/SingleJDocbookSpock.groovy b/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/SingleJDocbookSpock.groovy
- index 1917ac5..7125d45 100644
- --- a/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/SingleJDocbookSpock.groovy
- +++ b/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/SingleJDocbookSpock.groovy
- @@ -57,6 +57,17 @@ class SingleJDocbookSpock extends AbstractJDocbookSpock {
- book.translations == ["zh-CN"]
- }
- + def "does transformer parameters get set correctly"(){
- + applyScript DEFAULT_SCRIPT
- + expect:
- + convention != null
- + convention.books != null
- + convention.commonBook != null
- + def book = convention.commonBook
- + !book.transformerParameters.isEmpty()
- + book.transformerParameters.get("a") == "b"
- + }
- +
- def checkFormat(def format) {
- assert FORMATS[format.name].finalName == format.finalName
- assert FORMATS[format.name].stylesheet == format.stylesheet
- diff --git a/src/test/resources/scripts/default.gradle b/src/test/resources/scripts/default.gradle
- index 757fd14..312f048 100644
- --- a/src/test/resources/scripts/default.gradle
- +++ b/src/test/resources/scripts/default.gradle
- @@ -36,6 +36,7 @@ jdocbook {
- finalName = 'index.html'
- stylesheet = "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl"
- }
- + transformerParameters = ["a":"b"]
- format {
- name = 'html'
- finalName = 'index.html'
- diff --git a/src/test/resources/scripts/mutilbooks.gradle b/src/test/resources/scripts/mutilbooks.gradle
- index fb13006..e614ce4 100644
- --- a/src/test/resources/scripts/mutilbooks.gradle
- +++ b/src/test/resources/scripts/mutilbooks.gradle
- @@ -40,9 +40,12 @@ jdocbook {
- stylesheet = "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl"
- }
- + transformerParameters = ["a":"b"]
- +
- manual {
- //baseDirectory = baseDir + 'hibernate-manual' // CoC, scriptsdefault baseDirectory is baseDir+bookName
- masterSourceDocumentName = 'HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.xml'
- + transformerParameters = ["a":"c"]
- format {
- name = "pdf"
- finalName = "hibernate_reference.pdf"
Add Comment
Please, Sign In to add comment