This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
from 885c50056 Merge pull request #715 from apache/WW-5327-non-java-beans add 10203ed89 WW-5233 Introduces Tiles base code into the Tiles plugin add 01ccc0bcb WW-5233 Disables XML external entity parsing add 67a21ffe1 [maven-release-plugin] prepare release STRUTS_6_3_0_RC1 add 8080d41a1 [maven-release-plugin] prepare for next development iteration add 71e9ee76c Merge pull request #608 from apache/WW-5233-tiles No new revisions were added by this update. Summary of changes: apps/showcase/pom.xml | 6 - bom/pom.xml | 4 +- plugins/portlet-tiles/pom.xml | 10 +- .../struts2/views/tiles/PortletTilesResult.java | 6 +- .../tiles/request/portlet/PortletRequest.java | 344 ++++++ .../request/portlet/RenderPortletRequest.java | 47 + .../portlet/delegate/MimeResponseDelegate.java | 72 ++ .../portlet/delegate/PortletRequestDelegate.java | 79 ++ .../request/portlet/delegate/RequestDelegate.java} | 37 +- .../request/portlet/delegate/ResponseDelegate.java | 70 ++ .../request/portlet/delegate/package-info.java} | 26 +- .../extractor/ApplicationScopeExtractor.java | 66 ++ .../request/portlet/extractor/HeaderExtractor.java | 74 ++ .../portlet/extractor/InitParameterExtractor.java | 57 + .../portlet/extractor/ParameterExtractor.java} | 46 +- .../portlet/extractor/RequestScopeExtractor.java | 66 ++ .../portlet/extractor/SessionScopeExtractor.java | 88 ++ .../extractor/StateAwareParameterExtractor.java | 53 + .../request/portlet/extractor/package-info.java} | 26 +- .../tiles/request/portlet/package-info.java} | 26 +- .../tiles/request/portlet/PortletRequestTest.java | 424 +++++++ .../request/portlet/RenderPortletRequestTest.java | 69 ++ .../portlet/delegate/MimeResponseDelegateTest.java | 132 +++ .../delegate/PortletRequestDelegateTest.java | 83 ++ .../extractor/ApplicationScopeExtractorTest.java | 106 ++ .../portlet/extractor/HeaderExtractorTest.java | 117 ++ .../extractor/InitParameterExtractorTest.java | 83 ++ .../portlet/extractor/ParameterExtractorTest.java | 83 ++ .../extractor/RequestScopeExtractorTest.java | 107 ++ .../extractor/SessionScopeExtractorTest.java | 154 +++ .../StateAwareParameterExtractorTest.java | 50 + plugins/tiles/pom.xml | 94 +- .../org/apache/struts2/tiles/BuildAutotags.java | 229 ++++ .../struts2/tiles/I18NAttributeEvaluator.java | 2 +- .../struts2/tiles/StrutsAttributeEvaluator.java | 4 +- .../tiles/StrutsFreeMarkerAttributeRenderer.java | 6 +- .../struts2/tiles/StrutsPreparerFactory.java | 4 +- .../tiles/StrutsTilesAnnotationProcessor.java | 10 +- .../struts2/tiles/StrutsTilesContainerFactory.java | 44 +- .../struts2/tiles/StrutsTilesInitializer.java | 6 +- .../apache/struts2/tiles/StrutsTilesListener.java | 4 +- .../struts2/tiles/StrutsTilesLocaleResolver.java | 4 +- .../StrutsWildcardServletApplicationContext.java | 1 - .../apache/struts2/views/tiles/TilesResult.java | 44 +- .../main/java/org/apache/tiles/api/Attribute.java | 366 ++++++ .../org/apache/tiles/api/AttributeContext.java | 161 +++ .../apache/tiles/api/BasicAttributeContext.java | 462 ++++++++ .../main/java/org/apache/tiles/api/Definition.java | 165 +++ .../main/java/org/apache/tiles/api/Expression.java | 165 +++ .../java/org/apache/tiles/api/ListAttribute.java | 169 +++ .../api/NoSuchContainerException.java} | 32 +- .../java/org/apache/tiles/api/TilesContainer.java | 137 +++ .../apache/tiles/api/TilesContainerWrapper.java | 107 ++ .../java/org/apache/tiles/api/TilesException.java | 66 ++ .../org/apache/tiles/api/access/TilesAccess.java | 158 +++ .../api/access/package-info.java} | 23 +- .../api/mgmt/MutableTilesContainer.java} | 33 +- .../api/mgmt/package-info.java} | 24 +- .../java/org/apache/tiles/api/package-info.java | 385 +++++++ .../tiles/api/preparer/PreparerException.java | 67 ++ .../apache/tiles/api/preparer/ViewPreparer.java | 54 + .../api/preparer/package-info.java} | 26 +- .../autotag/core/AutotagRuntimeException.java | 60 + .../autotag/core/runtime/AbstractModelBody.java | 80 ++ .../tiles/autotag/core/runtime/AutotagRuntime.java | 49 + .../tiles/autotag/core/runtime/ModelBody.java | 58 + .../autotag/core/runtime/annotation/Parameter.java | 52 + .../core/runtime/annotation/package-info.java} | 24 +- .../autotag/core/runtime/package-info.java} | 24 +- .../autotag/core/runtime/util/NullWriter.java} | 36 +- .../autotag/core/runtime/util/package-info.java} | 24 +- .../tiles/autotag/freemarker/FMModelGenerator.java | 63 ++ .../freemarker/FMModelRepositoryGenerator.java | 61 + .../freemarker/FMTemplateGeneratorFactory.java | 69 ++ .../autotag/freemarker/package-info.java} | 26 +- .../generate/AbstractTemplateClassGenerator.java | 143 +++ .../generate/AbstractTemplateSuiteGenerator.java | 128 +++ .../autotag/generate/BasicTemplateGenerator.java | 187 +++ .../autotag/generate/TemplateClassGenerator.java | 45 + .../tiles/autotag/generate/TemplateGenerator.java | 56 + .../autotag/generate/TemplateGeneratorBuilder.java | 180 +++ .../generate/TemplateGeneratorFactory.java} | 30 +- .../autotag/generate/TemplateSuiteGenerator.java} | 36 +- .../autotag/generate/package-info.java} | 24 +- .../autotag/jsp/JspTemplateGeneratorFactory.java | 79 ++ .../org/apache/tiles/autotag/jsp/TLDGenerator.java | 60 + .../tiles/autotag/jsp/TagClassGenerator.java | 63 ++ .../autotag/jsp/package-info.java} | 24 +- .../apache/tiles/autotag/model/TemplateClass.java | 191 ++++ .../apache/tiles/autotag/model/TemplateMethod.java | 127 +++ .../tiles/autotag/model/TemplateParameter.java | 182 +++ .../apache/tiles/autotag/model/TemplateSuite.java | 125 ++ .../autotag/model/package-info.java} | 24 +- .../org/apache/tiles/autotag/tool/StringTool.java | 138 +++ .../autotag/tool/package-info.java} | 24 +- .../velocity/VelocityDirectiveGenerator.java | 67 ++ .../velocity/VelocityPropertiesGenerator.java | 64 ++ .../velocity/VelocityTemplateGeneratorFactory.java | 87 ++ .../autotag/velocity/package-info.java} | 26 +- .../tiles/core/definition/DefinitionsFactory.java | 75 ++ .../definition/DefinitionsFactoryException.java | 72 ++ .../tiles/core/definition/DefinitionsReader.java | 52 + .../definition/NoSuchDefinitionException.java} | 31 +- .../core/definition/RefreshMonitor.java} | 32 +- .../UnresolvingLocaleDefinitionsFactory.java | 86 ++ .../definition/dao/BaseLocaleUrlDefinitionDAO.java | 163 +++ .../dao/CachingLocaleUrlDefinitionDAO.java | 272 +++++ .../tiles/core/definition/dao/DefinitionDAO.java | 54 + .../dao/ResolvingLocaleUrlDefinitionDAO.java | 172 +++ .../core/definition/dao/package-info.java} | 25 +- .../digester/DigesterDefinitionsReader.java | 479 ++++++++ .../DigesterDefinitionsReaderException.java} | 34 +- .../core/definition/digester/package-info.java} | 24 +- .../core/definition/package-info.java} | 25 +- .../pattern/AbstractPatternDefinitionResolver.java | 106 ++ .../pattern/BasicPatternDefinitionResolver.java | 75 ++ .../pattern/DefinitionPatternMatcher.java} | 36 +- .../pattern/DefinitionPatternMatcherFactory.java | 41 + .../pattern/PatternDefinitionResolver.java | 63 ++ .../pattern/PatternDefinitionResolverAware.java} | 32 +- .../definition/pattern/PatternRecognizer.java} | 31 +- .../tiles/core/definition/pattern/PatternUtil.java | 240 ++++ .../pattern/PrefixedPatternDefinitionResolver.java | 103 ++ .../core/definition/pattern/package-info.java} | 24 +- .../regexp/RegexpDefinitionPatternMatcher.java | 72 ++ .../RegexpDefinitionPatternMatcherFactory.java} | 30 +- .../definition/pattern/regexp/package-info.java} | 24 +- .../wildcard/WildcardDefinitionPatternMatcher.java | 78 ++ .../WildcardDefinitionPatternMatcherFactory.java | 54 + .../definition/pattern/wildcard/package-info.java} | 24 +- .../core/evaluator/AbstractAttributeEvaluator.java | 50 + .../tiles/core/evaluator/AttributeEvaluator.java | 50 + .../core/evaluator/AttributeEvaluatorFactory.java | 48 + .../evaluator/AttributeEvaluatorFactoryAware.java} | 31 +- .../evaluator/BasicAttributeEvaluatorFactory.java | 88 ++ .../core/evaluator/EvaluationException.java} | 40 +- .../evaluator/impl/DirectAttributeEvaluator.java} | 28 +- .../core/evaluator/impl/package-info.java} | 24 +- .../core/evaluator/package-info.java} | 24 +- .../factory/AbstractTilesContainerFactory.java} | 35 +- .../core/factory/BasicTilesContainerFactory.java | 406 +++++++ .../factory/TilesContainerFactoryException.java} | 33 +- .../core/factory/package-info.java} | 24 +- .../tiles/core/impl/BasicTilesContainer.java | 398 +++++++ .../core/impl/InvalidTemplateException.java} | 40 +- .../core/impl/mgmt/CachingTilesContainer.java | 222 ++++ .../core/impl/mgmt/package-info.java} | 24 +- .../core/impl/package-info.java} | 24 +- .../core/locale/LocaleResolver.java} | 34 +- .../core/locale/impl/DefaultLocaleResolver.java | 55 + .../core/locale/impl/package-info.java} | 24 +- .../core/locale/package-info.java} | 25 +- .../core/prepare/factory/BasicPreparerFactory.java | 84 ++ .../prepare/factory/NoSuchPreparerException.java} | 31 +- .../core/prepare/factory/PreparerFactory.java | 49 + .../core/prepare/factory/package-info.java} | 26 +- .../tiles/core/renderer/DefinitionRenderer.java | 67 ++ .../core/renderer/package-info.java} | 24 +- .../core/startup/AbstractTilesInitializer.java | 110 ++ .../tiles/core/startup/TilesInitializer.java | 45 + .../core/startup/package-info.java} | 26 +- .../apache/tiles/core/util/CombinedBeanInfo.java | 95 ++ .../org/apache/tiles/core/util/WildcardHelper.java | 543 +++++++++ .../core/util/package-info.java} | 24 +- .../org/apache/tiles/el/ELAttributeEvaluator.java | 92 ++ .../java/org/apache/tiles/el/ELContextImpl.java | 144 +++ .../el/ExpressionFactoryFactory.java} | 31 +- .../tiles/el/JspExpressionFactoryFactory.java | 63 ++ .../java/org/apache/tiles/el/ScopeELResolver.java | 143 +++ .../tiles/el/TilesContextBeanELResolver.java | 172 +++ .../apache/tiles/el/TilesContextELResolver.java | 156 +++ .../el/package-info.java} | 24 +- .../freemarker/package-info.java} | 24 +- .../freemarker/template/AddAttributeFMModel.java | 78 ++ .../template/AddListAttributeFMModel.java | 73 ++ .../freemarker/template/DefinitionFMModel.java | 76 ++ .../freemarker/template/GetAsStringFMModel.java | 81 ++ .../template/ImportAttributeFMModel.java | 74 ++ .../template/InsertAttributeFMModel.java | 94 ++ .../template/InsertDefinitionFMModel.java | 99 ++ .../freemarker/template/InsertTemplateFMModel.java | 98 ++ .../freemarker/template/PutAttributeFMModel.java | 101 ++ .../template/PutListAttributeFMModel.java | 76 ++ .../template/SetCurrentContainerFMModel.java | 64 ++ .../template/TilesFMModelRepository.java | 199 ++++ .../tiles/ognl/AnyScopePropertyAccessor.java | 89 ++ .../tiles/ognl/DelegatePropertyAccessor.java | 84 ++ .../ognl/NestedObjectDelegatePropertyAccessor.java | 93 ++ .../ognl/NestedObjectExtractor.java} | 33 +- .../apache/tiles/ognl/OGNLAttributeEvaluator.java | 45 + .../ognl/PropertyAccessorDelegateFactory.java} | 37 +- .../apache/tiles/ognl/ScopePropertyAccessor.java | 68 ++ ...esApplicationContextNestedObjectExtractor.java} | 27 +- ...ilesContextPropertyAccessorDelegateFactory.java | 103 ++ .../ognl/package-info.java} | 24 +- .../tiles/request/AbstractClientRequest.java | 91 ++ .../org/apache/tiles/request/AbstractRequest.java | 54 + .../apache/tiles/request/AbstractViewRequest.java | 60 + .../apache/tiles/request/ApplicationAccess.java | 47 + .../apache/tiles/request/ApplicationContext.java | 79 ++ .../request/ApplicationContextAware.java} | 30 +- .../apache/tiles/request/ApplicationResource.java | 80 ++ .../org/apache/tiles/request/DispatchRequest.java | 51 + .../tiles/request/DispatchRequestWrapper.java | 139 +++ .../request/NotAvailableFeatureException.java} | 30 +- .../java/org/apache/tiles/request/Request.java | 161 +++ .../request/RequestException.java} | 39 +- .../request/RequestWrapper.java} | 29 +- .../request/attribute/Addable.java} | 31 +- .../request/attribute/AttributeExtractor.java} | 25 +- .../attribute/EnumeratedValuesExtractor.java} | 31 +- .../request/attribute/HasAddableKeys.java} | 25 +- .../request/attribute/HasKeys.java} | 36 +- .../request/attribute/HasRemovableKeys.java} | 30 +- .../request/attribute/package-info.java} | 28 +- .../request/collection/AddableParameterMap.java | 95 ++ .../tiles/request/collection/CollectionUtil.java | 66 ++ .../tiles/request/collection/HeaderValuesMap.java | 556 +++++++++ .../apache/tiles/request/collection/KeySet.java | 167 +++ .../apache/tiles/request/collection/MapEntry.java | 124 ++ .../request/collection/MapEntryArrayValues.java | 95 ++ .../request/collection/ReadOnlyEnumerationMap.java | 461 ++++++++ .../tiles/request/collection/RemovableKeySet.java | 91 ++ .../apache/tiles/request/collection/ScopeMap.java | 169 +++ .../request/collection/package-info.java} | 34 +- .../request/freemarker/EnvironmentScopeMap.java | 58 + .../request/freemarker/FreemarkerRequest.java | 143 +++ .../freemarker/FreemarkerRequestException.java} | 31 +- .../request/freemarker/FreemarkerRequestUtil.java | 82 ++ .../NotAvailableFreemarkerServletException.java} | 31 +- .../autotag/FreemarkerAutotagException.java} | 32 +- .../autotag/FreemarkerAutotagRuntime.java | 68 ++ .../freemarker/autotag/FreemarkerModelBody.java | 62 + .../request/freemarker/autotag/FreemarkerUtil.java | 60 + .../request/freemarker/autotag/package-info.java} | 24 +- .../extractor/EnvironmentScopeExtractor.java | 87 ++ .../freemarker/extractor/package-info.java} | 26 +- .../request/freemarker/package-info.java} | 26 +- .../freemarker/servlet/SharedVariableFactory.java} | 30 +- .../servlet/WebappClassTemplateLoader.java | 81 ++ .../request/freemarker/servlet/package-info.java} | 26 +- .../tiles/request/jsp/JspPrintWriterAdapter.java | 432 +++++++ .../org/apache/tiles/request/jsp/JspRequest.java | 199 ++++ .../java/org/apache/tiles/request/jsp/JspUtil.java | 52 + .../request/jsp/autotag/JspAutotagRuntime.java | 69 ++ .../tiles/request/jsp/autotag/JspModelBody.java | 63 ++ .../request/jsp/autotag/package-info.java} | 24 +- .../request/jsp/extractor/ScopeExtractor.java | 71 ++ .../jsp/extractor/SessionScopeExtractor.java | 76 ++ .../request/jsp/extractor/package-info.java} | 26 +- .../request/jsp/package-info.java} | 26 +- .../apache/tiles/request/locale/LocaleUtil.java | 58 + .../locale/PostfixedApplicationResource.java | 235 ++++ .../request/locale/URLApplicationResource.java | 213 ++++ .../reflect/CannotInstantiateObjectException.java} | 32 +- .../apache/tiles/request/reflect/ClassUtil.java | 123 ++ .../request/reflect/package-info.java} | 24 +- .../tiles/request/render/BasicRendererFactory.java | 79 ++ .../request/render/CannotRenderException.java} | 38 +- .../request/render/ChainedDelegateRenderer.java | 80 ++ .../tiles/request/render/DispatchRenderer.java | 61 + .../request/render/NoSuchRendererException.java} | 31 +- .../request/render/RenderException.java} | 38 +- .../org/apache/tiles/request/render/Renderer.java | 48 + .../request/render/RendererFactory.java} | 37 +- .../request/render/StringRenderer.java} | 35 +- .../servlet/ExternalWriterHttpServletResponse.java | 58 + .../servlet/NotAServletEnvironmentException.java} | 32 +- .../request/servlet/ServletApplicationContext.java | 127 +++ .../tiles/request/servlet/ServletRequest.java | 343 ++++++ .../apache/tiles/request/servlet/ServletUtil.java | 117 ++ .../extractor/ApplicationScopeExtractor.java | 64 ++ .../request/servlet/extractor/HeaderExtractor.java | 72 ++ .../servlet/extractor/InitParameterExtractor.java | 55 + .../servlet/extractor/ParameterExtractor.java | 54 + .../servlet/extractor/RequestScopeExtractor.java | 64 ++ .../servlet/extractor/SessionScopeExtractor.java | 77 ++ .../request/servlet/extractor/package-info.java} | 26 +- .../request/servlet/package-info.java} | 26 +- .../tiles/request/velocity/VelocityRequest.java | 169 +++ .../tiles/request/velocity/VelocityScopeMap.java | 87 ++ .../velocity/autotag/VelocityAutotagRuntime.java | 102 ++ .../velocity/autotag/VelocityModelBody.java | 61 + .../request/velocity/autotag/VelocityUtil.java | 67 ++ .../request/velocity/autotag/package-info.java} | 24 +- .../velocity/extractor/VelocityScopeExtractor.java | 99 ++ .../request/velocity/extractor/package-info.java} | 24 +- .../request/velocity/package-info.java} | 24 +- .../render/ApplicationContextJeeConfig.java | 77 ++ .../request/velocity/render/VelocityRenderer.java | 75 ++ .../velocity/render/VelocityRendererBuilder.java | 91 ++ .../request/velocity/render/package-info.java} | 24 +- .../apache/tiles/template/AddAttributeModel.java | 124 ++ .../tiles/template/AddListAttributeModel.java | 60 + .../apache/tiles/template/AttributeResolver.java | 58 + .../apache/tiles/template/ComposeStackUtil.java | 83 ++ .../tiles/template/DefaultAttributeResolver.java | 85 ++ .../org/apache/tiles/template/DefinitionModel.java | 139 +++ .../apache/tiles/template/GetAsStringModel.java | 224 ++++ .../tiles/template/ImportAttributeModel.java | 194 ++++ .../tiles/template/InsertAttributeModel.java | 204 ++++ .../tiles/template/InsertDefinitionModel.java | 147 +++ .../apache/tiles/template/InsertTemplateModel.java | 141 +++ .../template/NoSuchAttributeException.java} | 32 +- .../apache/tiles/template/PutAttributeModel.java | 165 +++ .../tiles/template/PutListAttributeModel.java | 88 ++ .../template/SetCurrentContainerModel.java} | 33 +- .../template/package-info.java} | 26 +- .../tiles/velocity/TilesVelocityException.java | 71 ++ .../velocity/package-info.java} | 24 +- .../AbstractDefaultToStringRenderable.java | 119 ++ .../velocity/template/AddAttributeDirective.java | 78 ++ .../template/AddListAttributeDirective.java | 73 ++ .../tiles/velocity/template/ContextHolder.java | 154 +++ .../velocity/template/DefinitionDirective.java | 76 ++ .../velocity/template/GetAsStringDirective.java | 81 ++ .../template/ImportAttributeDirective.java | 74 ++ .../template/InsertAttributeDirective.java | 94 ++ .../template/InsertDefinitionDirective.java | 99 ++ .../velocity/template/InsertTemplateDirective.java | 98 ++ .../velocity/template/PutAttributeDirective.java | 101 ++ .../template/PutListAttributeDirective.java | 76 ++ .../template/SetCurrentContainerDirective.java | 64 ++ .../velocity/template/VelocityStyleTilesTool.java | 224 ++++ .../velocity/template/package-info.java} | 24 +- .../tiles/web/jsp/taglib/AddAttributeTag.java | 165 +++ .../tiles/web/jsp/taglib/AddListAttributeTag.java | 87 ++ .../apache/tiles/web/jsp/taglib/DefinitionTag.java | 184 +++ .../tiles/web/jsp/taglib/GetAsStringTag.java | 264 +++++ .../tiles/web/jsp/taglib/ImportAttributeTag.java | 166 +++ .../tiles/web/jsp/taglib/InsertAttributeTag.java | 299 +++++ .../tiles/web/jsp/taglib/InsertDefinitionTag.java | 257 +++++ .../tiles/web/jsp/taglib/InsertTemplateTag.java | 230 ++++ .../tiles/web/jsp/taglib/PutAttributeTag.java | 233 ++++ .../tiles/web/jsp/taglib/PutListAttributeTag.java | 164 +++ .../web/jsp/taglib/SetCurrentContainerTag.java | 80 ++ .../tiles/web/jsp/taglib/UseAttributeTag.java | 214 ++++ .../web/jsp/taglib/package-info.java} | 25 +- .../tiles/web/startup/AbstractTilesListener.java | 69 ++ .../web/startup/package-info.java} | 26 +- .../web/util/AttributeContextMutator.java} | 34 +- .../tiles/web/util/TilesDispatchServlet.java | 148 +++ .../web/util/package-info.java} | 26 +- .../src/main/resources/META-INF/template-suite.xml | 1188 ++++++++++++++++++++ .../resources/META-INF/tld/tiles-extras-jsp.tld | 105 ++ .../src/main/resources/META-INF/tld/tiles-jsp.tld | 922 +++++++++++++++ .../main/resources/META-INF/velocity.properties | 30 + .../org/apache/tiles/autotag/freemarker/fmModel.vm | 78 ++ .../apache/tiles/autotag/freemarker/repository.vm | 57 + .../org/apache/tiles/autotag/jsp/bodyTag.vm | 102 ++ .../resources/org/apache/tiles/autotag/jsp/tld.vm | 66 ++ .../org/apache/tiles/autotag/velocity.properties | 101 ++ .../tiles/autotag/velocity/velocityDirective.vm | 76 ++ .../tiles/autotag/velocity/velocityProperties.vm | 21 + .../apache/tiles/resources/tiles-config_3_0.dtd | 245 ++++ plugins/tiles/src/main/resources/tools.xml | 24 + .../tiles/StrutsTilesAnnotationProcessorTest.java | 6 +- .../java/org/apache/tiles/api/AttributeTest.java | 275 +++++ .../tiles/api/BasicAttributeContextTest.java | 681 +++++++++++ .../java/org/apache/tiles/api/ExpressionTest.java | 108 ++ .../org/apache/tiles/api/ListAttributeTest.java | 109 ++ .../tiles/api/NoSuchContainerExceptionTest.java} | 33 +- .../java/org/apache/tiles/api/TestDefinition.java | 248 ++++ .../tiles/api/TilesContainerWrapperTest.java | 232 ++++ .../org/apache/tiles/api/TilesExceptionTest.java | 62 + .../apache/tiles/api/access/TilesAccessTest.java | 206 ++++ .../tiles/api/preparer/PreparerExceptionTest.java | 74 ++ .../autotag/freemarker/FMModelGeneratorTest.java | 139 +++ .../freemarker/FMModelRepositoryGeneratorTest.java | 126 +++ .../freemarker/FMTemplateGeneratorFactoryTest.java | 58 + .../jsp/JspTemplateGeneratorFactoryTest.java | 61 + .../apache/tiles/autotag/jsp/TLDGeneratorTest.java | 129 +++ .../tiles/autotag/jsp/TagClassGeneratorTest.java | 139 +++ .../tiles/autotag/model/TemplateClassTest.java | 153 +++ .../tiles/autotag/model/TemplateMethodTest.java | 132 +++ .../tiles/autotag/model/TemplateParameterTest.java | 88 ++ .../tiles/autotag/model/TemplateSuiteTest.java | 112 ++ .../autotag/runtime/AbstractModelBodyTest.java | 157 +++ .../tiles/autotag/runtime/util/NullWriterTest.java | 71 ++ .../velocity/VelocityDirectiveGeneratorTest.java | 139 +++ .../velocity/VelocityPropertiesGeneratorTest.java | 125 ++ .../VelocityTemplateGeneratorFactoryTest.java | 60 + .../DefinitionsFactoryExceptionTest.java | 74 ++ .../core/definition/MockDefinitionsReader.java | 44 + .../definition/NoSuchDefinitionExceptionTest.java} | 36 +- .../UnresolvingLocaleDefinitionsFactoryTest.java | 63 ++ .../dao/BaseLocaleUrlDefinitionDAOTest.java | 156 +++ .../dao/CachingLocaleUrlDefinitionDAOTest.java | 371 ++++++ .../dao/ResolvingLocaleUrlDefinitionDAOTest.java | 391 +++++++ .../DigesterDefinitionsReaderExceptionTest.java} | 35 +- .../digester/TestDigesterDefinitionsReader.java | 279 +++++ .../AbstractPatternDefinitionResolverTest.java | 119 ++ .../BasicPatternDefinitionResolverTest.java | 78 ++ .../core/definition/pattern/PatternUtilTest.java | 316 ++++++ .../PrefixedPatternDefinitionResolverTest.java | 77 ++ .../RegexpDefinitionPatternMatcherFactoryTest.java | 49 + .../regexp/RegexpDefinitionPatternMatcherTest.java | 47 + ...ildcardDefinitionPatternMatcherFactoryTest.java | 61 + .../WildcardDefinitionPatternMatcherTest.java | 53 + .../BasicAttributeEvaluatorFactoryTest.java | 85 ++ .../core/evaluator/EvaluatorExceptionTest.java | 53 + .../impl/DirectAttributeEvaluatorTest.java | 84 ++ .../core/factory/BasicPreparerFactoryTest.java | 72 ++ .../factory/BasicTilesContainerFactoryTest.java | 252 +++++ .../core/factory/NoSuchPreparerExceptionTest.java} | 37 +- .../TilesContainerFactoryExceptionTest.java} | 36 +- .../tiles/core/impl/BasicTilesContainerTest.java | 126 +++ .../core/impl/BasicTilesContainerUnitTest.java | 836 ++++++++++++++ .../tiles/core/impl/CannotRenderExceptionTest.java | 54 + .../tiles/core/impl/DefaultLocaleResolverTest.java | 58 + .../core/impl/InvalidTemplateExceptionTest.java | 53 + .../core/impl/mgmt/CachingTilesContainerTest.java | 305 +++++ .../core/renderer/DefinitionRendererTest.java | 106 ++ .../core/startup/AbstractTilesInitializerTest.java | 130 +++ .../tiles/core/util/CombinedBeanInfoTest.java | 93 ++ .../apache/tiles/el/ELAttributeEvaluatorTest.java | 189 ++++ .../org/apache/tiles/el/ELContextImplTest.java | 120 ++ .../tiles/el/JspExpressionFactoryFactoryTest.java | 84 ++ .../org/apache/tiles/el/ScopeELResolverTest.java | 175 +++ .../tiles/el/TilesContextBeanELResolverTest.java | 299 +++++ .../tiles/el/TilesContextELResolverTest.java | 189 ++++ .../tiles/ognl/AnyScopePropertyAccessorTest.java | 152 +++ .../tiles/ognl/DelegatePropertyAccessorTest.java | 111 ++ .../NestedObjectDelegatePropertyAccessorTest.java | 106 ++ .../tiles/ognl/OGNLAttributeEvaluatorTest.java | 229 ++++ .../tiles/ognl/ScopePropertyAccessorTest.java | 91 ++ ...pplicationContextNestedObjectExtractorTest.java | 51 + ...ContextPropertyAccessorDelegateFactoryTest.java | 189 ++++ .../tiles/request/AbstractClientRequestTest.java | 155 +++ .../apache/tiles/request/AbstractRequestTest.java | 54 + .../tiles/request/AbstractViewRequestTest.java | 119 ++ .../tiles/request/ApplicationAccessTest.java | 51 + .../tiles/request/DispatchRequestWrapperTest.java | 90 ++ .../request/NotAvailableFeatureExceptionTest.java} | 35 +- .../apache/tiles/request/RequestExceptionTest.java | 53 + .../collection/AddableParameterMapTest.java | 112 ++ .../request/collection/CollectionUtilTest.java | 59 + .../collection/HeaderValuesCollectionTest.java | 398 +++++++ .../collection/HeaderValuesMapEntrySetTest.java | 337 ++++++ .../request/collection/HeaderValuesMapTest.java | 337 ++++++ .../tiles/request/collection/KeySetTest.java | 283 +++++ .../collection/MapEntryArrayValuesTest.java | 76 ++ .../tiles/request/collection/MapEntryTest.java | 106 ++ .../ReadOnlyEnumerationMapEntrySetTest.java | 294 +++++ .../collection/ReadOnlyEnumerationMapTest.java | 306 +++++ ...ReadOnlyEnumerationMapValuesCollectionTest.java | 312 +++++ .../request/collection/RemovableKeySetTest.java | 129 +++ .../request/collection/ScopeMapEntrySetTest.java | 234 ++++ .../tiles/request/collection/ScopeMapTest.java | 135 +++ .../tiles/request/locale/LocaleUtilTest.java | 42 + .../locale/PostfixedApplicationResourceTest.java | 131 +++ .../request/locale/URLApplicationResourceTest.java | 201 ++++ .../CannotInstantiateObjectExceptionTest.java} | 35 +- .../tiles/request/reflect/ClassUtilTest.java | 175 +++ .../request/render/BasicRendererFactoryTest.java | 100 ++ .../render/ChainedDelegateRendererTest.java | 178 +++ .../tiles/request/render/DispatchRendererTest.java | 74 ++ .../render/NoSuchRendererExceptionTest.java} | 36 +- .../tiles/request/render/StringRendererTest.java | 79 ++ .../tiles/template/AddAttributeModelTest.java | 111 ++ .../tiles/template/AddListAttributeModelTest.java | 86 ++ .../tiles/template/ComposeStackUtilTest.java | 123 ++ .../template/DefaultAttributeResolverTest.java | 155 +++ .../apache/tiles/template/DefinitionModelTest.java | 98 ++ .../tiles/template/GetAsStringModelTest.java | 140 +++ .../tiles/template/ImportAttributeModelTest.java | 316 ++++++ .../tiles/template/InsertAttributeModelTest.java | 131 +++ .../tiles/template/InsertDefinitionModelTest.java | 90 ++ .../tiles/template/InsertTemplateModelTest.java | 89 ++ .../tiles/template/PutAttributeModelTest.java | 93 ++ .../tiles/template/PutListAttributeModelTest.java | 93 ++ .../template/SetCurrentContainerModelTest.java | 84 ++ .../tiles/web/jsp/taglib/UseAttributeTagTest.java | 220 ++++ .../web/startup/AbstractTilesListenerTest.java | 61 + .../autotag/freemarker/test/DoStuffFMModel.javat | 72 ++ .../freemarker/test/DoStuffNoBodyFMModel.javat | 70 ++ .../freemarker/test/TldtestFMModelRepository.javat | 64 ++ .../tiles/autotag/jsp/test/DoStuffNoBodyTag.java | 134 +++ .../apache/tiles/autotag/jsp/test/DoStuffTag.java | 136 +++ .../autotag/velocity/test/DoStuffDirective.javat | 70 ++ .../velocity/test/DoStuffNoBodyDirective.javat | 68 ++ .../apache/tiles/core/config/defs-tiles-513.xml | 48 + .../org/apache/tiles/core/config/defs-wildcard.xml | 62 + .../org/apache/tiles/core/config/defs1.xml | 75 ++ .../org/apache/tiles/core/config/defs1_en_US.xml | 45 + .../org/apache/tiles/core/config/defs1_fr.xml | 58 + .../org/apache/tiles/core/config/defs1_fr_CA.xml | 45 + .../org/apache/tiles/core/config/defs2.xml | 44 + .../org/apache/tiles/core/config/defs3.xml | 44 + .../core/config/defs_regression_TILES-352.xml} | 38 +- .../org/apache/tiles/core/config/invalid-defs.xml | 44 + .../apache/tiles/core/config/malformed-defs.xml | 42 + .../org/apache/tiles/core/config/temp-defs.xml | 45 + .../apache/tiles/core/config/tiles-defs-2.1.xml | 88 ++ .../tiles/core/config/tiles-defs-2.1_it.xml} | 33 +- .../org/apache/tiles/core/config/tiles-defs.xml | 143 +++ .../tiles/core/factory/test-defs-key-one.xml} | 37 +- .../tiles/core/factory/test-defs-key-two.xml} | 37 +- .../org/apache/tiles/core/factory/test-defs.xml} | 37 +- .../tiles/request/locale/resource with space.txt} | 27 +- .../org/apache/tiles/request/locale/resource.txt} | 27 +- plugins/tiles/src/test/resources/tldtest-jsp.tld | 121 ++ .../src/test/resources/velocity.properties.test | 21 + pom.xml | 72 +- 504 files changed, 49774 insertions(+), 2519 deletions(-) create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/PortletRequest.java create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/RenderPortletRequest.java create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/MimeResponseDelegate.java create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/PortletRequestDelegate.java copy plugins/{tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java => portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/RequestDelegate.java} (52%) create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/ResponseDelegate.java copy plugins/{tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java => portlet-tiles/src/main/java/org/apache/tiles/request/portlet/delegate/package-info.java} (52%) create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/ApplicationScopeExtractor.java create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/HeaderExtractor.java create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/InitParameterExtractor.java copy plugins/{tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java => portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/ParameterExtractor.java} (50%) create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/RequestScopeExtractor.java create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/SessionScopeExtractor.java create mode 100644 plugins/portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/StateAwareParameterExtractor.java copy plugins/{tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java => portlet-tiles/src/main/java/org/apache/tiles/request/portlet/extractor/package-info.java} (52%) copy plugins/{tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java => portlet-tiles/src/main/java/org/apache/tiles/request/portlet/package-info.java} (52%) create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/PortletRequestTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/RenderPortletRequestTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/delegate/MimeResponseDelegateTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/delegate/PortletRequestDelegateTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/ApplicationScopeExtractorTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/HeaderExtractorTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/InitParameterExtractorTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/ParameterExtractorTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/RequestScopeExtractorTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/SessionScopeExtractorTest.java create mode 100644 plugins/portlet-tiles/src/test/java/org/apache/tiles/request/portlet/extractor/StateAwareParameterExtractorTest.java create mode 100644 plugins/tiles/src/main/java/org/apache/struts2/tiles/BuildAutotags.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/Attribute.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/AttributeContext.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/BasicAttributeContext.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/Definition.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/Expression.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/ListAttribute.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/api/NoSuchContainerException.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/TilesContainer.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/TilesContainerWrapper.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/TilesException.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/access/TilesAccess.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/api/access/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/api/mgmt/MutableTilesContainer.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/api/mgmt/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/package-info.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/preparer/PreparerException.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/api/preparer/ViewPreparer.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/api/preparer/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/core/AutotagRuntimeException.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/core/runtime/AbstractModelBody.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/core/runtime/AutotagRuntime.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/core/runtime/ModelBody.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/core/runtime/annotation/Parameter.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/core/runtime/annotation/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/core/runtime/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/core/runtime/util/NullWriter.java} (53%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/core/runtime/util/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/freemarker/FMModelGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/freemarker/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateClassGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/AbstractTemplateSuiteGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/BasicTemplateGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/TemplateClassGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/TemplateGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/generate/TemplateGeneratorBuilder.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/generate/TemplateGeneratorFactory.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/generate/TemplateSuiteGenerator.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/generate/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/jsp/JspTemplateGeneratorFactory.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/jsp/TLDGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/jsp/TagClassGenerator.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/jsp/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/model/TemplateClass.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/model/TemplateMethod.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/model/TemplateParameter.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/model/TemplateSuite.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/model/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/tool/StringTool.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/tool/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/velocity/VelocityDirectiveGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/velocity/VelocityPropertiesGenerator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/autotag/velocity/VelocityTemplateGeneratorFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/autotag/velocity/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/DefinitionsFactory.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/DefinitionsFactoryException.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/DefinitionsReader.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/NoSuchDefinitionException.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/RefreshMonitor.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/UnresolvingLocaleDefinitionsFactory.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/dao/BaseLocaleUrlDefinitionDAO.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/dao/CachingLocaleUrlDefinitionDAO.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/dao/DefinitionDAO.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/dao/ResolvingLocaleUrlDefinitionDAO.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/dao/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReader.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/digester/DigesterDefinitionsReaderException.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/digester/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/pattern/AbstractPatternDefinitionResolver.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/pattern/BasicPatternDefinitionResolver.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/pattern/DefinitionPatternMatcher.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/pattern/DefinitionPatternMatcherFactory.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/pattern/PatternDefinitionResolver.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/pattern/PatternDefinitionResolverAware.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/pattern/PatternRecognizer.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/pattern/PatternUtil.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/pattern/PrefixedPatternDefinitionResolver.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/pattern/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/pattern/regexp/RegexpDefinitionPatternMatcher.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactory.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/pattern/regexp/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/pattern/wildcard/WildcardDefinitionPatternMatcher.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/definition/pattern/wildcard/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/evaluator/AbstractAttributeEvaluator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/evaluator/AttributeEvaluator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/evaluator/AttributeEvaluatorFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/evaluator/AttributeEvaluatorFactoryAware.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/evaluator/BasicAttributeEvaluatorFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/evaluator/EvaluationException.java} (53%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/evaluator/impl/DirectAttributeEvaluator.java} (53%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/evaluator/impl/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/evaluator/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/factory/AbstractTilesContainerFactory.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/factory/BasicTilesContainerFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/factory/TilesContainerFactoryException.java} (53%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/factory/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/impl/BasicTilesContainer.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/impl/InvalidTemplateException.java} (53%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/impl/mgmt/CachingTilesContainer.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/impl/mgmt/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/impl/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/locale/LocaleResolver.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/locale/impl/DefaultLocaleResolver.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/locale/impl/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/locale/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/prepare/factory/BasicPreparerFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/prepare/factory/NoSuchPreparerException.java} (53%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/prepare/factory/PreparerFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/prepare/factory/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/renderer/DefinitionRenderer.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/renderer/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/startup/AbstractTilesInitializer.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/startup/TilesInitializer.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/startup/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/util/CombinedBeanInfo.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/core/util/WildcardHelper.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/core/util/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/el/ELAttributeEvaluator.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/el/ELContextImpl.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/el/ExpressionFactoryFactory.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/el/JspExpressionFactoryFactory.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/el/ScopeELResolver.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextBeanELResolver.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/el/TilesContextELResolver.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/el/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/freemarker/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/AddAttributeFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/AddListAttributeFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/DefinitionFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/GetAsStringFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/ImportAttributeFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/InsertAttributeFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/InsertDefinitionFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/InsertTemplateFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/PutAttributeFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/PutListAttributeFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/SetCurrentContainerFMModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/freemarker/template/TilesFMModelRepository.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/ognl/DelegatePropertyAccessor.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessor.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/ognl/NestedObjectExtractor.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/ognl/PropertyAccessorDelegateFactory.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/ognl/ScopePropertyAccessor.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/ognl/TilesApplicationContextNestedObjectExtractor.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/ognl/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/AbstractClientRequest.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/AbstractRequest.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/AbstractViewRequest.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/ApplicationAccess.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/ApplicationContext.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/ApplicationContextAware.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/ApplicationResource.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/DispatchRequest.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/DispatchRequestWrapper.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/NotAvailableFeatureException.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/Request.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/RequestException.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/RequestWrapper.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/attribute/Addable.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/attribute/AttributeExtractor.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/attribute/EnumeratedValuesExtractor.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/attribute/HasAddableKeys.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/attribute/HasKeys.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/attribute/HasRemovableKeys.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/attribute/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/collection/AddableParameterMap.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/collection/CollectionUtil.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/collection/HeaderValuesMap.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/collection/KeySet.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/collection/MapEntry.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/collection/MapEntryArrayValues.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/collection/ReadOnlyEnumerationMap.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/collection/RemovableKeySet.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/collection/ScopeMap.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/collection/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/EnvironmentScopeMap.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequest.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/freemarker/FreemarkerRequestException.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/FreemarkerRequestUtil.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/freemarker/NotAvailableFreemarkerServletException.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/freemarker/autotag/FreemarkerAutotagException.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerAutotagRuntime.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerModelBody.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/autotag/FreemarkerUtil.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/freemarker/autotag/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/extractor/EnvironmentScopeExtractor.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/freemarker/extractor/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/freemarker/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/freemarker/servlet/SharedVariableFactory.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/freemarker/servlet/WebappClassTemplateLoader.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/freemarker/servlet/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspPrintWriterAdapter.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspRequest.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/jsp/JspUtil.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspAutotagRuntime.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/jsp/autotag/JspModelBody.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/jsp/autotag/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/ScopeExtractor.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/jsp/extractor/SessionScopeExtractor.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/jsp/extractor/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/jsp/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/locale/LocaleUtil.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/locale/PostfixedApplicationResource.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/locale/URLApplicationResource.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/reflect/CannotInstantiateObjectException.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/reflect/ClassUtil.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/reflect/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/render/BasicRendererFactory.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/render/CannotRenderException.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/render/ChainedDelegateRenderer.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/render/DispatchRenderer.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/render/NoSuchRendererException.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/render/RenderException.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/render/Renderer.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/render/RendererFactory.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/render/StringRenderer.java} (53%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ExternalWriterHttpServletResponse.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/servlet/NotAServletEnvironmentException.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletApplicationContext.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletRequest.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/ServletUtil.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ApplicationScopeExtractor.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/HeaderExtractor.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/InitParameterExtractor.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/ParameterExtractor.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/RequestScopeExtractor.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/servlet/extractor/SessionScopeExtractor.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/servlet/extractor/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/servlet/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/velocity/VelocityRequest.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/velocity/VelocityScopeMap.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityAutotagRuntime.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityModelBody.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/velocity/autotag/VelocityUtil.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/velocity/autotag/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/velocity/extractor/VelocityScopeExtractor.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/velocity/extractor/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/velocity/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/ApplicationContextJeeConfig.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/VelocityRenderer.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/request/velocity/render/VelocityRendererBuilder.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/request/velocity/render/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/AddAttributeModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/AddListAttributeModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/AttributeResolver.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/ComposeStackUtil.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/DefinitionModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/GetAsStringModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/ImportAttributeModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/InsertAttributeModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/InsertDefinitionModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/InsertTemplateModel.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/template/NoSuchAttributeException.java} (53%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/PutAttributeModel.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/template/PutListAttributeModel.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/template/SetCurrentContainerModel.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/template/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/TilesVelocityException.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/velocity/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/AddAttributeDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/AddListAttributeDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/ContextHolder.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/DefinitionDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/GetAsStringDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/ImportAttributeDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/InsertAttributeDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/InsertDefinitionDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/InsertTemplateDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/PutAttributeDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/PutListAttributeDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/SetCurrentContainerDirective.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/velocity/template/VelocityStyleTilesTool.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/velocity/template/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddAttributeTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/AddListAttributeTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/DefinitionTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/GetAsStringTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/ImportAttributeTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertAttributeTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertDefinitionTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/InsertTemplateTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutAttributeTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/PutListAttributeTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/SetCurrentContainerTag.java create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/jsp/taglib/UseAttributeTag.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/web/jsp/taglib/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/startup/AbstractTilesListener.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/web/startup/package-info.java} (52%) copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/web/util/AttributeContextMutator.java} (52%) create mode 100644 plugins/tiles/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java copy plugins/tiles/src/main/java/org/apache/{struts2/tiles/StrutsTilesListener.java => tiles/web/util/package-info.java} (52%) create mode 100644 plugins/tiles/src/main/resources/META-INF/template-suite.xml create mode 100644 plugins/tiles/src/main/resources/META-INF/tld/tiles-extras-jsp.tld create mode 100644 plugins/tiles/src/main/resources/META-INF/tld/tiles-jsp.tld create mode 100644 plugins/tiles/src/main/resources/META-INF/velocity.properties create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/autotag/freemarker/repository.vm create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/autotag/jsp/bodyTag.vm create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/autotag/jsp/tld.vm create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/autotag/velocity.properties create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/autotag/velocity/velocityProperties.vm create mode 100644 plugins/tiles/src/main/resources/org/apache/tiles/resources/tiles-config_3_0.dtd create mode 100644 plugins/tiles/src/main/resources/tools.xml create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/api/AttributeTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/api/BasicAttributeContextTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/api/ExpressionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/api/ListAttributeTest.java copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/java/org/apache/tiles/api/NoSuchContainerExceptionTest.java} (52%) create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/api/TestDefinition.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/api/TilesContainerWrapperTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/api/TilesExceptionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/api/access/TilesAccessTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/api/preparer/PreparerExceptionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/freemarker/FMModelGeneratorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/freemarker/FMModelRepositoryGeneratorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/freemarker/FMTemplateGeneratorFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/jsp/JspTemplateGeneratorFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/jsp/TLDGeneratorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/jsp/TagClassGeneratorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/model/TemplateClassTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/model/TemplateMethodTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/model/TemplateParameterTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/model/TemplateSuiteTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/runtime/AbstractModelBodyTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/runtime/util/NullWriterTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/velocity/VelocityDirectiveGeneratorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/velocity/VelocityPropertiesGeneratorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/autotag/velocity/VelocityTemplateGeneratorFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/DefinitionsFactoryExceptionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/MockDefinitionsReader.java copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/java/org/apache/tiles/core/definition/NoSuchDefinitionExceptionTest.java} (52%) create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/UnresolvingLocaleDefinitionsFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/dao/BaseLocaleUrlDefinitionDAOTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/dao/CachingLocaleUrlDefinitionDAOTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/java/org/apache/tiles/core/definition/digester/DigesterDefinitionsReaderExceptionTest.java} (51%) create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/digester/TestDigesterDefinitionsReader.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/pattern/AbstractPatternDefinitionResolverTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/pattern/BasicPatternDefinitionResolverTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/pattern/PatternUtilTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/pattern/PrefixedPatternDefinitionResolverTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/pattern/regexp/RegexpDefinitionPatternMatcherFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/pattern/regexp/RegexpDefinitionPatternMatcherTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/pattern/wildcard/WildcardDefinitionPatternMatcherFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/definition/pattern/wildcard/WildcardDefinitionPatternMatcherTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/evaluator/BasicAttributeEvaluatorFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/evaluator/EvaluatorExceptionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/evaluator/impl/DirectAttributeEvaluatorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/factory/BasicPreparerFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/factory/BasicTilesContainerFactoryTest.java copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/java/org/apache/tiles/core/factory/NoSuchPreparerExceptionTest.java} (52%) copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/java/org/apache/tiles/core/factory/TilesContainerFactoryExceptionTest.java} (51%) create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/impl/BasicTilesContainerTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/impl/BasicTilesContainerUnitTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/impl/CannotRenderExceptionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/impl/DefaultLocaleResolverTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/impl/InvalidTemplateExceptionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/impl/mgmt/CachingTilesContainerTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/renderer/DefinitionRendererTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/startup/AbstractTilesInitializerTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/core/util/CombinedBeanInfoTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/el/ELContextImplTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/el/JspExpressionFactoryFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/el/ScopeELResolverTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/ognl/DelegatePropertyAccessorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/ognl/ScopePropertyAccessorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/ognl/TilesApplicationContextNestedObjectExtractorTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/ognl/TilesContextPropertyAccessorDelegateFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/AbstractClientRequestTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/AbstractRequestTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/AbstractViewRequestTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/ApplicationAccessTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/DispatchRequestWrapperTest.java copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/java/org/apache/tiles/request/NotAvailableFeatureExceptionTest.java} (52%) create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/RequestExceptionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/AddableParameterMapTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/CollectionUtilTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/HeaderValuesCollectionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/HeaderValuesMapEntrySetTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/HeaderValuesMapTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/KeySetTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/MapEntryArrayValuesTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/MapEntryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/ReadOnlyEnumerationMapEntrySetTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/ReadOnlyEnumerationMapTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/ReadOnlyEnumerationMapValuesCollectionTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/RemovableKeySetTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/ScopeMapEntrySetTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/collection/ScopeMapTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/locale/LocaleUtilTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/locale/PostfixedApplicationResourceTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/locale/URLApplicationResourceTest.java copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/java/org/apache/tiles/request/reflect/CannotInstantiateObjectExceptionTest.java} (51%) create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/reflect/ClassUtilTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/render/BasicRendererFactoryTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/render/ChainedDelegateRendererTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/render/DispatchRendererTest.java copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/java/org/apache/tiles/request/render/NoSuchRendererExceptionTest.java} (52%) create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/request/render/StringRendererTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/AddAttributeModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/AddListAttributeModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/ComposeStackUtilTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/DefaultAttributeResolverTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/DefinitionModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/GetAsStringModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/ImportAttributeModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/InsertAttributeModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/InsertDefinitionModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/InsertTemplateModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/PutAttributeModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/PutListAttributeModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/template/SetCurrentContainerModelTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/web/jsp/taglib/UseAttributeTagTest.java create mode 100644 plugins/tiles/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/autotag/freemarker/test/TldtestFMModelRepository.javat create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffNoBodyTag.java create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/autotag/jsp/test/DoStuffTag.java create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/defs-tiles-513.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/defs-wildcard.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/defs1.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/defs1_en_US.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/defs1_fr.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/defs1_fr_CA.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/defs2.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/defs3.xml copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/resources/org/apache/tiles/core/config/defs_regression_TILES-352.xml} (51%) create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/invalid-defs.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/malformed-defs.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/temp-defs.xml create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/tiles-defs-2.1.xml copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/resources/org/apache/tiles/core/config/tiles-defs-2.1_it.xml} (51%) create mode 100644 plugins/tiles/src/test/resources/org/apache/tiles/core/config/tiles-defs.xml copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/resources/org/apache/tiles/core/factory/test-defs-key-one.xml} (50%) copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/resources/org/apache/tiles/core/factory/test-defs-key-two.xml} (50%) copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/resources/org/apache/tiles/core/factory/test-defs.xml} (50%) copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/resources/org/apache/tiles/request/locale/resource with space.txt} (51%) copy plugins/tiles/src/{main/java/org/apache/struts2/tiles/StrutsTilesListener.java => test/resources/org/apache/tiles/request/locale/resource.txt} (51%) create mode 100644 plugins/tiles/src/test/resources/tldtest-jsp.tld create mode 100644 plugins/tiles/src/test/resources/velocity.properties.test