Added: sling/trunk/contrib/scripting/sightly/SLING-4206.patch URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/sightly/SLING-4206.patch?rev=1642281&view=auto ============================================================================== --- sling/trunk/contrib/scripting/sightly/SLING-4206.patch (added) +++ sling/trunk/contrib/scripting/sightly/SLING-4206.patch Fri Nov 28 10:18:01 2014 @@ -0,0 +1,43730 @@ +From d554d612423a2a95c679b270abbc961571e7e51a Mon Sep 17 00:00:00 2001 +From: Radu Cotescu <r...@apache.org> +Date: Thu, 27 Nov 2014 18:02:21 +0200 +Subject: [PATCH] SLING-4206 - [Sightly Engine] Refactor the Sightly Engine API + +* refactored exported API to expose only the bare minimum +* refactored implementation to remove unneeded abstractions +--- + contrib/scripting/sightly/engine/pom.xml | 3 - + .../sling/parser/expr/generated/SightlyLexer.g4 | 120 ----- + .../sling/parser/expr/generated/SightlyParser.g4 | 139 ------ + .../impl/parser/expr/generated/SightlyLexer.g4 | 120 +++++ + .../impl/parser/expr/generated/SightlyParser.g4 | 139 ++++++ + .../org/apache/sling/scripting/sightly/Record.java | 47 ++ + .../scripting/sightly/ResourceResolution.java | 176 +++++++ + .../sling/scripting/sightly/SightlyException.java | 42 ++ + .../scripting/sightly/api/BaseRenderUnit.java | 144 ------ + .../scripting/sightly/api/ExtensionInstance.java | 36 -- + .../sling/scripting/sightly/api/ObjectModel.java | 111 ----- + .../scripting/sightly/api/ProviderOutcome.java | 95 ---- + .../apache/sling/scripting/sightly/api/Record.java | 47 -- + .../sling/scripting/sightly/api/RenderContext.java | 111 ----- + .../sling/scripting/sightly/api/RenderUnit.java | 39 -- + .../scripting/sightly/api/ResourceResolution.java | 179 ------- + .../scripting/sightly/api/RuntimeExtension.java | 41 -- + .../sightly/api/RuntimeExtensionComponent.java | 65 --- + .../sightly/api/RuntimeExtensionException.java | 41 -- + .../sightly/api/SightlyEngineException.java | 40 -- + .../sightly/api/SightlyParsingException.java | 57 --- + .../sightly/api/SightlyRenderException.java | 41 -- + .../scripting/sightly/api/SightlyRuntime.java | 40 -- + .../scripting/sightly/api/SightlyUseException.java | 40 -- + .../sling/scripting/sightly/api/StackedWriter.java | 83 ---- + .../sling/scripting/sightly/api/UnitLocator.java | 37 -- + .../apache/sling/scripting/sightly/api/Use.java | 30 -- + .../sling/scripting/sightly/api/UseProvider.java | 51 -- + .../sightly/api/UseProviderComponent.java | 73 --- + .../sling/scripting/sightly/api/package-info.java | 22 - + .../sling/scripting/sightly/common/Dynamic.java | 203 -------- + .../scripting/sightly/common/ObjectModelImpl.java | 406 ---------------- + .../sightly/common/SightlyRuntimeImpl.java | 71 --- + .../scripting/sightly/compiled/CodeGenVisitor.java | 277 ----------- + .../sightly/compiled/CompilationOutput.java | 44 -- + .../sightly/compiled/ExpressionTranslator.java | 192 -------- + .../scripting/sightly/compiled/GenHelper.java | 117 ----- + .../sightly/compiled/JavaClassBackend.java | 51 -- + .../scripting/sightly/compiled/JavaSource.java | 264 ----------- + .../sightly/compiled/SourceGenConstants.java | 61 --- + .../sling/scripting/sightly/compiled/Type.java | 48 -- + .../scripting/sightly/compiled/TypeInference.java | 159 ------- + .../sling/scripting/sightly/compiled/TypeInfo.java | 50 -- + .../scripting/sightly/compiled/UnitBuilder.java | 65 --- + .../sightly/compiled/VariableAnalyzer.java | 223 --------- + .../sightly/compiled/VariableDescriptor.java | 107 ----- + .../scripting/sightly/compiled/VariableScope.java | 27 -- + .../sightly/compiled/operator/BinaryOpGen.java | 36 -- + .../sightly/compiled/operator/ComparisonOpGen.java | 87 ---- + .../compiled/operator/ConcatenateOpGen.java | 48 -- + .../compiled/operator/EquivalenceOpGen.java | 91 ---- + .../sightly/compiled/operator/IsWhiteSpaceGen.java | 55 --- + .../sightly/compiled/operator/LengthOpGen.java | 51 -- + .../sightly/compiled/operator/LogicalOpGen.java | 83 ---- + .../sightly/compiled/operator/LongOpGen.java | 38 -- + .../sightly/compiled/operator/NotOpGen.java | 47 -- + .../sightly/compiled/operator/NumericOpGen.java | 58 --- + .../sightly/compiled/operator/OpHelper.java | 40 -- + .../sightly/compiled/operator/Operators.java | 88 ---- + .../sightly/compiled/operator/StrictEqGenOp.java | 57 --- + .../sightly/compiled/operator/TypedNode.java | 45 -- + .../sightly/compiled/operator/UnaryOpGen.java | 35 -- + .../scripting/sightly/compiler/BaseCompiler.java | 61 --- + .../sightly/compiler/CompilerBackend.java | 35 -- + .../sightly/compiler/CompilerException.java | 38 -- + .../sightly/compiler/CompilerFrontend.java | 35 -- + .../sightly/compiler/SightlyCompileService.java | 55 --- + .../compiler/SightlyCompileServiceImpl.java | 298 ------------ + .../sightly/compiler/SightlyCompilerImpl.java | 210 --------- + .../sling/scripting/sightly/compiler/Syntax.java | 80 ---- + .../sightly/compiler/api/CompilerException.java | 41 -- + .../scripting/sightly/compiler/api/Filter.java | 46 -- + .../sightly/compiler/api/MarkupHandler.java | 82 ---- + .../sightly/compiler/api/MarkupParser.java | 36 -- + .../sightly/compiler/api/SightlyCompiler.java | 36 -- + .../compiler/api/expression/Expression.java | 106 ----- + .../compiler/api/expression/ExpressionNode.java | 32 -- + .../compiler/api/expression/NodeVisitor.java | 65 --- + .../compiler/api/expression/node/ArrayLiteral.java | 47 -- + .../sightly/compiler/api/expression/node/Atom.java | 36 -- + .../api/expression/node/BinaryOperation.java | 66 --- + .../api/expression/node/BinaryOperator.java | 46 -- + .../api/expression/node/BooleanConstant.java | 66 --- + .../compiler/api/expression/node/Identifier.java | 64 --- + .../compiler/api/expression/node/MapLiteral.java | 65 --- + .../compiler/api/expression/node/NullLiteral.java | 38 -- + .../api/expression/node/NumericConstant.java | 80 ---- + .../api/expression/node/PropertyAccess.java | 99 ---- + .../compiler/api/expression/node/RuntimeCall.java | 67 --- + .../api/expression/node/StringConstant.java | 61 --- + .../api/expression/node/TernaryOperator.java | 65 --- + .../api/expression/node/UnaryOperation.java | 58 --- + .../api/expression/node/UnaryOperator.java | 28 -- + .../compiler/api/plugin/CompilerContext.java | 44 -- + .../sightly/compiler/api/plugin/MarkupContext.java | 71 --- + .../sightly/compiler/api/plugin/Plugin.java | 54 --- + .../compiler/api/plugin/PluginCallInfo.java | 49 -- + .../compiler/api/plugin/PluginException.java | 36 -- + .../sightly/compiler/api/plugin/PluginInvoke.java | 62 --- + .../sightly/compiler/api/ris/Command.java | 32 -- + .../sightly/compiler/api/ris/CommandHandler.java | 44 -- + .../sightly/compiler/api/ris/CommandStream.java | 32 -- + .../sightly/compiler/api/ris/CommandVisitor.java | 61 --- + .../compiler/api/ris/command/BufferControl.java | 69 --- + .../compiler/api/ris/command/Conditional.java | 79 ---- + .../sightly/compiler/api/ris/command/Loop.java | 88 ---- + .../sightly/compiler/api/ris/command/OutText.java | 52 --- + .../compiler/api/ris/command/OutVariable.java | 52 --- + .../sightly/compiler/api/ris/command/Patterns.java | 51 -- + .../compiler/api/ris/command/Procedure.java | 96 ---- + .../compiler/api/ris/command/VariableBinding.java | 105 ----- + .../compiler/common/DefaultPluginInvoke.java | 111 ----- + .../sightly/compiler/debug/LoggingHandler.java | 55 --- + .../sightly/compiler/debug/SanityChecker.java | 167 ------- + .../compiler/frontend/AggregatePluginInvoke.java | 153 ------ + .../compiler/frontend/DefaultCompilerContext.java | 58 --- + .../sightly/compiler/frontend/ElementContext.java | 106 ----- + .../compiler/frontend/ExpressionParser.java | 40 -- + .../compiler/frontend/ExpressionParserImpl.java | 47 -- + .../compiler/frontend/ExpressionWrapper.java | 122 ----- + .../sightly/compiler/frontend/Fragment.java | 106 ----- + .../sightly/compiler/frontend/Interpolation.java | 79 ---- + .../compiler/frontend/MarkupHandlerImpl.java | 405 ---------------- + .../sightly/compiler/frontend/ParserException.java | 41 -- + .../sightly/compiler/frontend/ParserHelper.java | 42 -- + .../frontend/SightlyParserErrorListener.java | 53 --- + .../sightly/compiler/frontend/SimpleFrontend.java | 58 --- + .../compiler/optimization/CoalescingWrites.java | 88 ---- + .../optimization/CommandVariableUsage.java | 116 ----- + .../compiler/optimization/DeadCodeRemoval.java | 149 ------ + .../optimization/SequenceStreamTransformer.java | 46 -- + .../compiler/optimization/StreamTransformer.java | 36 -- + .../compiler/optimization/SyntheticMapRemoval.java | 166 ------- + .../optimization/UnusedVariableRemoval.java | 161 ------- + .../compiler/optimization/VariableFinder.java | 132 ------ + .../optimization/reduce/ConstantFolding.java | 105 ----- + .../compiler/optimization/reduce/EvalResult.java | 113 ----- + .../optimization/reduce/ExpressionReducer.java | 248 ---------- + .../compiler/util/GlobalShadowCheckBackend.java | 46 -- + .../sightly/compiler/util/GlobalShadowChecker.java | 128 ----- + .../sightly/compiler/util/SymbolGenerator.java | 48 -- + .../sightly/compiler/util/VariableTracker.java | 148 ------ + .../util/expression/HomogenousNodeVisitor.java | 106 ----- + .../compiler/util/expression/NodeTransformer.java | 129 ------ + .../util/expression/SideEffectVisitor.java | 138 ------ + .../compiler/util/stream/BroadcastHandler.java | 64 --- + .../compiler/util/stream/EmitterVisitor.java | 36 -- + .../sightly/compiler/util/stream/PushStream.java | 80 ---- + .../sightly/compiler/util/stream/ReplayStream.java | 47 -- + .../sightly/compiler/util/stream/Streams.java | 59 --- + .../compiler/util/stream/VisitorHandler.java | 53 --- + .../sightly/compiler/visitor/IgnoreRange.java | 53 --- + .../sightly/compiler/visitor/StateControl.java | 49 -- + .../compiler/visitor/StatefulRangeIgnore.java | 42 -- + .../sightly/compiler/visitor/StatefulVisitor.java | 173 ------- + .../sightly/compiler/visitor/TrackingVisitor.java | 71 --- + .../sightly/compiler/visitor/UniformVisitor.java | 109 ----- + .../sightly/engine/ExtensionRegistryService.java | 36 -- + .../engine/ExtensionRegistryServiceImpl.java | 89 ---- + .../engine/SightlyBindingsValuesProvider.java | 53 --- + .../sightly/engine/SightlyEngineConfiguration.java | 108 ----- + .../sightly/engine/SightlyScriptEngine.java | 183 -------- + .../sightly/engine/SightlyScriptEngineFactory.java | 116 ----- + .../sling/scripting/sightly/engine/UnitLoader.java | 42 -- + .../sightly/engine/compiled/ClassUnitLoader.java | 440 ------------------ + .../sightly/engine/compiled/JavaClassTemplate.java | 70 --- + .../sightly/engine/compiled/SourceIdentifier.java | 105 ----- + .../engine/extension/I18nRuntimeExtension.java | 103 ----- + .../engine/extension/IncludeRuntimeExtension.java | 133 ------ + .../extension/PrintWriterResponseWrapper.java | 50 -- + .../engine/extension/ResourceRuntimeExtension.java | 243 ---------- + .../engine/extension/XSSRuntimeExtension.java | 242 ---------- + .../engine/extension/use/ClassUseProvider.java | 108 ----- + .../engine/extension/use/PojoUseProvider.java | 80 ---- + .../engine/extension/use/RenderUnitProvider.java | 55 --- + .../engine/extension/use/ScriptEvalUtils.java | 64 --- + .../engine/extension/use/ScriptUseProvider.java | 115 ----- + .../engine/extension/use/UseRuntimeExtension.java | 108 ----- + .../sightly/engine/runtime/UnitLocatorImpl.java | 71 --- + .../sightly/extension/ExtensionInstance.java | 36 ++ + .../sightly/extension/RuntimeExtension.java | 39 ++ + .../extension/RuntimeExtensionException.java | 43 ++ + .../scripting/sightly/extension/package-info.java | 22 + + .../scripting/sightly/filter/FilterComponent.java | 61 --- + .../scripting/sightly/filter/FormatFilter.java | 125 ----- + .../sling/scripting/sightly/filter/I18nFilter.java | 68 --- + .../sling/scripting/sightly/filter/JoinFilter.java | 102 ---- + .../sling/scripting/sightly/filter/XSSFilter.java | 57 --- + .../sling/scripting/sightly/html/MarkupUtils.java | 40 -- + .../scripting/sightly/html/dom/AttributeList.java | 93 ---- + .../sightly/html/dom/DocumentHandler.java | 62 --- + .../scripting/sightly/html/dom/HtmlParser.java | 468 ------------------- + .../sightly/html/dom/HtmlParserService.java | 58 --- + .../scripting/sightly/html/dom/TagTokenizer.java | 514 --------------------- + .../scripting/sightly/html/dom/TreeTraverser.java | 100 ---- + .../sightly/html/dom/template/Template.java | 27 -- + .../html/dom/template/TemplateAttribute.java | 43 -- + .../html/dom/template/TemplateCommentNode.java | 32 -- + .../html/dom/template/TemplateElementNode.java | 81 ---- + .../sightly/html/dom/template/TemplateNode.java | 23 - + .../sightly/html/dom/template/TemplateParser.java | 139 ------ + .../html/dom/template/TemplateTextNode.java | 32 -- + .../sightly/impl/compiled/CompilationOutput.java | 44 ++ + .../impl/compiled/ExpressionTranslator.java | 185 ++++++++ + .../scripting/sightly/impl/compiled/GenHelper.java | 112 +++++ + .../sightly/impl/compiled/JavaClassBackend.java | 51 ++ + .../sightly/impl/compiled/JavaSource.java | 264 +++++++++++ + .../sightly/impl/compiled/SourceGenConstants.java | 53 +++ + .../scripting/sightly/impl/compiled/Type.java | 48 ++ + .../sightly/impl/compiled/TypeInference.java | 158 +++++++ + .../scripting/sightly/impl/compiled/TypeInfo.java | 49 ++ + .../sightly/impl/compiled/UnitBuilder.java | 65 +++ + .../sightly/impl/compiled/VariableAnalyzer.java | 222 +++++++++ + .../sightly/impl/compiled/VariableDescriptor.java | 107 +++++ + .../sightly/impl/compiled/VariableScope.java | 27 ++ + .../impl/compiled/operator/BinaryOpGen.java | 35 ++ + .../impl/compiled/operator/ComparisonOpGen.java | 84 ++++ + .../impl/compiled/operator/ConcatenateOpGen.java | 48 ++ + .../impl/compiled/operator/EquivalenceOpGen.java | 91 ++++ + .../impl/compiled/operator/IsWhiteSpaceGen.java | 51 ++ + .../impl/compiled/operator/LengthOpGen.java | 48 ++ + .../impl/compiled/operator/LogicalOpGen.java | 80 ++++ + .../sightly/impl/compiled/operator/LongOpGen.java | 37 ++ + .../sightly/impl/compiled/operator/NotOpGen.java | 47 ++ + .../impl/compiled/operator/NumericOpGen.java | 57 +++ + .../sightly/impl/compiled/operator/OpHelper.java | 39 ++ + .../sightly/impl/compiled/operator/Operators.java | 88 ++++ + .../impl/compiled/operator/StrictEqGenOp.java | 54 +++ + .../sightly/impl/compiled/operator/TypedNode.java | 44 ++ + .../sightly/impl/compiled/operator/UnaryOpGen.java | 35 ++ + .../sightly/impl/compiler/CompilerBackend.java | 34 ++ + .../sightly/impl/compiler/CompilerException.java | 38 ++ + .../sightly/impl/compiler/CompilerFrontend.java | 35 ++ + .../impl/compiler/SightlyCompilerService.java | 166 +++++++ + .../impl/compiler/SightlyJavaCompilerService.java | 322 +++++++++++++ + .../impl/compiler/SightlyParsingException.java | 59 +++ + .../scripting/sightly/impl/compiler/Syntax.java | 79 ++++ + .../impl/compiler/common/DefaultPluginInvoke.java | 108 +++++ + .../impl/compiler/debug/LoggingHandler.java | 52 +++ + .../sightly/impl/compiler/debug/SanityChecker.java | 147 ++++++ + .../impl/compiler/expression/Expression.java | 106 +++++ + .../impl/compiler/expression/ExpressionNode.java | 32 ++ + .../impl/compiler/expression/NodeVisitor.java | 64 +++ + .../compiler/expression/node/ArrayLiteral.java | 47 ++ + .../impl/compiler/expression/node/Atom.java | 36 ++ + .../compiler/expression/node/BinaryOperation.java | 66 +++ + .../compiler/expression/node/BinaryOperator.java | 218 +++++++++ + .../compiler/expression/node/BooleanConstant.java | 65 +++ + .../impl/compiler/expression/node/Identifier.java | 64 +++ + .../impl/compiler/expression/node/MapLiteral.java | 65 +++ + .../impl/compiler/expression/node/NullLiteral.java | 38 ++ + .../compiler/expression/node/NumericConstant.java | 80 ++++ + .../compiler/expression/node/PropertyAccess.java | 99 ++++ + .../impl/compiler/expression/node/RuntimeCall.java | 67 +++ + .../compiler/expression/node/StringConstant.java | 61 +++ + .../compiler/expression/node/TernaryOperator.java | 65 +++ + .../compiler/expression/node/UnaryOperation.java | 58 +++ + .../compiler/expression/node/UnaryOperator.java | 57 +++ + .../compiler/frontend/AggregatePluginInvoke.java | 151 ++++++ + .../impl/compiler/frontend/CompilerContext.java | 51 ++ + .../impl/compiler/frontend/ElementContext.java | 106 +++++ + .../impl/compiler/frontend/ExpressionParser.java | 55 +++ + .../impl/compiler/frontend/ExpressionWrapper.java | 118 +++++ + .../sightly/impl/compiler/frontend/Fragment.java | 106 +++++ + .../impl/compiler/frontend/Interpolation.java | 78 ++++ + .../impl/compiler/frontend/ParserException.java | 41 ++ + .../impl/compiler/frontend/ParserHelper.java | 40 ++ + .../frontend/SightlyParserErrorListener.java | 52 +++ + .../impl/compiler/frontend/SimpleFrontend.java | 57 +++ + .../compiler/optimization/CoalescingWrites.java | 86 ++++ + .../optimization/CommandVariableUsage.java | 106 +++++ + .../compiler/optimization/DeadCodeRemoval.java | 136 ++++++ + .../optimization/SequenceStreamTransformer.java | 46 ++ + .../compiler/optimization/StreamTransformer.java | 36 ++ + .../compiler/optimization/SyntheticMapRemoval.java | 161 +++++++ + .../optimization/UnusedVariableRemoval.java | 161 +++++++ + .../impl/compiler/optimization/VariableFinder.java | 128 +++++ + .../optimization/reduce/ConstantFolding.java | 95 ++++ + .../compiler/optimization/reduce/EvalResult.java | 110 +++++ + .../optimization/reduce/ExpressionReducer.java | 212 +++++++++ + .../sightly/impl/compiler/ris/Command.java | 32 ++ + .../sightly/impl/compiler/ris/CommandHandler.java | 44 ++ + .../sightly/impl/compiler/ris/CommandStream.java | 32 ++ + .../sightly/impl/compiler/ris/CommandVisitor.java | 56 +++ + .../impl/compiler/ris/command/Conditional.java | 77 +++ + .../sightly/impl/compiler/ris/command/Loop.java | 86 ++++ + .../sightly/impl/compiler/ris/command/OutText.java | 50 ++ + .../impl/compiler/ris/command/OutVariable.java | 50 ++ + .../impl/compiler/ris/command/Patterns.java | 51 ++ + .../impl/compiler/ris/command/Procedure.java | 94 ++++ + .../impl/compiler/ris/command/VariableBinding.java | 103 +++++ + .../compiler/util/GlobalShadowCheckBackend.java | 46 ++ + .../impl/compiler/util/GlobalShadowChecker.java | 114 +++++ + .../impl/compiler/util/SymbolGenerator.java | 45 ++ + .../impl/compiler/util/VariableTracker.java | 148 ++++++ + .../util/expression/HomogenousNodeVisitor.java | 103 +++++ + .../compiler/util/expression/NodeTransformer.java | 125 +++++ + .../util/expression/SideEffectVisitor.java | 137 ++++++ + .../compiler/util/stream/BroadcastHandler.java | 62 +++ + .../impl/compiler/util/stream/EmitterVisitor.java | 35 ++ + .../impl/compiler/util/stream/PushStream.java | 78 ++++ + .../impl/compiler/util/stream/ReplayStream.java | 45 ++ + .../sightly/impl/compiler/util/stream/Streams.java | 58 +++ + .../impl/compiler/util/stream/VisitorHandler.java | 50 ++ + .../impl/compiler/visitor/CodeGenVisitor.java | 263 +++++++++++ + .../sightly/impl/compiler/visitor/IgnoreRange.java | 52 +++ + .../impl/compiler/visitor/StatefulRangeIgnore.java | 41 ++ + .../impl/compiler/visitor/StatefulVisitor.java | 156 +++++++ + .../impl/compiler/visitor/TrackingVisitor.java | 61 +++ + .../impl/compiler/visitor/UniformVisitor.java | 96 ++++ + .../impl/engine/ExtensionRegistryService.java | 89 ++++ + .../impl/engine/SightlyBindingsValuesProvider.java | 53 +++ + .../impl/engine/SightlyEngineConfiguration.java | 108 +++++ + .../sightly/impl/engine/SightlyScriptEngine.java | 158 +++++++ + .../impl/engine/SightlyScriptEngineFactory.java | 102 ++++ + .../scripting/sightly/impl/engine/UnitLoader.java | 448 ++++++++++++++++++ + .../impl/engine/compiled/JavaClassTemplate.java | 70 +++ + .../impl/engine/compiled/SourceIdentifier.java | 105 +++++ + .../impl/engine/extension/ExtensionUtils.java | 43 ++ + .../engine/extension/I18nRuntimeExtension.java | 99 ++++ + .../engine/extension/IncludeRuntimeExtension.java | 131 ++++++ + .../extension/PrintWriterResponseWrapper.java | 50 ++ + .../engine/extension/ResourceRuntimeExtension.java | 241 ++++++++++ + .../impl/engine/extension/XSSRuntimeExtension.java | 239 ++++++++++ + .../engine/extension/use/ClassUseProvider.java | 120 +++++ + .../impl/engine/extension/use/PojoUseProvider.java | 94 ++++ + .../engine/extension/use/RenderUnitProvider.java | 105 +++++ + .../engine/extension/use/ScriptUseProvider.java | 128 +++++ + .../engine/extension/use/UseProviderUtils.java | 94 ++++ + .../engine/extension/use/UseRuntimeExtension.java | 109 +++++ + .../impl/engine/runtime/RenderContextImpl.java | 418 +++++++++++++++++ + .../sightly/impl/engine/runtime/RenderUnit.java | 146 ++++++ + .../engine/runtime/SightlyRenderException.java | 43 ++ + .../scripting/sightly/impl/filter/Filter.java | 45 ++ + .../sightly/impl/filter/FilterComponent.java | 58 +++ + .../sightly/impl/filter/FormatFilter.java | 117 +++++ + .../scripting/sightly/impl/filter/I18nFilter.java | 62 +++ + .../scripting/sightly/impl/filter/JoinFilter.java | 89 ++++ + .../scripting/sightly/impl/filter/XSSFilter.java | 52 +++ + .../scripting/sightly/impl/html/MarkupUtils.java | 40 ++ + .../sightly/impl/html/dom/AttributeList.java | 93 ++++ + .../sightly/impl/html/dom/DocumentHandler.java | 62 +++ + .../sightly/impl/html/dom/HtmlParser.java | 468 +++++++++++++++++++ + .../sightly/impl/html/dom/HtmlParserService.java | 62 +++ + .../sightly/impl/html/dom/MarkupHandler.java | 406 ++++++++++++++++ + .../sightly/impl/html/dom/TagTokenizer.java | 514 +++++++++++++++++++++ + .../sightly/impl/html/dom/TreeTraverser.java | 98 ++++ + .../sightly/impl/html/dom/template/Template.java | 27 ++ + .../impl/html/dom/template/TemplateAttribute.java | 43 ++ + .../html/dom/template/TemplateCommentNode.java | 32 ++ + .../html/dom/template/TemplateElementNode.java | 81 ++++ + .../impl/html/dom/template/TemplateNode.java | 23 + + .../impl/html/dom/template/TemplateParser.java | 139 ++++++ + .../impl/html/dom/template/TemplateTextNode.java | 32 ++ + .../sightly/impl/plugin/AttributePlugin.java | 356 ++++++++++++++ + .../scripting/sightly/impl/plugin/CallPlugin.java | 75 +++ + .../sightly/impl/plugin/ElementPlugin.java | 99 ++++ + .../sightly/impl/plugin/IncludePlugin.java | 74 +++ + .../scripting/sightly/impl/plugin/ListPlugin.java | 139 ++++++ + .../sightly/impl/plugin/MarkupContext.java | 71 +++ + .../scripting/sightly/impl/plugin/Plugin.java | 55 +++ + .../sightly/impl/plugin/PluginCallInfo.java | 49 ++ + .../sightly/impl/plugin/PluginComponent.java | 61 +++ + .../sightly/impl/plugin/PluginException.java | 36 ++ + .../sightly/impl/plugin/PluginInvoke.java | 60 +++ + .../sightly/impl/plugin/ResourcePlugin.java | 78 ++++ + .../sightly/impl/plugin/TemplatePlugin.java | 98 ++++ + .../scripting/sightly/impl/plugin/TestPlugin.java | 86 ++++ + .../scripting/sightly/impl/plugin/TextPlugin.java | 64 +++ + .../sightly/impl/plugin/UnwrapPlugin.java | 93 ++++ + .../scripting/sightly/impl/plugin/UsePlugin.java | 68 +++ + .../sling/scripting/sightly/package-info.java | 22 + + .../scripting/sightly/plugin/AttributePlugin.java | 360 --------------- + .../sling/scripting/sightly/plugin/CallPlugin.java | 87 ---- + .../scripting/sightly/plugin/ElementPlugin.java | 113 ----- + .../scripting/sightly/plugin/IncludePlugin.java | 90 ---- + .../sling/scripting/sightly/plugin/ListPlugin.java | 151 ------ + .../scripting/sightly/plugin/PluginComponent.java | 64 --- + .../scripting/sightly/plugin/ResourcePlugin.java | 90 ---- + .../scripting/sightly/plugin/TemplatePlugin.java | 111 ----- + .../sling/scripting/sightly/plugin/TestPlugin.java | 100 ---- + .../sling/scripting/sightly/plugin/TextPlugin.java | 72 --- + .../scripting/sightly/plugin/UnwrapPlugin.java | 106 ----- + .../sling/scripting/sightly/plugin/UsePlugin.java | 76 --- + .../apache/sling/scripting/sightly/pojo/Use.java | 50 ++ + .../sling/scripting/sightly/pojo/package-info.java | 22 + + .../scripting/sightly/render/RenderContext.java | 105 +++++ + .../scripting/sightly/render/package-info.java | 22 + + .../scripting/sightly/use/ProviderOutcome.java | 92 ++++ + .../scripting/sightly/use/SightlyUseException.java | 42 ++ + .../sling/scripting/sightly/use/UseProvider.java | 44 ++ + .../sling/scripting/sightly/use/package-info.java | 22 + + .../resources/templates/compiled_unit_template.txt | 16 +- + .../src/main/resources/templates/subtemplate.txt | 8 +- + contrib/scripting/sightly/js-use-provider/pom.xml | 7 + + .../apache/sling/scripting/sightly/js/Console.java | 49 -- + .../sling/scripting/sightly/js/JsEnvironment.java | 174 ------- + .../sling/scripting/sightly/js/JsUseProvider.java | 112 ----- + .../apache/sling/scripting/sightly/js/Utils.java | 46 -- + .../sling/scripting/sightly/js/Variables.java | 34 -- + .../scripting/sightly/js/async/AsyncContainer.java | 95 ---- + .../scripting/sightly/js/async/AsyncExtractor.java | 97 ---- + .../js/async/TimingBindingsValuesProvider.java | 42 -- + .../scripting/sightly/js/async/TimingFunction.java | 55 --- + .../scripting/sightly/js/async/UnaryCallback.java | 31 -- + .../scripting/sightly/js/cjs/CommonJsModule.java | 69 --- + .../scripting/sightly/js/cjs/ExportsObject.java | 46 -- + .../sling/scripting/sightly/js/impl/Console.java | 49 ++ + .../scripting/sightly/js/impl/JsEnvironment.java | 173 +++++++ + .../scripting/sightly/js/impl/JsUseProvider.java | 125 +++++ + .../sling/scripting/sightly/js/impl/Utils.java | 46 ++ + .../sling/scripting/sightly/js/impl/Variables.java | 34 ++ + .../sightly/js/impl/async/AsyncContainer.java | 95 ++++ + .../sightly/js/impl/async/AsyncExtractor.java | 96 ++++ + .../impl/async/TimingBindingsValuesProvider.java | 41 ++ + .../sightly/js/impl/async/TimingFunction.java | 54 +++ + .../sightly/js/impl/async/UnaryCallback.java | 31 ++ + .../sightly/js/impl/cjs/CommonJsModule.java | 69 +++ + .../sightly/js/impl/cjs/ExportsObject.java | 46 ++ + .../js/impl/jsapi/SlyBindingsValuesProvider.java | 315 +++++++++++++ + .../scripting/sightly/js/impl/loop/EventLoop.java | 78 ++++ + .../sightly/js/impl/loop/EventLoopInterop.java | 53 +++ + .../sling/scripting/sightly/js/impl/loop/Task.java | 43 ++ + .../sightly/js/impl/rhino/HybridObject.java | 163 +++++++ + .../scripting/sightly/js/impl/rhino/JsUtils.java | 46 ++ + .../sightly/js/impl/rhino/JsValueAdapter.java | 164 +++++++ + .../sightly/js/impl/use/DependencyResolver.java | 57 +++ + .../scripting/sightly/js/impl/use/UseFunction.java | 140 ++++++ + .../js/jsapi/SlyBindingsValuesProvider.java | 314 ------------- + .../sling/scripting/sightly/js/loop/EventLoop.java | 78 ---- + .../sightly/js/loop/EventLoopInterop.java | 53 --- + .../sling/scripting/sightly/js/loop/Task.java | 43 -- + .../scripting/sightly/js/rhino/HybridObject.java | 163 ------- + .../sling/scripting/sightly/js/rhino/JsUtils.java | 46 -- + .../scripting/sightly/js/rhino/JsValueAdapter.java | 165 ------- + .../sightly/js/use/DependencyResolver.java | 58 --- + .../scripting/sightly/js/use/UseFunction.java | 140 ------ + 437 files changed, 19390 insertions(+), 20794 deletions(-) + delete mode 100644 contrib/scripting/sightly/engine/src/main/antlr4/org/apache/sling/parser/expr/generated/SightlyLexer.g4 + delete mode 100644 contrib/scripting/sightly/engine/src/main/antlr4/org/apache/sling/parser/expr/generated/SightlyParser.g4 + create mode 100644 contrib/scripting/sightly/engine/src/main/antlr4/org/apache/sling/scripting/sightly/impl/parser/expr/generated/SightlyLexer.g4 + create mode 100644 contrib/scripting/sightly/engine/src/main/antlr4/org/apache/sling/scripting/sightly/impl/parser/expr/generated/SightlyParser.g4 + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/Record.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/ResourceResolution.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/SightlyException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/BaseRenderUnit.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/ExtensionInstance.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/ObjectModel.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/ProviderOutcome.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/Record.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/RenderContext.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/RenderUnit.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/ResourceResolution.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/RuntimeExtension.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/RuntimeExtensionComponent.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/RuntimeExtensionException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/SightlyEngineException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/SightlyParsingException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/SightlyRenderException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/SightlyRuntime.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/SightlyUseException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/StackedWriter.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/UnitLocator.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/Use.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/UseProvider.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/UseProviderComponent.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/api/package-info.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/common/Dynamic.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/common/ObjectModelImpl.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/common/SightlyRuntimeImpl.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/CodeGenVisitor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/CompilationOutput.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/ExpressionTranslator.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/GenHelper.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/JavaClassBackend.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/JavaSource.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/SourceGenConstants.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/Type.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/TypeInference.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/TypeInfo.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/UnitBuilder.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/VariableAnalyzer.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/VariableDescriptor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/VariableScope.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/BinaryOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/ComparisonOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/ConcatenateOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/EquivalenceOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/IsWhiteSpaceGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/LengthOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/LogicalOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/LongOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/NotOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/NumericOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/OpHelper.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/Operators.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/StrictEqGenOp.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/TypedNode.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiled/operator/UnaryOpGen.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/BaseCompiler.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilerBackend.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilerException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilerFrontend.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/SightlyCompileService.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/SightlyCompileServiceImpl.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/SightlyCompilerImpl.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/Syntax.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/CompilerException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/Filter.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/MarkupHandler.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/MarkupParser.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/SightlyCompiler.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/Expression.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/ExpressionNode.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/NodeVisitor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/ArrayLiteral.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/Atom.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/BinaryOperation.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/BinaryOperator.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/BooleanConstant.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/Identifier.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/MapLiteral.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/NullLiteral.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/NumericConstant.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/PropertyAccess.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/RuntimeCall.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/StringConstant.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/TernaryOperator.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/UnaryOperation.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/expression/node/UnaryOperator.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/plugin/CompilerContext.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/plugin/MarkupContext.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/plugin/Plugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/plugin/PluginCallInfo.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/plugin/PluginException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/plugin/PluginInvoke.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/Command.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/CommandHandler.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/CommandStream.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/CommandVisitor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/command/BufferControl.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/command/Conditional.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/command/Loop.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/command/OutText.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/command/OutVariable.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/command/Patterns.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/command/Procedure.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/api/ris/command/VariableBinding.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/common/DefaultPluginInvoke.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/debug/LoggingHandler.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/debug/SanityChecker.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/AggregatePluginInvoke.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/DefaultCompilerContext.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/ElementContext.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/ExpressionParser.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/ExpressionParserImpl.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/ExpressionWrapper.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/Fragment.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/Interpolation.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/MarkupHandlerImpl.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/ParserException.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/ParserHelper.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/SightlyParserErrorListener.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/frontend/SimpleFrontend.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/CoalescingWrites.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/CommandVariableUsage.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/DeadCodeRemoval.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/SequenceStreamTransformer.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/StreamTransformer.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/SyntheticMapRemoval.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/UnusedVariableRemoval.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/VariableFinder.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/reduce/ConstantFolding.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/reduce/EvalResult.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/optimization/reduce/ExpressionReducer.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/GlobalShadowCheckBackend.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/GlobalShadowChecker.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/SymbolGenerator.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/VariableTracker.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/expression/HomogenousNodeVisitor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/expression/NodeTransformer.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/expression/SideEffectVisitor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/stream/BroadcastHandler.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/stream/EmitterVisitor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/stream/PushStream.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/stream/ReplayStream.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/stream/Streams.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/util/stream/VisitorHandler.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/visitor/IgnoreRange.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/visitor/StateControl.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/visitor/StatefulRangeIgnore.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/visitor/StatefulVisitor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/visitor/TrackingVisitor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/compiler/visitor/UniformVisitor.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/ExtensionRegistryService.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/ExtensionRegistryServiceImpl.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/SightlyBindingsValuesProvider.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/SightlyEngineConfiguration.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/SightlyScriptEngine.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/SightlyScriptEngineFactory.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/UnitLoader.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/compiled/ClassUnitLoader.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/compiled/JavaClassTemplate.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/compiled/SourceIdentifier.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/I18nRuntimeExtension.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/IncludeRuntimeExtension.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/PrintWriterResponseWrapper.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/ResourceRuntimeExtension.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/XSSRuntimeExtension.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/use/ClassUseProvider.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/use/PojoUseProvider.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/use/RenderUnitProvider.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/use/ScriptEvalUtils.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/use/ScriptUseProvider.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/extension/use/UseRuntimeExtension.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/engine/runtime/UnitLocatorImpl.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/ExtensionInstance.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtension.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/RuntimeExtensionException.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/extension/package-info.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/filter/FilterComponent.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/filter/FormatFilter.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/filter/I18nFilter.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/filter/JoinFilter.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/filter/XSSFilter.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/MarkupUtils.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/AttributeList.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/DocumentHandler.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/HtmlParser.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/HtmlParserService.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/TagTokenizer.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/TreeTraverser.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/template/Template.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/template/TemplateAttribute.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/template/TemplateCommentNode.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/template/TemplateElementNode.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/template/TemplateNode.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/template/TemplateParser.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/html/dom/template/TemplateTextNode.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/CompilationOutput.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/ExpressionTranslator.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/GenHelper.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/JavaClassBackend.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/JavaSource.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/SourceGenConstants.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/Type.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/TypeInference.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/TypeInfo.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/UnitBuilder.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/VariableAnalyzer.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/VariableDescriptor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/VariableScope.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/BinaryOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/ComparisonOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/ConcatenateOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/EquivalenceOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/IsWhiteSpaceGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/LengthOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/LogicalOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/LongOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/NotOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/NumericOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/OpHelper.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/Operators.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/StrictEqGenOp.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/TypedNode.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiled/operator/UnaryOpGen.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/CompilerBackend.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/CompilerException.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/CompilerFrontend.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyCompilerService.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyParsingException.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/Syntax.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/common/DefaultPluginInvoke.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/debug/LoggingHandler.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/debug/SanityChecker.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/Expression.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/ExpressionNode.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/NodeVisitor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/ArrayLiteral.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/Atom.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/BinaryOperation.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/BinaryOperator.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/BooleanConstant.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/Identifier.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/MapLiteral.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/NullLiteral.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/NumericConstant.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/PropertyAccess.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/RuntimeCall.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/StringConstant.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/TernaryOperator.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/UnaryOperation.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/expression/node/UnaryOperator.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/AggregatePluginInvoke.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/CompilerContext.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/ElementContext.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/ExpressionParser.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/ExpressionWrapper.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/Fragment.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/Interpolation.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/ParserException.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/ParserHelper.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/SightlyParserErrorListener.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/SimpleFrontend.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/CoalescingWrites.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/CommandVariableUsage.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/DeadCodeRemoval.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/SequenceStreamTransformer.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/StreamTransformer.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/SyntheticMapRemoval.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/UnusedVariableRemoval.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/VariableFinder.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/reduce/ConstantFolding.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/reduce/EvalResult.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/optimization/reduce/ExpressionReducer.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/Command.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/CommandHandler.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/CommandStream.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/CommandVisitor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/command/Conditional.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/command/Loop.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/command/OutText.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/command/OutVariable.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/command/Patterns.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/command/Procedure.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ris/command/VariableBinding.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/GlobalShadowCheckBackend.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/GlobalShadowChecker.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/SymbolGenerator.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/VariableTracker.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/expression/HomogenousNodeVisitor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/expression/NodeTransformer.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/expression/SideEffectVisitor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/stream/BroadcastHandler.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/stream/EmitterVisitor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/stream/PushStream.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/stream/ReplayStream.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/stream/Streams.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/util/stream/VisitorHandler.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/visitor/CodeGenVisitor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/visitor/IgnoreRange.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/visitor/StatefulRangeIgnore.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/visitor/StatefulVisitor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/visitor/TrackingVisitor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/visitor/UniformVisitor.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/ExtensionRegistryService.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyBindingsValuesProvider.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyScriptEngine.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyScriptEngineFactory.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitLoader.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/compiled/JavaClassTemplate.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/compiled/SourceIdentifier.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ExtensionUtils.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/I18nRuntimeExtension.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/IncludeRuntimeExtension.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/PrintWriterResponseWrapper.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/ResourceRuntimeExtension.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/XSSRuntimeExtension.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ClassUseProvider.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/PojoUseProvider.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/RenderUnitProvider.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ScriptUseProvider.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseProviderUtils.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/UseRuntimeExtension.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/RenderContextImpl.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/RenderUnit.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/runtime/SightlyRenderException.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/Filter.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FilterComponent.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/FormatFilter.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/I18nFilter.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/JoinFilter.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/filter/XSSFilter.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/MarkupUtils.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/AttributeList.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/DocumentHandler.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/HtmlParser.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/HtmlParserService.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/MarkupHandler.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/TagTokenizer.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/TreeTraverser.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/template/Template.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/template/TemplateAttribute.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/template/TemplateCommentNode.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/template/TemplateElementNode.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/template/TemplateNode.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/template/TemplateParser.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/html/dom/template/TemplateTextNode.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/AttributePlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/CallPlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/ElementPlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/IncludePlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/ListPlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/MarkupContext.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/Plugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/PluginCallInfo.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/PluginComponent.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/PluginException.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/PluginInvoke.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/ResourcePlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/TemplatePlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/TestPlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/TextPlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/UnwrapPlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/plugin/UsePlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/package-info.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/AttributePlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/CallPlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/ElementPlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/IncludePlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/ListPlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/PluginComponent.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/ResourcePlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/TemplatePlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/TestPlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/TextPlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/UnwrapPlugin.java + delete mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/plugin/UsePlugin.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/pojo/Use.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/pojo/package-info.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/render/RenderContext.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/render/package-info.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/ProviderOutcome.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/SightlyUseException.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/UseProvider.java + create mode 100644 contrib/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/use/package-info.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/Console.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/JsEnvironment.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/JsUseProvider.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/Utils.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/Variables.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/async/AsyncContainer.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/async/AsyncExtractor.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/async/TimingBindingsValuesProvider.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/async/TimingFunction.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/async/UnaryCallback.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/cjs/CommonJsModule.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/cjs/ExportsObject.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/Console.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/Utils.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/Variables.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncContainer.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/AsyncExtractor.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/TimingBindingsValuesProvider.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/TimingFunction.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/async/UnaryCallback.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/cjs/CommonJsModule.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/cjs/ExportsObject.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoop.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/EventLoopInterop.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/loop/Task.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/rhino/HybridObject.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/rhino/JsUtils.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/rhino/JsValueAdapter.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java + create mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/UseFunction.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/jsapi/SlyBindingsValuesProvider.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/loop/EventLoop.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/loop/EventLoopInterop.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/loop/Task.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/rhino/HybridObject.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/rhino/JsUtils.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/rhino/JsValueAdapter.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/use/DependencyResolver.java + delete mode 100644 contrib/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/use/UseFunction.java + +diff --git a/contrib/scripting/sightly/engine/pom.xml b/contrib/scripting/sightly/engine/pom.xml +index 2c0eb3c..7378d2b 100644 +--- a/contrib/scripting/sightly/engine/pom.xml ++++ b/contrib/scripting/sightly/engine/pom.xml +@@ -78,9 +78,6 @@ + <configuration>
[... 42845 lines stripped ...]