diff --git a/groowt-all/build.gradle b/groowt-all/build.gradle index 6cee128..f35f418 100644 --- a/groowt-all/build.gradle +++ b/groowt-all/build.gradle @@ -7,7 +7,7 @@ plugins { dependencies { api project(':views') api project(':view-components') - api project(':web-views') + api project(':web-view-components') api project(':di') api project(':extensible') } diff --git a/settings.gradle b/settings.gradle index c5452cd..7a272bd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,7 @@ pluginManagement { rootProject.name = 'groowt' -include 'cli', 'groowt-all', 'groowt-gradle', 'groowt-gradle-model', 'views', 'view-components', 'web-views' +include 'cli', 'groowt-all', 'groowt-gradle', 'groowt-gradle-model', 'views', 'view-components', 'web-view-components' file('util').eachDir { include it.name diff --git a/web-views/.gitignore b/web-view-components/.gitignore similarity index 100% rename from web-views/.gitignore rename to web-view-components/.gitignore diff --git a/web-views/build.gradle b/web-view-components/build.gradle similarity index 100% rename from web-views/build.gradle rename to web-view-components/build.gradle diff --git a/web-views/docs/asciidoc/componentTemplateSpec.asciidoc b/web-view-components/docs/asciidoc/componentTemplateSpec.asciidoc similarity index 100% rename from web-views/docs/asciidoc/componentTemplateSpec.asciidoc rename to web-view-components/docs/asciidoc/componentTemplateSpec.asciidoc diff --git a/web-views/runGroovyc b/web-view-components/runGroovyc similarity index 100% rename from web-views/runGroovyc rename to web-view-components/runGroovyc diff --git a/web-views/sketching.gst b/web-view-components/sketching.gst similarity index 100% rename from web-views/sketching.gst rename to web-view-components/sketching.gst diff --git a/web-views/sketching/groovy/sketching/EchoElement.wvc b/web-view-components/sketching/groovy/sketching/EchoElement.wvc similarity index 100% rename from web-views/sketching/groovy/sketching/EchoElement.wvc rename to web-view-components/sketching/groovy/sketching/EchoElement.wvc diff --git a/web-views/sketching/groovy/sketching/Greeter.groovy b/web-view-components/sketching/groovy/sketching/Greeter.groovy similarity index 100% rename from web-views/sketching/groovy/sketching/Greeter.groovy rename to web-view-components/sketching/groovy/sketching/Greeter.groovy diff --git a/web-views/sketching/groovy/sketching/Greeters.groovy b/web-view-components/sketching/groovy/sketching/Greeters.groovy similarity index 100% rename from web-views/sketching/groovy/sketching/Greeters.groovy rename to web-view-components/sketching/groovy/sketching/Greeters.groovy diff --git a/web-views/sketching/groovy/sketching/HelloTarget.wvc b/web-view-components/sketching/groovy/sketching/HelloTarget.wvc similarity index 100% rename from web-views/sketching/groovy/sketching/HelloTarget.wvc rename to web-view-components/sketching/groovy/sketching/HelloTarget.wvc diff --git a/web-views/sketching/groovy/sketching/Helper.groovy b/web-view-components/sketching/groovy/sketching/Helper.groovy similarity index 100% rename from web-views/sketching/groovy/sketching/Helper.groovy rename to web-view-components/sketching/groovy/sketching/Helper.groovy diff --git a/web-views/sketching/groovy/sketching/MemberClassComponentType.wvc b/web-view-components/sketching/groovy/sketching/MemberClassComponentType.wvc similarity index 100% rename from web-views/sketching/groovy/sketching/MemberClassComponentType.wvc rename to web-view-components/sketching/groovy/sketching/MemberClassComponentType.wvc diff --git a/web-views/sketching/groovy/sketching/PreambleHelloTarget.wvc b/web-view-components/sketching/groovy/sketching/PreambleHelloTarget.wvc similarity index 100% rename from web-views/sketching/groovy/sketching/PreambleHelloTarget.wvc rename to web-view-components/sketching/groovy/sketching/PreambleHelloTarget.wvc diff --git a/web-views/sketching/groovy/sketching/SimpleGreeter.wvc b/web-view-components/sketching/groovy/sketching/SimpleGreeter.wvc similarity index 100% rename from web-views/sketching/groovy/sketching/SimpleGreeter.wvc rename to web-view-components/sketching/groovy/sketching/SimpleGreeter.wvc diff --git a/web-views/sketching/groovy/sketching/TwoGreeters.wvc b/web-view-components/sketching/groovy/sketching/TwoGreeters.wvc similarity index 100% rename from web-views/sketching/groovy/sketching/TwoGreeters.wvc rename to web-view-components/sketching/groovy/sketching/TwoGreeters.wvc diff --git a/web-views/sketching/groovy/sketching/UseGreeter.wvc b/web-view-components/sketching/groovy/sketching/UseGreeter.wvc similarity index 100% rename from web-views/sketching/groovy/sketching/UseGreeter.wvc rename to web-view-components/sketching/groovy/sketching/UseGreeter.wvc diff --git a/web-views/sketching/groovy/sketching/UseHelper.wvc b/web-view-components/sketching/groovy/sketching/UseHelper.wvc similarity index 100% rename from web-views/sketching/groovy/sketching/UseHelper.wvc rename to web-view-components/sketching/groovy/sketching/UseHelper.wvc diff --git a/web-views/src/main/antlr/LexerFragments.g4 b/web-view-components/src/main/antlr/LexerFragments.g4 similarity index 100% rename from web-views/src/main/antlr/LexerFragments.g4 rename to web-view-components/src/main/antlr/LexerFragments.g4 diff --git a/web-views/src/main/antlr/WebViewComponentsLexerBase.g4 b/web-view-components/src/main/antlr/WebViewComponentsLexerBase.g4 similarity index 100% rename from web-views/src/main/antlr/WebViewComponentsLexerBase.g4 rename to web-view-components/src/main/antlr/WebViewComponentsLexerBase.g4 diff --git a/web-views/src/main/antlr/WebViewComponentsParser.g4 b/web-view-components/src/main/antlr/WebViewComponentsParser.g4 similarity index 100% rename from web-views/src/main/antlr/WebViewComponentsParser.g4 rename to web-view-components/src/main/antlr/WebViewComponentsParser.g4 diff --git a/web-views/src/main/groovy/groowt/view/web/BaseWebViewComponent.groovy b/web-view-components/src/main/groovy/groowt/view/web/BaseWebViewComponent.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/BaseWebViewComponent.groovy rename to web-view-components/src/main/groovy/groowt/view/web/BaseWebViewComponent.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/DefaultWebViewComponentContext.groovy b/web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentContext.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/DefaultWebViewComponentContext.groovy rename to web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentContext.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/DefaultWebViewComponentScope.groovy b/web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentScope.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/DefaultWebViewComponentScope.groovy rename to web-view-components/src/main/groovy/groowt/view/web/DefaultWebViewComponentScope.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/WebViewComponentFactories.groovy b/web-view-components/src/main/groovy/groowt/view/web/WebViewComponentFactories.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/WebViewComponentFactories.groovy rename to web-view-components/src/main/groovy/groowt/view/web/WebViewComponentFactories.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/lib/DelegatingWebViewComponent.java b/web-view-components/src/main/groovy/groowt/view/web/lib/DelegatingWebViewComponent.java similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/lib/DelegatingWebViewComponent.java rename to web-view-components/src/main/groovy/groowt/view/web/lib/DelegatingWebViewComponent.java diff --git a/web-views/src/main/groovy/groowt/view/web/lib/Echo.groovy b/web-view-components/src/main/groovy/groowt/view/web/lib/Echo.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/lib/Echo.groovy rename to web-view-components/src/main/groovy/groowt/view/web/lib/Echo.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/lib/Fragment.groovy b/web-view-components/src/main/groovy/groowt/view/web/lib/Fragment.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/lib/Fragment.groovy rename to web-view-components/src/main/groovy/groowt/view/web/lib/Fragment.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/lib/HtmlPage.groovy b/web-view-components/src/main/groovy/groowt/view/web/lib/HtmlPage.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/lib/HtmlPage.groovy rename to web-view-components/src/main/groovy/groowt/view/web/lib/HtmlPage.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/lib/IntrinsicHtml.groovy b/web-view-components/src/main/groovy/groowt/view/web/lib/IntrinsicHtml.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/lib/IntrinsicHtml.groovy rename to web-view-components/src/main/groovy/groowt/view/web/lib/IntrinsicHtml.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/util/ComponentConfigurator.groovy b/web-view-components/src/main/groovy/groowt/view/web/util/ComponentConfigurator.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/util/ComponentConfigurator.groovy rename to web-view-components/src/main/groovy/groowt/view/web/util/ComponentConfigurator.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/util/ConfigurableComponent.groovy b/web-view-components/src/main/groovy/groowt/view/web/util/ConfigurableComponent.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/util/ConfigurableComponent.groovy rename to web-view-components/src/main/groovy/groowt/view/web/util/ConfigurableComponent.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/util/ContextConfigurator.groovy b/web-view-components/src/main/groovy/groowt/view/web/util/ContextConfigurator.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/util/ContextConfigurator.groovy rename to web-view-components/src/main/groovy/groowt/view/web/util/ContextConfigurator.groovy diff --git a/web-views/src/main/groovy/groowt/view/web/util/WithHtml.groovy b/web-view-components/src/main/groovy/groowt/view/web/util/WithHtml.groovy similarity index 100% rename from web-views/src/main/groovy/groowt/view/web/util/WithHtml.groovy rename to web-view-components/src/main/groovy/groowt/view/web/util/WithHtml.groovy diff --git a/web-views/src/main/java/groowt/view/web/AbstractWebViewComponent.java b/web-view-components/src/main/java/groowt/view/web/AbstractWebViewComponent.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/AbstractWebViewComponent.java rename to web-view-components/src/main/java/groowt/view/web/AbstractWebViewComponent.java diff --git a/web-views/src/main/java/groowt/view/web/ChildRenderException.java b/web-view-components/src/main/java/groowt/view/web/ChildRenderException.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ChildRenderException.java rename to web-view-components/src/main/java/groowt/view/web/ChildRenderException.java diff --git a/web-views/src/main/java/groowt/view/web/WebViewComponent.java b/web-view-components/src/main/java/groowt/view/web/WebViewComponent.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/WebViewComponent.java rename to web-view-components/src/main/java/groowt/view/web/WebViewComponent.java diff --git a/web-views/src/main/java/groowt/view/web/WebViewComponentBugError.java b/web-view-components/src/main/java/groowt/view/web/WebViewComponentBugError.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/WebViewComponentBugError.java rename to web-view-components/src/main/java/groowt/view/web/WebViewComponentBugError.java diff --git a/web-views/src/main/java/groowt/view/web/WebViewComponentContext.java b/web-view-components/src/main/java/groowt/view/web/WebViewComponentContext.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/WebViewComponentContext.java rename to web-view-components/src/main/java/groowt/view/web/WebViewComponentContext.java diff --git a/web-views/src/main/java/groowt/view/web/WebViewComponentScope.java b/web-view-components/src/main/java/groowt/view/web/WebViewComponentScope.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/WebViewComponentScope.java rename to web-view-components/src/main/java/groowt/view/web/WebViewComponentScope.java diff --git a/web-views/src/main/java/groowt/view/web/analysis/MismatchedComponentTypeAnalysis.kt b/web-view-components/src/main/java/groowt/view/web/analysis/MismatchedComponentTypeAnalysis.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/analysis/MismatchedComponentTypeAnalysis.kt rename to web-view-components/src/main/java/groowt/view/web/analysis/MismatchedComponentTypeAnalysis.kt diff --git a/web-views/src/main/java/groowt/view/web/antlr/AbstractWebViewComponentsLexer.java b/web-view-components/src/main/java/groowt/view/web/antlr/AbstractWebViewComponentsLexer.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/AbstractWebViewComponentsLexer.java rename to web-view-components/src/main/java/groowt/view/web/antlr/AbstractWebViewComponentsLexer.java diff --git a/web-views/src/main/java/groowt/view/web/antlr/AntlrUtil.java b/web-view-components/src/main/java/groowt/view/web/antlr/AntlrUtil.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/AntlrUtil.java rename to web-view-components/src/main/java/groowt/view/web/antlr/AntlrUtil.java diff --git a/web-views/src/main/java/groowt/view/web/antlr/GroovyTokenSourceIterable.kt b/web-view-components/src/main/java/groowt/view/web/antlr/GroovyTokenSourceIterable.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/GroovyTokenSourceIterable.kt rename to web-view-components/src/main/java/groowt/view/web/antlr/GroovyTokenSourceIterable.kt diff --git a/web-views/src/main/java/groowt/view/web/antlr/LexerSemanticPredicates.kt b/web-view-components/src/main/java/groowt/view/web/antlr/LexerSemanticPredicates.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/LexerSemanticPredicates.kt rename to web-view-components/src/main/java/groowt/view/web/antlr/LexerSemanticPredicates.kt diff --git a/web-views/src/main/java/groowt/view/web/antlr/LexerUtil.kt b/web-view-components/src/main/java/groowt/view/web/antlr/LexerUtil.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/LexerUtil.kt rename to web-view-components/src/main/java/groowt/view/web/antlr/LexerUtil.kt diff --git a/web-views/src/main/java/groowt/view/web/antlr/MergedGroovyCodeToken.kt b/web-view-components/src/main/java/groowt/view/web/antlr/MergedGroovyCodeToken.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/MergedGroovyCodeToken.kt rename to web-view-components/src/main/java/groowt/view/web/antlr/MergedGroovyCodeToken.kt diff --git a/web-views/src/main/java/groowt/view/web/antlr/PairCounter.java b/web-view-components/src/main/java/groowt/view/web/antlr/PairCounter.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/PairCounter.java rename to web-view-components/src/main/java/groowt/view/web/antlr/PairCounter.java diff --git a/web-views/src/main/java/groowt/view/web/antlr/ParserUtil.kt b/web-view-components/src/main/java/groowt/view/web/antlr/ParserUtil.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/ParserUtil.kt rename to web-view-components/src/main/java/groowt/view/web/antlr/ParserUtil.kt diff --git a/web-views/src/main/java/groowt/view/web/antlr/SimplePairCounter.kt b/web-view-components/src/main/java/groowt/view/web/antlr/SimplePairCounter.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/SimplePairCounter.kt rename to web-view-components/src/main/java/groowt/view/web/antlr/SimplePairCounter.kt diff --git a/web-views/src/main/java/groowt/view/web/antlr/TokenList.java b/web-view-components/src/main/java/groowt/view/web/antlr/TokenList.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/TokenList.java rename to web-view-components/src/main/java/groowt/view/web/antlr/TokenList.java diff --git a/web-views/src/main/java/groowt/view/web/antlr/TokenUtil.kt b/web-view-components/src/main/java/groowt/view/web/antlr/TokenUtil.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/TokenUtil.kt rename to web-view-components/src/main/java/groowt/view/web/antlr/TokenUtil.kt diff --git a/web-views/src/main/java/groowt/view/web/antlr/WebViewComponentsLexer.java b/web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsLexer.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/WebViewComponentsLexer.java rename to web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsLexer.java diff --git a/web-views/src/main/java/groowt/view/web/antlr/WebViewComponentsTokenStream.kt b/web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsTokenStream.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/antlr/WebViewComponentsTokenStream.kt rename to web-view-components/src/main/java/groowt/view/web/antlr/WebViewComponentsTokenStream.kt diff --git a/web-views/src/main/java/groowt/view/web/ast/AstBuilder.java b/web-view-components/src/main/java/groowt/view/web/ast/AstBuilder.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/AstBuilder.java rename to web-view-components/src/main/java/groowt/view/web/ast/AstBuilder.java diff --git a/web-views/src/main/java/groowt/view/web/ast/DefaultAstBuilder.java b/web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilder.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/DefaultAstBuilder.java rename to web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilder.java diff --git a/web-views/src/main/java/groowt/view/web/ast/DefaultAstBuilderVisitor.java b/web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilderVisitor.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/DefaultAstBuilderVisitor.java rename to web-view-components/src/main/java/groowt/view/web/ast/DefaultAstBuilderVisitor.java diff --git a/web-views/src/main/java/groowt/view/web/ast/DefaultNodeFactory.java b/web-view-components/src/main/java/groowt/view/web/ast/DefaultNodeFactory.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/DefaultNodeFactory.java rename to web-view-components/src/main/java/groowt/view/web/ast/DefaultNodeFactory.java diff --git a/web-views/src/main/java/groowt/view/web/ast/NodeFactory.java b/web-view-components/src/main/java/groowt/view/web/ast/NodeFactory.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/NodeFactory.java rename to web-view-components/src/main/java/groowt/view/web/ast/NodeFactory.java diff --git a/web-views/src/main/java/groowt/view/web/ast/NodeUtil.java b/web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/NodeUtil.java rename to web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.java diff --git a/web-views/src/main/java/groowt/view/web/ast/NodeUtil.kt b/web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/NodeUtil.kt rename to web-view-components/src/main/java/groowt/view/web/ast/NodeUtil.kt diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/ExtensionUtil.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/ExtensionUtil.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/ExtensionUtil.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/ExtensionUtil.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/GStringNodeExtension.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/GStringNodeExtension.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/GStringNodeExtension.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/GStringNodeExtension.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/GStringPathExtension.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/GStringPathExtension.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/GStringPathExtension.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/GStringPathExtension.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/GStringScriptletExtension.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/GStringScriptletExtension.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/GStringScriptletExtension.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/GStringScriptletExtension.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/GroovyCodeNodeExtension.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/GroovyCodeNodeExtension.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/GroovyCodeNodeExtension.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/GroovyCodeNodeExtension.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/HasExtensionOneOf.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensionOneOf.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/HasExtensionOneOf.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensionOneOf.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/HasExtensions.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensions.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/HasExtensions.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/HasExtensions.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/IterableHasExtensionOneOf.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensionOneOf.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/IterableHasExtensionOneOf.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensionOneOf.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/IterableHasExtensions.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensions.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/IterableHasExtensions.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/IterableHasExtensions.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/NodeExtension.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtension.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/NodeExtension.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtension.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/NodeExtensionContainer.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionContainer.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/NodeExtensionContainer.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionContainer.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/NodeExtensionFactory.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionFactory.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/NodeExtensionFactory.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/NodeExtensionFactory.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/SelfNode.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/SelfNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/SelfNodeRegistryExtension.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNodeRegistryExtension.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/SelfNodeRegistryExtension.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/SelfNodeRegistryExtension.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionContainer.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionContainer.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionContainer.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionContainer.java diff --git a/web-views/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionFactory.java b/web-view-components/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionFactory.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionFactory.java rename to web-view-components/src/main/java/groowt/view/web/ast/extension/SimpleNodeExtensionFactory.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/AbstractLeafNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/AbstractLeafNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/AbstractLeafNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/AbstractLeafNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/AbstractTreeNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/AbstractTreeNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/AbstractTreeNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/AbstractTreeNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/AttrNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/AttrNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/AttrNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/AttrNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/BodyChildNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/BodyChildNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/BodyChildNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/BodyChildNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/BodyNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/BodyNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/BodyNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/BodyNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/BooleanValueAttrNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/BooleanValueAttrNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/BooleanValueAttrNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/BooleanValueAttrNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/ClassComponentTypeNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/ClassComponentTypeNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/ClassComponentTypeNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/ClassComponentTypeNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/ClosureValueNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/ClosureValueNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/ClosureValueNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/ClosureValueNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/CompilationUnitNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/CompilationUnitNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/CompilationUnitNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/CompilationUnitNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/ComponentArgsNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/ComponentArgsNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/ComponentArgsNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/ComponentArgsNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/ComponentConstructorNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/ComponentConstructorNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/ComponentConstructorNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/ComponentConstructorNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/ComponentNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/ComponentNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/ComponentNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/ComponentNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/ComponentTypeNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/ComponentTypeNode.java similarity index 97% rename from web-views/src/main/java/groowt/view/web/ast/node/ComponentTypeNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/ComponentTypeNode.java index dab57a4..9488acd 100644 --- a/web-views/src/main/java/groowt/view/web/ast/node/ComponentTypeNode.java +++ b/web-view-components/src/main/java/groowt/view/web/ast/node/ComponentTypeNode.java @@ -5,7 +5,6 @@ import groowt.view.web.ast.extension.NodeExtensionContainer; import groowt.view.web.util.TokenRange; import org.antlr.v4.runtime.Token; -import java.util.List; import java.util.stream.Collectors; public sealed abstract class ComponentTypeNode extends AbstractLeafNode permits diff --git a/web-views/src/main/java/groowt/view/web/ast/node/ComponentValueNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/ComponentValueNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/ComponentValueNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/ComponentValueNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/DollarReferenceNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/DollarReferenceNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/DollarReferenceNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/DollarReferenceNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/DollarScriptletNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/DollarScriptletNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/DollarScriptletNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/DollarScriptletNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/EmptyClosureValueNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/EmptyClosureValueNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/EmptyClosureValueNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/EmptyClosureValueNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/FragmentComponentNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/FragmentComponentNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/FragmentComponentNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/FragmentComponentNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/GStringBodyTextNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/GStringBodyTextNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/GStringBodyTextNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/GStringBodyTextNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/GStringValueNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/GStringValueNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/GStringValueNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/GStringValueNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/JStringBodyTextNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/JStringBodyTextNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/JStringBodyTextNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/JStringBodyTextNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/JStringValueNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/JStringValueNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/JStringValueNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/JStringValueNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/KeyNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/KeyNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/KeyNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/KeyNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/KeyValueAttrNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/KeyValueAttrNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/KeyValueAttrNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/KeyValueAttrNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/LeafNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/LeafNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/LeafNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/LeafNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/Node.java b/web-view-components/src/main/java/groowt/view/web/ast/node/Node.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/Node.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/Node.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/PlainScriptletNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/PlainScriptletNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/PlainScriptletNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/PlainScriptletNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/PreambleNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/PreambleNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/PreambleNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/PreambleNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/StringComponentTypeNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/StringComponentTypeNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/StringComponentTypeNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/StringComponentTypeNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/TreeNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/TreeNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/TreeNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/TreeNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/TypedComponentNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/TypedComponentNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/TypedComponentNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/TypedComponentNode.java diff --git a/web-views/src/main/java/groowt/view/web/ast/node/ValueNode.java b/web-view-components/src/main/java/groowt/view/web/ast/node/ValueNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/ast/node/ValueNode.java rename to web-view-components/src/main/java/groowt/view/web/ast/node/ValueNode.java diff --git a/web-views/src/main/java/groowt/view/web/compiler/AnonymousWebViewComponent.java b/web-view-components/src/main/java/groowt/view/web/compiler/AnonymousWebViewComponent.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/compiler/AnonymousWebViewComponent.java rename to web-view-components/src/main/java/groowt/view/web/compiler/AnonymousWebViewComponent.java diff --git a/web-views/src/main/java/groowt/view/web/compiler/DefaultWebViewComponentTemplateCompiler.java b/web-view-components/src/main/java/groowt/view/web/compiler/DefaultWebViewComponentTemplateCompiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/compiler/DefaultWebViewComponentTemplateCompiler.java rename to web-view-components/src/main/java/groowt/view/web/compiler/DefaultWebViewComponentTemplateCompiler.java diff --git a/web-views/src/main/java/groowt/view/web/compiler/MultipleWebViewComponentCompileErrorsException.java b/web-view-components/src/main/java/groowt/view/web/compiler/MultipleWebViewComponentCompileErrorsException.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/compiler/MultipleWebViewComponentCompileErrorsException.java rename to web-view-components/src/main/java/groowt/view/web/compiler/MultipleWebViewComponentCompileErrorsException.java diff --git a/web-views/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompileException.java b/web-view-components/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompileException.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompileException.java rename to web-view-components/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompileException.java diff --git a/web-views/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompileUnit.java b/web-view-components/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompileUnit.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompileUnit.java rename to web-view-components/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompileUnit.java diff --git a/web-views/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompiler.java b/web-view-components/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompiler.java rename to web-view-components/src/main/java/groowt/view/web/compiler/WebViewComponentTemplateCompiler.java diff --git a/web-views/src/main/java/groowt/view/web/groovyc/DelegatingWvcParserPlugin.java b/web-view-components/src/main/java/groowt/view/web/groovyc/DelegatingWvcParserPlugin.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/groovyc/DelegatingWvcParserPlugin.java rename to web-view-components/src/main/java/groowt/view/web/groovyc/DelegatingWvcParserPlugin.java diff --git a/web-views/src/main/java/groowt/view/web/groovyc/WvcParserPluginFactory.java b/web-view-components/src/main/java/groowt/view/web/groovyc/WvcParserPluginFactory.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/groovyc/WvcParserPluginFactory.java rename to web-view-components/src/main/java/groowt/view/web/groovyc/WvcParserPluginFactory.java diff --git a/web-views/src/main/java/groowt/view/web/runtime/DefaultSourceMapDeserializer.java b/web-view-components/src/main/java/groowt/view/web/runtime/DefaultSourceMapDeserializer.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/runtime/DefaultSourceMapDeserializer.java rename to web-view-components/src/main/java/groowt/view/web/runtime/DefaultSourceMapDeserializer.java diff --git a/web-views/src/main/java/groowt/view/web/runtime/DefaultWebViewRenderContext.java b/web-view-components/src/main/java/groowt/view/web/runtime/DefaultWebViewRenderContext.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/runtime/DefaultWebViewRenderContext.java rename to web-view-components/src/main/java/groowt/view/web/runtime/DefaultWebViewRenderContext.java diff --git a/web-views/src/main/java/groowt/view/web/runtime/WebViewComponentRenderContext.java b/web-view-components/src/main/java/groowt/view/web/runtime/WebViewComponentRenderContext.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/runtime/WebViewComponentRenderContext.java rename to web-view-components/src/main/java/groowt/view/web/runtime/WebViewComponentRenderContext.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/AppendOrAddStatementFactory.java b/web-view-components/src/main/java/groowt/view/web/transpile/AppendOrAddStatementFactory.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/AppendOrAddStatementFactory.java rename to web-view-components/src/main/java/groowt/view/web/transpile/AppendOrAddStatementFactory.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/BodyTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/BodyTranspiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/BodyTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/BodyTranspiler.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/ComponentTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/ComponentTranspiler.java similarity index 88% rename from web-views/src/main/java/groowt/view/web/transpile/ComponentTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/ComponentTranspiler.java index e641c5f..b0ddf8f 100644 --- a/web-views/src/main/java/groowt/view/web/transpile/ComponentTranspiler.java +++ b/web-view-components/src/main/java/groowt/view/web/transpile/ComponentTranspiler.java @@ -2,7 +2,6 @@ package groowt.view.web.transpile; import groowt.view.web.ast.node.ComponentNode; import groowt.view.web.transpile.TranspilerUtil.TranspilerState; -import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.Statement; import java.util.List; diff --git a/web-views/src/main/java/groowt/view/web/transpile/DefaultAppendOrAddStatementFactory.java b/web-view-components/src/main/java/groowt/view/web/transpile/DefaultAppendOrAddStatementFactory.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/DefaultAppendOrAddStatementFactory.java rename to web-view-components/src/main/java/groowt/view/web/transpile/DefaultAppendOrAddStatementFactory.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/DefaultBodyTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/DefaultBodyTranspiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/DefaultBodyTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/DefaultBodyTranspiler.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/DefaultComponentTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/DefaultComponentTranspiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/DefaultComponentTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/DefaultComponentTranspiler.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/DefaultGStringTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/DefaultGStringTranspiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/DefaultGStringTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/DefaultGStringTranspiler.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/DefaultGroovyTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/DefaultGroovyTranspiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/DefaultGroovyTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/DefaultGroovyTranspiler.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/DefaultJStringTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/DefaultJStringTranspiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/DefaultJStringTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/DefaultJStringTranspiler.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/DefaultSourceMapSerializer.java b/web-view-components/src/main/java/groowt/view/web/transpile/DefaultSourceMapSerializer.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/DefaultSourceMapSerializer.java rename to web-view-components/src/main/java/groowt/view/web/transpile/DefaultSourceMapSerializer.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/DefaultTranspilerConfiguration.java b/web-view-components/src/main/java/groowt/view/web/transpile/DefaultTranspilerConfiguration.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/DefaultTranspilerConfiguration.java rename to web-view-components/src/main/java/groowt/view/web/transpile/DefaultTranspilerConfiguration.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/DefaultValueNodeTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/DefaultValueNodeTranspiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/DefaultValueNodeTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/DefaultValueNodeTranspiler.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/GStringTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/GStringTranspiler.java similarity index 80% rename from web-views/src/main/java/groowt/view/web/transpile/GStringTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/GStringTranspiler.java index 7676cc6..988b2b8 100644 --- a/web-views/src/main/java/groowt/view/web/transpile/GStringTranspiler.java +++ b/web-view-components/src/main/java/groowt/view/web/transpile/GStringTranspiler.java @@ -1,11 +1,8 @@ package groowt.view.web.transpile; import groowt.view.web.ast.node.GStringBodyTextNode; -import groowt.view.web.ast.node.Node; import org.codehaus.groovy.ast.expr.GStringExpression; -import java.util.List; - public interface GStringTranspiler { GStringExpression createGStringExpression(GStringBodyTextNode parent); } diff --git a/web-views/src/main/java/groowt/view/web/transpile/GroovyTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/GroovyTranspiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/GroovyTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/GroovyTranspiler.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/JStringTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/JStringTranspiler.java similarity index 92% rename from web-views/src/main/java/groowt/view/web/transpile/JStringTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/JStringTranspiler.java index 51b13bb..65846bd 100644 --- a/web-views/src/main/java/groowt/view/web/transpile/JStringTranspiler.java +++ b/web-view-components/src/main/java/groowt/view/web/transpile/JStringTranspiler.java @@ -2,7 +2,6 @@ package groowt.view.web.transpile; import groowt.view.web.ast.node.JStringBodyTextNode; import groowt.view.web.ast.node.JStringValueNode; -import groowt.view.web.ast.node.Node; import org.codehaus.groovy.ast.expr.ConstantExpression; public interface JStringTranspiler { diff --git a/web-views/src/main/java/groowt/view/web/transpile/PositionSetter.java b/web-view-components/src/main/java/groowt/view/web/transpile/PositionSetter.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/PositionSetter.java rename to web-view-components/src/main/java/groowt/view/web/transpile/PositionSetter.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/SimplePositionSetter.java b/web-view-components/src/main/java/groowt/view/web/transpile/SimplePositionSetter.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/SimplePositionSetter.java rename to web-view-components/src/main/java/groowt/view/web/transpile/SimplePositionSetter.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/SourceMap.java b/web-view-components/src/main/java/groowt/view/web/transpile/SourceMap.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/SourceMap.java rename to web-view-components/src/main/java/groowt/view/web/transpile/SourceMap.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/SourceMapDeserializer.java b/web-view-components/src/main/java/groowt/view/web/transpile/SourceMapDeserializer.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/SourceMapDeserializer.java rename to web-view-components/src/main/java/groowt/view/web/transpile/SourceMapDeserializer.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/SourceMapSerializer.java b/web-view-components/src/main/java/groowt/view/web/transpile/SourceMapSerializer.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/SourceMapSerializer.java rename to web-view-components/src/main/java/groowt/view/web/transpile/SourceMapSerializer.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/TranspilerConfiguration.java b/web-view-components/src/main/java/groowt/view/web/transpile/TranspilerConfiguration.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/TranspilerConfiguration.java rename to web-view-components/src/main/java/groowt/view/web/transpile/TranspilerConfiguration.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/TranspilerUtil.java b/web-view-components/src/main/java/groowt/view/web/transpile/TranspilerUtil.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/TranspilerUtil.java rename to web-view-components/src/main/java/groowt/view/web/transpile/TranspilerUtil.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/ValueNodeTranspiler.java b/web-view-components/src/main/java/groowt/view/web/transpile/ValueNodeTranspiler.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/ValueNodeTranspiler.java rename to web-view-components/src/main/java/groowt/view/web/transpile/ValueNodeTranspiler.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/WebViewComponentModuleNode.java b/web-view-components/src/main/java/groowt/view/web/transpile/WebViewComponentModuleNode.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/WebViewComponentModuleNode.java rename to web-view-components/src/main/java/groowt/view/web/transpile/WebViewComponentModuleNode.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/WebViewComponentReaderSource.java b/web-view-components/src/main/java/groowt/view/web/transpile/WebViewComponentReaderSource.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/WebViewComponentReaderSource.java rename to web-view-components/src/main/java/groowt/view/web/transpile/WebViewComponentReaderSource.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/WebViewComponentSourceUnit.java b/web-view-components/src/main/java/groowt/view/web/transpile/WebViewComponentSourceUnit.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/WebViewComponentSourceUnit.java rename to web-view-components/src/main/java/groowt/view/web/transpile/WebViewComponentSourceUnit.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/groovy/GroovyPrettyPrinter.java b/web-view-components/src/main/java/groowt/view/web/transpile/groovy/GroovyPrettyPrinter.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/groovy/GroovyPrettyPrinter.java rename to web-view-components/src/main/java/groowt/view/web/transpile/groovy/GroovyPrettyPrinter.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/groovy/GroovyUtil.java b/web-view-components/src/main/java/groowt/view/web/transpile/groovy/GroovyUtil.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/groovy/GroovyUtil.java rename to web-view-components/src/main/java/groowt/view/web/transpile/groovy/GroovyUtil.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/groovy/GroovyUtil.kt b/web-view-components/src/main/java/groowt/view/web/transpile/groovy/GroovyUtil.kt similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/groovy/GroovyUtil.kt rename to web-view-components/src/main/java/groowt/view/web/transpile/groovy/GroovyUtil.kt diff --git a/web-views/src/main/java/groowt/view/web/transpile/resolve/CachingComponentClassNodeResolver.java b/web-view-components/src/main/java/groowt/view/web/transpile/resolve/CachingComponentClassNodeResolver.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/resolve/CachingComponentClassNodeResolver.java rename to web-view-components/src/main/java/groowt/view/web/transpile/resolve/CachingComponentClassNodeResolver.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/resolve/ClassLoaderComponentClassNodeResolver.java b/web-view-components/src/main/java/groowt/view/web/transpile/resolve/ClassLoaderComponentClassNodeResolver.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/resolve/ClassLoaderComponentClassNodeResolver.java rename to web-view-components/src/main/java/groowt/view/web/transpile/resolve/ClassLoaderComponentClassNodeResolver.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/resolve/ComponentClassNodeResolver.java b/web-view-components/src/main/java/groowt/view/web/transpile/resolve/ComponentClassNodeResolver.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/resolve/ComponentClassNodeResolver.java rename to web-view-components/src/main/java/groowt/view/web/transpile/resolve/ComponentClassNodeResolver.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/resolve/ModuleNodeComponentClassNodeResolver.java b/web-view-components/src/main/java/groowt/view/web/transpile/resolve/ModuleNodeComponentClassNodeResolver.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/resolve/ModuleNodeComponentClassNodeResolver.java rename to web-view-components/src/main/java/groowt/view/web/transpile/resolve/ModuleNodeComponentClassNodeResolver.java diff --git a/web-views/src/main/java/groowt/view/web/transpile/resolve/ResolveUtil.java b/web-view-components/src/main/java/groowt/view/web/transpile/resolve/ResolveUtil.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/transpile/resolve/ResolveUtil.java rename to web-view-components/src/main/java/groowt/view/web/transpile/resolve/ResolveUtil.java diff --git a/web-views/src/main/java/groowt/view/web/util/AbstractClosedRange.java b/web-view-components/src/main/java/groowt/view/web/util/AbstractClosedRange.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/AbstractClosedRange.java rename to web-view-components/src/main/java/groowt/view/web/util/AbstractClosedRange.java diff --git a/web-views/src/main/java/groowt/view/web/util/ClosedRange.java b/web-view-components/src/main/java/groowt/view/web/util/ClosedRange.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/ClosedRange.java rename to web-view-components/src/main/java/groowt/view/web/util/ClosedRange.java diff --git a/web-views/src/main/java/groowt/view/web/util/ComparableClosedRange.java b/web-view-components/src/main/java/groowt/view/web/util/ComparableClosedRange.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/ComparableClosedRange.java rename to web-view-components/src/main/java/groowt/view/web/util/ComparableClosedRange.java diff --git a/web-views/src/main/java/groowt/view/web/util/ComparatorClosedRange.java b/web-view-components/src/main/java/groowt/view/web/util/ComparatorClosedRange.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/ComparatorClosedRange.java rename to web-view-components/src/main/java/groowt/view/web/util/ComparatorClosedRange.java diff --git a/web-views/src/main/java/groowt/view/web/util/EmptyRange.java b/web-view-components/src/main/java/groowt/view/web/util/EmptyRange.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/EmptyRange.java rename to web-view-components/src/main/java/groowt/view/web/util/EmptyRange.java diff --git a/web-views/src/main/java/groowt/view/web/util/EmptyTokenRange.java b/web-view-components/src/main/java/groowt/view/web/util/EmptyTokenRange.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/EmptyTokenRange.java rename to web-view-components/src/main/java/groowt/view/web/util/EmptyTokenRange.java diff --git a/web-views/src/main/java/groowt/view/web/util/FilteringIterable.java b/web-view-components/src/main/java/groowt/view/web/util/FilteringIterable.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/FilteringIterable.java rename to web-view-components/src/main/java/groowt/view/web/util/FilteringIterable.java diff --git a/web-views/src/main/java/groowt/view/web/util/FilteringIterator.java b/web-view-components/src/main/java/groowt/view/web/util/FilteringIterator.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/FilteringIterator.java rename to web-view-components/src/main/java/groowt/view/web/util/FilteringIterator.java diff --git a/web-views/src/main/java/groowt/view/web/util/MappingIterable.java b/web-view-components/src/main/java/groowt/view/web/util/MappingIterable.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/MappingIterable.java rename to web-view-components/src/main/java/groowt/view/web/util/MappingIterable.java diff --git a/web-views/src/main/java/groowt/view/web/util/MappingIterator.java b/web-view-components/src/main/java/groowt/view/web/util/MappingIterator.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/MappingIterator.java rename to web-view-components/src/main/java/groowt/view/web/util/MappingIterator.java diff --git a/web-views/src/main/java/groowt/view/web/util/OpenRange.java b/web-view-components/src/main/java/groowt/view/web/util/OpenRange.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/OpenRange.java rename to web-view-components/src/main/java/groowt/view/web/util/OpenRange.java diff --git a/web-views/src/main/java/groowt/view/web/util/Range.java b/web-view-components/src/main/java/groowt/view/web/util/Range.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/Range.java rename to web-view-components/src/main/java/groowt/view/web/util/Range.java diff --git a/web-views/src/main/java/groowt/view/web/util/RangeIterator.java b/web-view-components/src/main/java/groowt/view/web/util/RangeIterator.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/RangeIterator.java rename to web-view-components/src/main/java/groowt/view/web/util/RangeIterator.java diff --git a/web-views/src/main/java/groowt/view/web/util/SimpleRangeIterator.java b/web-view-components/src/main/java/groowt/view/web/util/SimpleRangeIterator.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/SimpleRangeIterator.java rename to web-view-components/src/main/java/groowt/view/web/util/SimpleRangeIterator.java diff --git a/web-views/src/main/java/groowt/view/web/util/SimpleTokenRange.java b/web-view-components/src/main/java/groowt/view/web/util/SimpleTokenRange.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/SimpleTokenRange.java rename to web-view-components/src/main/java/groowt/view/web/util/SimpleTokenRange.java diff --git a/web-views/src/main/java/groowt/view/web/util/SourcePosition.java b/web-view-components/src/main/java/groowt/view/web/util/SourcePosition.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/SourcePosition.java rename to web-view-components/src/main/java/groowt/view/web/util/SourcePosition.java diff --git a/web-views/src/main/java/groowt/view/web/util/TokenRange.java b/web-view-components/src/main/java/groowt/view/web/util/TokenRange.java similarity index 100% rename from web-views/src/main/java/groowt/view/web/util/TokenRange.java rename to web-view-components/src/main/java/groowt/view/web/util/TokenRange.java diff --git a/web-views/src/main/resources/META-INF/services/org.codehaus.groovy.source.Extensions b/web-view-components/src/main/resources/META-INF/services/org.codehaus.groovy.source.Extensions similarity index 100% rename from web-views/src/main/resources/META-INF/services/org.codehaus.groovy.source.Extensions rename to web-view-components/src/main/resources/META-INF/services/org.codehaus.groovy.source.Extensions diff --git a/web-views/src/main/resources/groowt/view/web/groovyc/GroovycConfigurationScript.groovy b/web-view-components/src/main/resources/groowt/view/web/groovyc/GroovycConfigurationScript.groovy similarity index 100% rename from web-views/src/main/resources/groowt/view/web/groovyc/GroovycConfigurationScript.groovy rename to web-view-components/src/main/resources/groowt/view/web/groovyc/GroovycConfigurationScript.groovy diff --git a/web-views/src/main/resources/groowt/view/web/lib/EchoTemplateNoChildren.gst b/web-view-components/src/main/resources/groowt/view/web/lib/EchoTemplateNoChildren.gst similarity index 100% rename from web-views/src/main/resources/groowt/view/web/lib/EchoTemplateNoChildren.gst rename to web-view-components/src/main/resources/groowt/view/web/lib/EchoTemplateNoChildren.gst diff --git a/web-views/src/main/resources/groowt/view/web/lib/EchoTemplateWithChildren.gst b/web-view-components/src/main/resources/groowt/view/web/lib/EchoTemplateWithChildren.gst similarity index 100% rename from web-views/src/main/resources/groowt/view/web/lib/EchoTemplateWithChildren.gst rename to web-view-components/src/main/resources/groowt/view/web/lib/EchoTemplateWithChildren.gst diff --git a/web-views/src/test/ast/complicated.wvc b/web-view-components/src/test/ast/complicated.wvc similarity index 100% rename from web-views/src/test/ast/complicated.wvc rename to web-view-components/src/test/ast/complicated.wvc diff --git a/web-views/src/test/ast/helloTarget.wvc b/web-view-components/src/test/ast/helloTarget.wvc similarity index 100% rename from web-views/src/test/ast/helloTarget.wvc rename to web-view-components/src/test/ast/helloTarget.wvc diff --git a/web-views/src/test/ast/simpleComponentWithBody.wvc b/web-view-components/src/test/ast/simpleComponentWithBody.wvc similarity index 100% rename from web-views/src/test/ast/simpleComponentWithBody.wvc rename to web-view-components/src/test/ast/simpleComponentWithBody.wvc diff --git a/web-views/src/test/ast/trees/complicated_ast.txt b/web-view-components/src/test/ast/trees/complicated_ast.txt similarity index 100% rename from web-views/src/test/ast/trees/complicated_ast.txt rename to web-view-components/src/test/ast/trees/complicated_ast.txt diff --git a/web-views/src/test/ast/trees/helloTarget_ast.txt b/web-view-components/src/test/ast/trees/helloTarget_ast.txt similarity index 100% rename from web-views/src/test/ast/trees/helloTarget_ast.txt rename to web-view-components/src/test/ast/trees/helloTarget_ast.txt diff --git a/web-views/src/test/ast/trees/simpleComponentWithBody_ast.txt b/web-view-components/src/test/ast/trees/simpleComponentWithBody_ast.txt similarity index 100% rename from web-views/src/test/ast/trees/simpleComponentWithBody_ast.txt rename to web-view-components/src/test/ast/trees/simpleComponentWithBody_ast.txt diff --git a/web-views/src/test/groovy/groowt/view/web/BaseWebViewComponentTests.groovy b/web-view-components/src/test/groovy/groowt/view/web/BaseWebViewComponentTests.groovy similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/BaseWebViewComponentTests.groovy rename to web-view-components/src/test/groovy/groowt/view/web/BaseWebViewComponentTests.groovy diff --git a/web-views/src/test/groovy/groowt/view/web/SimpleWebViewComponentTests.groovy b/web-view-components/src/test/groovy/groowt/view/web/SimpleWebViewComponentTests.groovy similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/SimpleWebViewComponentTests.groovy rename to web-view-components/src/test/groovy/groowt/view/web/SimpleWebViewComponentTests.groovy diff --git a/web-views/src/test/groovy/groowt/view/web/antlr/WebViewComponentsLexerTests.java b/web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsLexerTests.java similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/antlr/WebViewComponentsLexerTests.java rename to web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsLexerTests.java diff --git a/web-views/src/test/groovy/groowt/view/web/antlr/WebViewComponentsParserTests.java b/web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsParserTests.java similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/antlr/WebViewComponentsParserTests.java rename to web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsParserTests.java diff --git a/web-views/src/test/groovy/groowt/view/web/antlr/WebViewComponentsTokenStreamTests.groovy b/web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsTokenStreamTests.groovy similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/antlr/WebViewComponentsTokenStreamTests.groovy rename to web-view-components/src/test/groovy/groowt/view/web/antlr/WebViewComponentsTokenStreamTests.groovy diff --git a/web-views/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderTests.java b/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderTests.java similarity index 96% rename from web-views/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderTests.java rename to web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderTests.java index 9ffe9b1..f6baeee 100644 --- a/web-views/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderTests.java +++ b/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderTests.java @@ -2,7 +2,6 @@ package groowt.view.web.ast; import groowt.view.web.antlr.ParserUtil; import groowt.view.web.antlr.TokenList; -import org.junit.jupiter.api.Test; import java.io.File; import java.nio.file.Path; diff --git a/web-views/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderVisitorTests.groovy b/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderVisitorTests.groovy similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderVisitorTests.groovy rename to web-view-components/src/test/groovy/groowt/view/web/ast/DefaultAstBuilderVisitorTests.groovy diff --git a/web-views/src/test/groovy/groowt/view/web/ast/DefaultNodeFactoryTests.java b/web-view-components/src/test/groovy/groowt/view/web/ast/DefaultNodeFactoryTests.java similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/ast/DefaultNodeFactoryTests.java rename to web-view-components/src/test/groovy/groowt/view/web/ast/DefaultNodeFactoryTests.java diff --git a/web-views/src/test/groovy/groowt/view/web/lib/EchoTests.groovy b/web-view-components/src/test/groovy/groowt/view/web/lib/EchoTests.groovy similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/lib/EchoTests.groovy rename to web-view-components/src/test/groovy/groowt/view/web/lib/EchoTests.groovy diff --git a/web-views/src/test/groovy/groowt/view/web/lib/FragmentTests.groovy b/web-view-components/src/test/groovy/groowt/view/web/lib/FragmentTests.groovy similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/lib/FragmentTests.groovy rename to web-view-components/src/test/groovy/groowt/view/web/lib/FragmentTests.groovy diff --git a/web-views/src/test/groovy/groowt/view/web/lib/IntrinsicHtmlTests.groovy b/web-view-components/src/test/groovy/groowt/view/web/lib/IntrinsicHtmlTests.groovy similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/lib/IntrinsicHtmlTests.groovy rename to web-view-components/src/test/groovy/groowt/view/web/lib/IntrinsicHtmlTests.groovy diff --git a/web-views/src/test/groovy/groowt/view/web/transpiler/DefaultBodyTranspilerTests.java b/web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultBodyTranspilerTests.java similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/transpiler/DefaultBodyTranspilerTests.java rename to web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultBodyTranspilerTests.java diff --git a/web-views/src/test/groovy/groowt/view/web/transpiler/DefaultGStringTranspilerTests.java b/web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGStringTranspilerTests.java similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/transpiler/DefaultGStringTranspilerTests.java rename to web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGStringTranspilerTests.java diff --git a/web-views/src/test/groovy/groowt/view/web/transpiler/DefaultGroovyTranspilerTests.java b/web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGroovyTranspilerTests.java similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/transpiler/DefaultGroovyTranspilerTests.java rename to web-view-components/src/test/groovy/groowt/view/web/transpiler/DefaultGroovyTranspilerTests.java diff --git a/web-views/src/test/groovy/groowt/view/web/transpiler/resolve/ResolveUtilTests.java b/web-view-components/src/test/groovy/groowt/view/web/transpiler/resolve/ResolveUtilTests.java similarity index 100% rename from web-views/src/test/groovy/groowt/view/web/transpiler/resolve/ResolveUtilTests.java rename to web-view-components/src/test/groovy/groowt/view/web/transpiler/resolve/ResolveUtilTests.java diff --git a/web-views/src/test/parser/blankPreambleOnly.wvc b/web-view-components/src/test/parser/blankPreambleOnly.wvc similarity index 100% rename from web-views/src/test/parser/blankPreambleOnly.wvc rename to web-view-components/src/test/parser/blankPreambleOnly.wvc diff --git a/web-views/src/test/parser/blankPreambleWithExtraLines.wvc b/web-view-components/src/test/parser/blankPreambleWithExtraLines.wvc similarity index 100% rename from web-views/src/test/parser/blankPreambleWithExtraLines.wvc rename to web-view-components/src/test/parser/blankPreambleWithExtraLines.wvc diff --git a/web-views/src/test/parser/complicated.wvc b/web-view-components/src/test/parser/complicated.wvc similarity index 100% rename from web-views/src/test/parser/complicated.wvc rename to web-view-components/src/test/parser/complicated.wvc diff --git a/web-views/src/test/parser/helloTarget.wvc b/web-view-components/src/test/parser/helloTarget.wvc similarity index 100% rename from web-views/src/test/parser/helloTarget.wvc rename to web-view-components/src/test/parser/helloTarget.wvc diff --git a/web-views/src/test/parser/preambleWithClass.wvc b/web-view-components/src/test/parser/preambleWithClass.wvc similarity index 100% rename from web-views/src/test/parser/preambleWithClass.wvc rename to web-view-components/src/test/parser/preambleWithClass.wvc diff --git a/web-views/src/test/parser/trees/blankPreambleOnly_parseTree.txt b/web-view-components/src/test/parser/trees/blankPreambleOnly_parseTree.txt similarity index 100% rename from web-views/src/test/parser/trees/blankPreambleOnly_parseTree.txt rename to web-view-components/src/test/parser/trees/blankPreambleOnly_parseTree.txt diff --git a/web-views/src/test/parser/trees/blankPreambleWithExtraLines_parseTree.txt b/web-view-components/src/test/parser/trees/blankPreambleWithExtraLines_parseTree.txt similarity index 100% rename from web-views/src/test/parser/trees/blankPreambleWithExtraLines_parseTree.txt rename to web-view-components/src/test/parser/trees/blankPreambleWithExtraLines_parseTree.txt diff --git a/web-views/src/test/parser/trees/complicated_parseTree.txt b/web-view-components/src/test/parser/trees/complicated_parseTree.txt similarity index 100% rename from web-views/src/test/parser/trees/complicated_parseTree.txt rename to web-view-components/src/test/parser/trees/complicated_parseTree.txt diff --git a/web-views/src/test/parser/trees/helloTarget_parseTree.txt b/web-view-components/src/test/parser/trees/helloTarget_parseTree.txt similarity index 100% rename from web-views/src/test/parser/trees/helloTarget_parseTree.txt rename to web-view-components/src/test/parser/trees/helloTarget_parseTree.txt diff --git a/web-views/src/test/parser/trees/preambleWithClass_parseTree.txt b/web-view-components/src/test/parser/trees/preambleWithClass_parseTree.txt similarity index 100% rename from web-views/src/test/parser/trees/preambleWithClass_parseTree.txt rename to web-view-components/src/test/parser/trees/preambleWithClass_parseTree.txt diff --git a/web-views/src/test/resources/groowt/view/web/antlr/mergesGroovyTokens.gst b/web-view-components/src/test/resources/groowt/view/web/antlr/mergesGroovyTokens.gst similarity index 100% rename from web-views/src/test/resources/groowt/view/web/antlr/mergesGroovyTokens.gst rename to web-view-components/src/test/resources/groowt/view/web/antlr/mergesGroovyTokens.gst diff --git a/web-views/src/test/resources/log4j2.xml b/web-view-components/src/test/resources/log4j2.xml similarity index 100% rename from web-views/src/test/resources/log4j2.xml rename to web-view-components/src/test/resources/log4j2.xml diff --git a/web-views/src/testFixtures/groovy/groowt/view/web/lib/AbstractWebViewComponentTests.groovy b/web-view-components/src/testFixtures/groovy/groowt/view/web/lib/AbstractWebViewComponentTests.groovy similarity index 100% rename from web-views/src/testFixtures/groovy/groowt/view/web/lib/AbstractWebViewComponentTests.groovy rename to web-view-components/src/testFixtures/groovy/groowt/view/web/lib/AbstractWebViewComponentTests.groovy diff --git a/web-views/src/testFixtures/groovy/groowt/view/web/lib/WithContext.groovy b/web-view-components/src/testFixtures/groovy/groowt/view/web/lib/WithContext.groovy similarity index 100% rename from web-views/src/testFixtures/groovy/groowt/view/web/lib/WithContext.groovy rename to web-view-components/src/testFixtures/groovy/groowt/view/web/lib/WithContext.groovy diff --git a/web-views/src/testFixtures/java/groowt/view/web/ast/AstBuilderTests.java b/web-view-components/src/testFixtures/java/groowt/view/web/ast/AstBuilderTests.java similarity index 100% rename from web-views/src/testFixtures/java/groowt/view/web/ast/AstBuilderTests.java rename to web-view-components/src/testFixtures/java/groowt/view/web/ast/AstBuilderTests.java diff --git a/web-views/src/testFixtures/java/groowt/view/web/ast/NodeFactoryTests.java b/web-view-components/src/testFixtures/java/groowt/view/web/ast/NodeFactoryTests.java similarity index 100% rename from web-views/src/testFixtures/java/groowt/view/web/ast/NodeFactoryTests.java rename to web-view-components/src/testFixtures/java/groowt/view/web/ast/NodeFactoryTests.java diff --git a/web-views/src/testFixtures/java/groowt/view/web/transpiler/BodyTranspilerTests.java b/web-view-components/src/testFixtures/java/groowt/view/web/transpiler/BodyTranspilerTests.java similarity index 100% rename from web-views/src/testFixtures/java/groowt/view/web/transpiler/BodyTranspilerTests.java rename to web-view-components/src/testFixtures/java/groowt/view/web/transpiler/BodyTranspilerTests.java diff --git a/web-views/src/testFixtures/java/groowt/view/web/transpiler/GStringTranspilerTests.java b/web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GStringTranspilerTests.java similarity index 100% rename from web-views/src/testFixtures/java/groowt/view/web/transpiler/GStringTranspilerTests.java rename to web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GStringTranspilerTests.java diff --git a/web-views/src/testFixtures/java/groowt/view/web/transpiler/GroovyTranspilerTests.java b/web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GroovyTranspilerTests.java similarity index 100% rename from web-views/src/testFixtures/java/groowt/view/web/transpiler/GroovyTranspilerTests.java rename to web-view-components/src/testFixtures/java/groowt/view/web/transpiler/GroovyTranspilerTests.java diff --git a/web-views/src/tools/binTemplate.gst b/web-view-components/src/tools/binTemplate.gst similarity index 100% rename from web-views/src/tools/binTemplate.gst rename to web-view-components/src/tools/binTemplate.gst diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/AbstractTreeFileMaker.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/AbstractTreeFileMaker.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/AbstractTreeFileMaker.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/AbstractTreeFileMaker.groovy diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/AstFileMaker.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMaker.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/AstFileMaker.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMaker.groovy diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/AstFileMakerCli.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMakerCli.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/AstFileMakerCli.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/AstFileMakerCli.groovy diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/ConvertToGroovy.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/ConvertToGroovy.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/ConvertToGroovy.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/ConvertToGroovy.groovy diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMaker.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMaker.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMaker.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMaker.groovy diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMakerCli.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMakerCli.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMakerCli.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/ParseTreeFileMakerCli.groovy diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/RunTemplate.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/RunTemplate.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/RunTemplate.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/RunTemplate.groovy diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/SourceFileProcessor.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessor.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/SourceFileProcessor.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessor.groovy diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/SourceFileProcessorSpec.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessorSpec.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/SourceFileProcessorSpec.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/SourceFileProcessorSpec.groovy diff --git a/web-views/src/tools/groovy/groowt/view/web/tools/inspectNodes.groovy b/web-view-components/src/tools/groovy/groowt/view/web/tools/inspectNodes.groovy similarity index 100% rename from web-views/src/tools/groovy/groowt/view/web/tools/inspectNodes.groovy rename to web-view-components/src/tools/groovy/groowt/view/web/tools/inspectNodes.groovy diff --git a/web-views/src/tools/kotlin/groowt/view/web/tools/LexerTool.kt b/web-view-components/src/tools/kotlin/groowt/view/web/tools/LexerTool.kt similarity index 100% rename from web-views/src/tools/kotlin/groowt/view/web/tools/LexerTool.kt rename to web-view-components/src/tools/kotlin/groowt/view/web/tools/LexerTool.kt diff --git a/web-views/src/tools/kotlin/groowt/view/web/tools/ParserTool.kt b/web-view-components/src/tools/kotlin/groowt/view/web/tools/ParserTool.kt similarity index 100% rename from web-views/src/tools/kotlin/groowt/view/web/tools/ParserTool.kt rename to web-view-components/src/tools/kotlin/groowt/view/web/tools/ParserTool.kt diff --git a/web-views/src/tools/kotlin/groowt/view/web/tools/ToolUtil.kt b/web-view-components/src/tools/kotlin/groowt/view/web/tools/ToolUtil.kt similarity index 100% rename from web-views/src/tools/kotlin/groowt/view/web/tools/ToolUtil.kt rename to web-view-components/src/tools/kotlin/groowt/view/web/tools/ToolUtil.kt diff --git a/web-views/src/tools/resources/log4j2.xml b/web-view-components/src/tools/resources/log4j2.xml similarity index 100% rename from web-views/src/tools/resources/log4j2.xml rename to web-view-components/src/tools/resources/log4j2.xml diff --git a/web-views/todo.md b/web-view-components/todo.md similarity index 100% rename from web-views/todo.md rename to web-view-components/todo.md