You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/07/09 14:25:08 UTC

[groovy] 01/02: move assets so that they are in the correct place "in situ" to help with viewing adoc files on github or IDE (closes #1305)

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit a010786a70f5a4012d8267d2345856720d1c0f95
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Jul 9 23:35:03 2020 +1000

    move assets so that they are in the correct place "in situ" to help with viewing adoc files on github or IDE (closes #1305)
---
 gradle/asciidoctor.gradle                                   |   4 ++--
 src/spec/{ => doc}/assets/css/style.css                     |   0
 src/spec/{ => doc}/assets/css/view-example.css              |   0
 .../{ => doc}/assets/img/ChainOfResponsibilityClasses.gif   | Bin
 src/spec/{ => doc}/assets/img/CompositeClasses.gif          | Bin
 src/spec/{ => doc}/assets/img/CompositeComponents.gif       | Bin
 src/spec/{ => doc}/assets/img/GroovyInterceptions.png       | Bin
 src/spec/{ => doc}/assets/img/StrategyClasses.gif           | Bin
 src/spec/{ => doc}/assets/img/TemplateMethodClasses.gif     | Bin
 src/spec/{ => doc}/assets/img/a380.jpg                      | Bin
 src/spec/{ => doc}/assets/img/additionalmodules.png         | Bin
 src/spec/{ => doc}/assets/img/b797-hoax.jpg                 | Bin
 src/spec/{ => doc}/assets/img/catalina.gif                  | Bin
 src/spec/{ => doc}/assets/img/fileassociation.png           | Bin
 src/spec/{ => doc}/assets/img/jconsole-implicit-export.png  | Bin
 src/spec/{ => doc}/assets/img/jconsole.gif                  | Bin
 src/spec/{ => doc}/assets/img/native.jpg                    | Bin
 src/spec/{ => doc}/assets/img/oc4jpie.gif                   | Bin
 src/spec/{ => doc}/assets/img/outdir.png                    | Bin
 src/spec/{ => doc}/assets/img/setup.png                     | Bin
 src/spec/{ => doc}/assets/img/usageMessageSpec.png          | Bin
 src/spec/{ => doc}/assets/img/variables.jpg                 | Bin
 src/spec/{ => doc}/assets/js/jquery-2.1.1.min.js            |   0
 src/spec/{ => doc}/assets/js/view-example.js                |   0
 .../src/spec/{ => doc}/assets/img/GroovyConsole.gif         | Bin
 .../src/spec/{ => doc}/assets/img/astbrowser.png            | Bin
 .../src/spec/{ => doc}/assets/img/gconsole-sc-with-visu.png | Bin
 .../spec/{ => doc}/assets/img/gconsole-sc-without-visu.png  | Bin
 .../src/spec/{ => doc}/assets/img/gconsole-toolbar.png      | Bin
 .../src/spec/{ => doc}/assets/img/SwingBuilder001.gif       | Bin
 30 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/asciidoctor.gradle b/gradle/asciidoctor.gradle
index b0cb0bc..0fad8aa 100644
--- a/gradle/asciidoctor.gradle
+++ b/gradle/asciidoctor.gradle
@@ -84,10 +84,10 @@ asciidoctor {
 asciidoctor.onlyIf { project.file('src/spec/doc').exists() }
 
 task asciidoctorAssets(type:Copy) {
-    from project.fileTree('src/spec/assets')
+    from project.fileTree('src/spec/doc/assets')
     into "${asciidoctor.outputDir}/html5/assets"
 }
-asciidoctor.finalizedBy asciidoctorAssets
+asciidoctor.dependsOn asciidoctorAssets
 
 def adocSanityCheck = { file, text, errors ->
     Set localErrors = []
diff --git a/src/spec/assets/css/style.css b/src/spec/doc/assets/css/style.css
similarity index 100%
rename from src/spec/assets/css/style.css
rename to src/spec/doc/assets/css/style.css
diff --git a/src/spec/assets/css/view-example.css b/src/spec/doc/assets/css/view-example.css
similarity index 100%
rename from src/spec/assets/css/view-example.css
rename to src/spec/doc/assets/css/view-example.css
diff --git a/src/spec/assets/img/ChainOfResponsibilityClasses.gif b/src/spec/doc/assets/img/ChainOfResponsibilityClasses.gif
similarity index 100%
rename from src/spec/assets/img/ChainOfResponsibilityClasses.gif
rename to src/spec/doc/assets/img/ChainOfResponsibilityClasses.gif
diff --git a/src/spec/assets/img/CompositeClasses.gif b/src/spec/doc/assets/img/CompositeClasses.gif
similarity index 100%
rename from src/spec/assets/img/CompositeClasses.gif
rename to src/spec/doc/assets/img/CompositeClasses.gif
diff --git a/src/spec/assets/img/CompositeComponents.gif b/src/spec/doc/assets/img/CompositeComponents.gif
similarity index 100%
rename from src/spec/assets/img/CompositeComponents.gif
rename to src/spec/doc/assets/img/CompositeComponents.gif
diff --git a/src/spec/assets/img/GroovyInterceptions.png b/src/spec/doc/assets/img/GroovyInterceptions.png
similarity index 100%
rename from src/spec/assets/img/GroovyInterceptions.png
rename to src/spec/doc/assets/img/GroovyInterceptions.png
diff --git a/src/spec/assets/img/StrategyClasses.gif b/src/spec/doc/assets/img/StrategyClasses.gif
similarity index 100%
rename from src/spec/assets/img/StrategyClasses.gif
rename to src/spec/doc/assets/img/StrategyClasses.gif
diff --git a/src/spec/assets/img/TemplateMethodClasses.gif b/src/spec/doc/assets/img/TemplateMethodClasses.gif
similarity index 100%
rename from src/spec/assets/img/TemplateMethodClasses.gif
rename to src/spec/doc/assets/img/TemplateMethodClasses.gif
diff --git a/src/spec/assets/img/a380.jpg b/src/spec/doc/assets/img/a380.jpg
similarity index 100%
rename from src/spec/assets/img/a380.jpg
rename to src/spec/doc/assets/img/a380.jpg
diff --git a/src/spec/assets/img/additionalmodules.png b/src/spec/doc/assets/img/additionalmodules.png
similarity index 100%
rename from src/spec/assets/img/additionalmodules.png
rename to src/spec/doc/assets/img/additionalmodules.png
diff --git a/src/spec/assets/img/b797-hoax.jpg b/src/spec/doc/assets/img/b797-hoax.jpg
similarity index 100%
rename from src/spec/assets/img/b797-hoax.jpg
rename to src/spec/doc/assets/img/b797-hoax.jpg
diff --git a/src/spec/assets/img/catalina.gif b/src/spec/doc/assets/img/catalina.gif
similarity index 100%
rename from src/spec/assets/img/catalina.gif
rename to src/spec/doc/assets/img/catalina.gif
diff --git a/src/spec/assets/img/fileassociation.png b/src/spec/doc/assets/img/fileassociation.png
similarity index 100%
rename from src/spec/assets/img/fileassociation.png
rename to src/spec/doc/assets/img/fileassociation.png
diff --git a/src/spec/assets/img/jconsole-implicit-export.png b/src/spec/doc/assets/img/jconsole-implicit-export.png
similarity index 100%
rename from src/spec/assets/img/jconsole-implicit-export.png
rename to src/spec/doc/assets/img/jconsole-implicit-export.png
diff --git a/src/spec/assets/img/jconsole.gif b/src/spec/doc/assets/img/jconsole.gif
similarity index 100%
rename from src/spec/assets/img/jconsole.gif
rename to src/spec/doc/assets/img/jconsole.gif
diff --git a/src/spec/assets/img/native.jpg b/src/spec/doc/assets/img/native.jpg
similarity index 100%
rename from src/spec/assets/img/native.jpg
rename to src/spec/doc/assets/img/native.jpg
diff --git a/src/spec/assets/img/oc4jpie.gif b/src/spec/doc/assets/img/oc4jpie.gif
similarity index 100%
rename from src/spec/assets/img/oc4jpie.gif
rename to src/spec/doc/assets/img/oc4jpie.gif
diff --git a/src/spec/assets/img/outdir.png b/src/spec/doc/assets/img/outdir.png
similarity index 100%
rename from src/spec/assets/img/outdir.png
rename to src/spec/doc/assets/img/outdir.png
diff --git a/src/spec/assets/img/setup.png b/src/spec/doc/assets/img/setup.png
similarity index 100%
rename from src/spec/assets/img/setup.png
rename to src/spec/doc/assets/img/setup.png
diff --git a/src/spec/assets/img/usageMessageSpec.png b/src/spec/doc/assets/img/usageMessageSpec.png
similarity index 100%
rename from src/spec/assets/img/usageMessageSpec.png
rename to src/spec/doc/assets/img/usageMessageSpec.png
diff --git a/src/spec/assets/img/variables.jpg b/src/spec/doc/assets/img/variables.jpg
similarity index 100%
rename from src/spec/assets/img/variables.jpg
rename to src/spec/doc/assets/img/variables.jpg
diff --git a/src/spec/assets/js/jquery-2.1.1.min.js b/src/spec/doc/assets/js/jquery-2.1.1.min.js
similarity index 100%
rename from src/spec/assets/js/jquery-2.1.1.min.js
rename to src/spec/doc/assets/js/jquery-2.1.1.min.js
diff --git a/src/spec/assets/js/view-example.js b/src/spec/doc/assets/js/view-example.js
similarity index 100%
rename from src/spec/assets/js/view-example.js
rename to src/spec/doc/assets/js/view-example.js
diff --git a/subprojects/groovy-console/src/spec/assets/img/GroovyConsole.gif b/subprojects/groovy-console/src/spec/doc/assets/img/GroovyConsole.gif
similarity index 100%
rename from subprojects/groovy-console/src/spec/assets/img/GroovyConsole.gif
rename to subprojects/groovy-console/src/spec/doc/assets/img/GroovyConsole.gif
diff --git a/subprojects/groovy-console/src/spec/assets/img/astbrowser.png b/subprojects/groovy-console/src/spec/doc/assets/img/astbrowser.png
similarity index 100%
rename from subprojects/groovy-console/src/spec/assets/img/astbrowser.png
rename to subprojects/groovy-console/src/spec/doc/assets/img/astbrowser.png
diff --git a/subprojects/groovy-console/src/spec/assets/img/gconsole-sc-with-visu.png b/subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-with-visu.png
similarity index 100%
rename from subprojects/groovy-console/src/spec/assets/img/gconsole-sc-with-visu.png
rename to subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-with-visu.png
diff --git a/subprojects/groovy-console/src/spec/assets/img/gconsole-sc-without-visu.png b/subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-without-visu.png
similarity index 100%
rename from subprojects/groovy-console/src/spec/assets/img/gconsole-sc-without-visu.png
rename to subprojects/groovy-console/src/spec/doc/assets/img/gconsole-sc-without-visu.png
diff --git a/subprojects/groovy-console/src/spec/assets/img/gconsole-toolbar.png b/subprojects/groovy-console/src/spec/doc/assets/img/gconsole-toolbar.png
similarity index 100%
rename from subprojects/groovy-console/src/spec/assets/img/gconsole-toolbar.png
rename to subprojects/groovy-console/src/spec/doc/assets/img/gconsole-toolbar.png
diff --git a/subprojects/groovy-swing/src/spec/assets/img/SwingBuilder001.gif b/subprojects/groovy-swing/src/spec/doc/assets/img/SwingBuilder001.gif
similarity index 100%
rename from subprojects/groovy-swing/src/spec/assets/img/SwingBuilder001.gif
rename to subprojects/groovy-swing/src/spec/doc/assets/img/SwingBuilder001.gif