Guest User

Untitled

a guest
Aug 20th, 2018
82
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.13 KB | None | 0 0
  1. diff --git a/src/main/groovy/org/jboss/gradle/plugins/jdocbook/JDocBookConvention.groovy b/src/main/groovy/org/jboss/gradle/plugins/jdocbook/JDocBookConvention.groovy
  2. index 1907d61..ca847c9 100644
  3. --- a/src/main/groovy/org/jboss/gradle/plugins/jdocbook/JDocBookConvention.groovy
  4. +++ b/src/main/groovy/org/jboss/gradle/plugins/jdocbook/JDocBookConvention.groovy
  5. @@ -32,6 +32,7 @@ import org.gradle.api.logging.Logger
  6. import org.gradle.api.logging.Logging
  7. import org.gradle.listener.ActionBroadcast
  8. import org.jboss.gradle.plugins.jdocbook.book.Book
  9. +import org.jboss.gradle.plugins.jdocbook.book.BookConfiguration
  10.  
  11. /**
  12. * @author Strong Liu
  13. @@ -41,6 +42,8 @@ class JDocBookConvention {
  14. final NamedDomainObjectContainer<Book> books;
  15. @Delegate
  16. Book commonBook
  17. + @Delegate
  18. + BookConfiguration bookConfiguration;
  19. Project project
  20. ActionBroadcast<Book> configBookActions = new ActionBroadcast<Book>();
  21.  
  22. @@ -48,6 +51,8 @@ class JDocBookConvention {
  23. this.project = project
  24. this.books = books
  25. this.commonBook = new Book("", project)
  26. + this.bookConfiguration = new BookConfiguration(commonBook)
  27. + commonBook.setConfiguration(bookConfiguration)
  28. /**
  29. * if it is a mutil-books project, then we have to merge the info defined in the common book
  30. * area into each book, and also mark the internal common book as abstract
  31. 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
  32. index 7e1454a..6c7fd9e 100644
  33. --- a/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/MutilBooksSpock.groovy
  34. +++ b/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/MutilBooksSpock.groovy
  35. @@ -78,6 +78,8 @@ class MutilBooksSpock extends AbstractJDocbookSpock {
  36. checkFormat(format)
  37. }
  38. common.translations == ["zh-CN"]
  39. + !common.transformerParameters.isEmpty()
  40. + common.transformerParameters.get("a") == "b"
  41. //assert manual book
  42. def manual = convention.books.manual
  43. manual != null
  44. @@ -87,6 +89,8 @@ class MutilBooksSpock extends AbstractJDocbookSpock {
  45. checkFormat(format)
  46. }
  47. manual.translations == ["zh-CN"]
  48. + !manual.transformerParameters.isEmpty()
  49. + manual.transformerParameters.get("a") == "c"
  50. //assert devguide book
  51. def devguide = convention.books.devguide
  52. devguide != null
  53. @@ -96,6 +100,8 @@ class MutilBooksSpock extends AbstractJDocbookSpock {
  54. //FIXME formats should not contains PDF
  55. //devguide.formats
  56. devguide.formats.html.stylesheet == "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl"
  57. + !devguide.transformerParameters.isEmpty()
  58. + devguide.transformerParameters.get("a") == "b"
  59.  
  60. //assert quickstart book
  61. def quickstart = convention.books.quickstart
  62. 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
  63. index 1917ac5..7125d45 100644
  64. --- a/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/SingleJDocbookSpock.groovy
  65. +++ b/src/test/groovy/org/jboss/gradle/plugins/jdocbook/test/SingleJDocbookSpock.groovy
  66. @@ -57,6 +57,17 @@ class SingleJDocbookSpock extends AbstractJDocbookSpock {
  67. book.translations == ["zh-CN"]
  68. }
  69.  
  70. + def "does transformer parameters get set correctly"(){
  71. + applyScript DEFAULT_SCRIPT
  72. + expect:
  73. + convention != null
  74. + convention.books != null
  75. + convention.commonBook != null
  76. + def book = convention.commonBook
  77. + !book.transformerParameters.isEmpty()
  78. + book.transformerParameters.get("a") == "b"
  79. + }
  80. +
  81. def checkFormat(def format) {
  82. assert FORMATS[format.name].finalName == format.finalName
  83. assert FORMATS[format.name].stylesheet == format.stylesheet
  84. diff --git a/src/test/resources/scripts/default.gradle b/src/test/resources/scripts/default.gradle
  85. index 757fd14..312f048 100644
  86. --- a/src/test/resources/scripts/default.gradle
  87. +++ b/src/test/resources/scripts/default.gradle
  88. @@ -36,6 +36,7 @@ jdocbook {
  89. finalName = 'index.html'
  90. stylesheet = "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl"
  91. }
  92. + transformerParameters = ["a":"b"]
  93. format {
  94. name = 'html'
  95. finalName = 'index.html'
  96. diff --git a/src/test/resources/scripts/mutilbooks.gradle b/src/test/resources/scripts/mutilbooks.gradle
  97. index fb13006..e614ce4 100644
  98. --- a/src/test/resources/scripts/mutilbooks.gradle
  99. +++ b/src/test/resources/scripts/mutilbooks.gradle
  100. @@ -40,9 +40,12 @@ jdocbook {
  101. stylesheet = "classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl"
  102. }
  103.  
  104. + transformerParameters = ["a":"b"]
  105. +
  106. manual {
  107. //baseDirectory = baseDir + 'hibernate-manual' // CoC, scriptsdefault baseDirectory is baseDir+bookName
  108. masterSourceDocumentName = 'HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.xml'
  109. + transformerParameters = ["a":"c"]
  110. format {
  111. name = "pdf"
  112. finalName = "hibernate_reference.pdf"
Add Comment
Please, Sign In to add comment