This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tiles.
commit 9ecfc3653227f457239046af57c962899c1c9d31
Merge: a14507b b046406
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Sep 16 14:47:00 2016 +0200
Merge tag 'upstream/3.0.7'
Upstream version 3.0.7
src/assembly/pom.xml | 10 +++++-----
src/pom.xml | 12 ++++++------
src/src/site/apt/tutorial/advanced/nesting-extending.apt | 6 +++---
src/src/site/apt/tutorial/integration/frameworks.apt | 4 ++--
src/tiles-api/pom.xml | 4 ++--
src/tiles-api/src/main/java/org/apache/tiles/Attribute.java | 2 +-
.../src/main/java/org/apache/tiles/AttributeContext.java | 2 +-
.../main/java/org/apache/tiles/BasicAttributeContext.java | 2 +-
.../src/main/java/org/apache/tiles/CompareUtil.java | 2 +-
src/tiles-api/src/main/java/org/apache/tiles/Definition.java | 2 +-
src/tiles-api/src/main/java/org/apache/tiles/Expression.java | 2 +-
.../src/main/java/org/apache/tiles/ListAttribute.java | 2 +-
.../main/java/org/apache/tiles/NoSuchContainerException.java | 2 +-
.../src/main/java/org/apache/tiles/TilesContainer.java | 2 +-
.../main/java/org/apache/tiles/TilesContainerWrapper.java | 2 +-
.../src/main/java/org/apache/tiles/TilesException.java | 2 +-
.../src/main/java/org/apache/tiles/access/TilesAccess.java | 2 +-
.../java/org/apache/tiles/mgmt/MutableTilesContainer.java | 2 +-
.../java/org/apache/tiles/preparer/PreparerException.java | 2 +-
.../main/java/org/apache/tiles/preparer/ViewPreparer.java | 2 +-
.../src/test/java/org/apache/tiles/AttributeTest.java | 2 +-
.../java/org/apache/tiles/BasicAttributeContextTest.java | 2 +-
.../src/test/java/org/apache/tiles/CompareUtilTest.java | 2 +-
.../src/test/java/org/apache/tiles/ExpressionTest.java | 2 +-
.../src/test/java/org/apache/tiles/ListAttributeTest.java | 2 +-
.../java/org/apache/tiles/NoSuchContainerExceptionTest.java | 2 +-
.../src/test/java/org/apache/tiles/TestDefinition.java | 2 +-
.../java/org/apache/tiles/TilesContainerWrapperTest.java | 2 +-
.../src/test/java/org/apache/tiles/TilesExceptionTest.java | 2 +-
.../test/java/org/apache/tiles/access/TilesAccessTest.java | 2 +-
.../org/apache/tiles/preparer/PreparerExceptionTest.java | 2 +-
src/tiles-compat/pom.xml | 4 ++--
.../src/main/java/org/apache/tiles/beans/MenuItem.java | 2 +-
.../src/main/java/org/apache/tiles/beans/SimpleMenuItem.java | 2 +-
.../digester/CompatibilityDigesterDefinitionsReader.java | 2 +-
.../tiles/compat/preparer/CompatibilityPreparerFactory.java | 2 +-
.../java/org/apache/tiles/compat/preparer/UrlPreparer.java | 2 +-
.../test/java/org/apache/tiles/beans/SimpleMenuItemTest.java | 2 +-
.../digester/TestCompatibilityDigesterDefinitionsReader.java | 2 +-
.../compat/preparer/CompatibilityPreparerFactoryTest.java | 2 +-
.../org/apache/tiles/compat/preparer/UrlPreparerTest.java | 2 +-
src/tiles-core/pom.xml | 4 ++--
.../java/org/apache/tiles/awareness/TilesContainerAware.java | 2 +-
.../org/apache/tiles/context/TilesRequestContextHolder.java | 2 +-
.../java/org/apache/tiles/definition/DefinitionsFactory.java | 2 +-
.../apache/tiles/definition/DefinitionsFactoryException.java | 2 +-
.../java/org/apache/tiles/definition/DefinitionsReader.java | 2 +-
.../apache/tiles/definition/FactoryNotFoundException.java | 2 +-
.../apache/tiles/definition/LocaleDefinitionsFactory.java | 2 +-
.../apache/tiles/definition/NoSuchDefinitionException.java | 2 +-
.../java/org/apache/tiles/definition/RefreshMonitor.java | 2 +-
.../definition/UnresolvingLocaleDefinitionsFactory.java | 2 +-
.../tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java | 2 +-
.../tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java | 9 +++++++--
.../java/org/apache/tiles/definition/dao/DefinitionDAO.java | 2 +-
.../apache/tiles/definition/dao/LocaleUrlDefinitionDAO.java | 2 +-
.../definition/dao/ResolvingLocaleUrlDefinitionDAO.java | 2 +-
.../tiles/definition/digester/DigesterDefinitionsReader.java | 2 +-
.../digester/DigesterDefinitionsReaderException.java | 2 +-
.../pattern/AbstractPatternDefinitionResolver.java | 2 +-
.../definition/pattern/BasicPatternDefinitionResolver.java | 2 +-
.../tiles/definition/pattern/DefinitionPatternMatcher.java | 2 +-
.../definition/pattern/DefinitionPatternMatcherFactory.java | 2 +-
.../tiles/definition/pattern/PatternDefinitionResolver.java | 2 +-
.../definition/pattern/PatternDefinitionResolverAware.java | 2 +-
.../apache/tiles/definition/pattern/PatternRecognizer.java | 2 +-
.../org/apache/tiles/definition/pattern/PatternUtil.java | 2 +-
.../pattern/PrefixedPatternDefinitionResolver.java | 2 +-
.../pattern/regexp/RegexpDefinitionPatternMatcher.java | 2 +-
.../regexp/RegexpDefinitionPatternMatcherFactory.java | 2 +-
.../pattern/wildcard/WildcardDefinitionPatternMatcher.java | 2 +-
.../wildcard/WildcardDefinitionPatternMatcherFactory.java | 2 +-
.../apache/tiles/evaluator/AbstractAttributeEvaluator.java | 2 +-
.../java/org/apache/tiles/evaluator/AttributeEvaluator.java | 2 +-
.../apache/tiles/evaluator/AttributeEvaluatorFactory.java | 2 +-
.../tiles/evaluator/AttributeEvaluatorFactoryAware.java | 2 +-
.../tiles/evaluator/BasicAttributeEvaluatorFactory.java | 2 +-
.../java/org/apache/tiles/evaluator/EvaluationException.java | 2 +-
.../tiles/evaluator/impl/DirectAttributeEvaluator.java | 2 +-
.../apache/tiles/factory/AbstractTilesContainerFactory.java | 2 +-
.../org/apache/tiles/factory/BasicTilesContainerFactory.java | 2 +-
.../apache/tiles/factory/TilesContainerFactoryException.java | 2 +-
.../main/java/org/apache/tiles/impl/BasicTilesContainer.java | 2 +-
.../java/org/apache/tiles/impl/InvalidTemplateException.java | 2 +-
.../org/apache/tiles/impl/mgmt/CachingTilesContainer.java | 2 +-
.../main/java/org/apache/tiles/locale/LocaleResolver.java | 2 +-
.../org/apache/tiles/locale/impl/DefaultLocaleResolver.java | 2 +-
.../apache/tiles/preparer/factory/BasicPreparerFactory.java | 2 +-
.../tiles/preparer/factory/NoSuchPreparerException.java | 2 +-
.../org/apache/tiles/preparer/factory/PreparerFactory.java | 2 +-
.../java/org/apache/tiles/renderer/DefinitionRenderer.java | 2 +-
.../org/apache/tiles/startup/AbstractTilesInitializer.java | 2 +-
.../org/apache/tiles/startup/DefaultTilesInitializer.java | 2 +-
.../main/java/org/apache/tiles/startup/TilesInitializer.java | 2 +-
.../main/java/org/apache/tiles/util/CombinedBeanInfo.java | 2 +-
.../src/main/java/org/apache/tiles/util/WildcardHelper.java | 2 +-
.../apache/tiles/context/TilesRequestContextHolderTest.java | 2 +-
.../tiles/definition/DefinitionsFactoryExceptionTest.java | 2 +-
.../tiles/definition/FactoryNotFoundExceptitonTest.java | 2 +-
.../tiles/definition/LocaleDefinitionsFactoryTest.java | 2 +-
.../org/apache/tiles/definition/MockDefinitionsReader.java | 2 +-
.../tiles/definition/NoSuchDefinitionExceptionTest.java | 2 +-
.../definition/UnresolvingLocaleDefinitionsFactoryTest.java | 2 +-
.../tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java | 2 +-
.../definition/dao/CachingLocaleUrlDefinitionDAOTest.java | 2 +-
.../tiles/definition/dao/LocaleUrlDefinitionDAOTest.java | 2 +-
.../definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java | 2 +-
.../digester/DigesterDefinitionsReaderExceptionTest.java | 2 +-
.../definition/digester/TestDigesterDefinitionsReader.java | 2 +-
.../pattern/AbstractPatternDefinitionResolverTest.java | 2 +-
.../pattern/BasicPatternDefinitionResolverTest.java | 2 +-
.../org/apache/tiles/definition/pattern/PatternUtilTest.java | 2 +-
.../pattern/PrefixedPatternDefinitionResolverTest.java | 2 +-
.../regexp/RegexpDefinitionPatternMatcherFactoryTest.java | 2 +-
.../pattern/regexp/RegexpDefinitionPatternMatcherTest.java | 2 +-
.../WildcardDefinitionPatternMatcherFactoryTest.java | 2 +-
.../wildcard/WildcardDefinitionPatternMatcherTest.java | 2 +-
.../tiles/evaluator/BasicAttributeEvaluatorFactoryTest.java | 2 +-
.../org/apache/tiles/evaluator/EvaluatorExceptionTest.java | 2 +-
.../tiles/evaluator/impl/DirectAttributeEvaluatorTest.java | 2 +-
.../apache/tiles/factory/BasicTilesContainerFactoryTest.java | 2 +-
.../tiles/factory/TilesContainerFactoryExceptionTest.java | 2 +-
.../java/org/apache/tiles/impl/BasicTilesContainerTest.java | 2 +-
.../org/apache/tiles/impl/BasicTilesContainerUnitTest.java | 2 +-
.../org/apache/tiles/impl/CannotRenderExceptionTest.java | 2 +-
.../org/apache/tiles/impl/InvalidTemplateExceptionTest.java | 2 +-
.../apache/tiles/impl/mgmt/CachingTilesContainerTest.java | 2 +-
.../apache/tiles/locale/impl/DefaultLocaleResolverTest.java | 2 +-
.../tiles/preparer/factory/BasicPreparerFactoryTest.java | 4 ++--
.../tiles/preparer/factory/NoSuchPreparerExceptionTest.java | 2 +-
.../org/apache/tiles/renderer/DefinitionRendererTest.java | 2 +-
.../apache/tiles/startup/AbstractTilesInitializerTest.java | 2 +-
.../apache/tiles/startup/DefaultTilesInitializerTest.java | 2 +-
.../java/org/apache/tiles/util/CombinedBeanInfoTest.java | 2 +-
.../java/org/apache/tiles/util/RollingVectorEnumeration.java | 2 +-
src/tiles-el/pom.xml | 4 ++--
.../main/java/org/apache/tiles/el/ELAttributeEvaluator.java | 2 +-
.../java/org/apache/tiles/el/ExpressionFactoryFactory.java | 2 +-
.../org/apache/tiles/el/JspExpressionFactoryFactory.java | 2 +-
.../src/main/java/org/apache/tiles/el/ScopeELResolver.java | 2 +-
.../java/org/apache/tiles/el/TilesContextBeanELResolver.java | 2 +-
.../java/org/apache/tiles/el/TilesContextELResolver.java | 2 +-
.../java/org/apache/tiles/el/ELAttributeEvaluatorTest.java | 2 +-
.../src/test/java/org/apache/tiles/el/ELContextImplTest.java | 2 +-
.../org/apache/tiles/el/JspExpressionFactoryFactoryTest.java | 2 +-
.../test/java/org/apache/tiles/el/ScopeELResolverTest.java | 2 +-
.../org/apache/tiles/el/TilesContextBeanELResolverTest.java | 2 +-
.../java/org/apache/tiles/el/TilesContextELResolverTest.java | 2 +-
src/tiles-extras/pom.xml | 4 ++--
.../complete/CompleteAutoloadTilesContainerFactory.java | 2 +-
.../extras/complete/CompleteAutoloadTilesInitializer.java | 2 +-
.../tiles/extras/complete/CompleteAutoloadTilesListener.java | 2 +-
.../apache/tiles/extras/module/ModularTilesInitializer.java | 2 +-
.../org/apache/tiles/extras/module/ModularTilesListener.java | 2 +-
.../complete/CompleteAutoloadTilesContainerFactoryTest.java | 2 +-
.../complete/CompleteAutoloadTilesInitializerTest.java | 2 +-
.../extras/complete/CompleteAutoloadTilesListenerTest.java | 2 +-
.../tiles/extras/module/ModularTilesInitializerTest.java | 6 +++---
.../apache/tiles/extras/module/ModularTilesListenerTest.java | 2 +-
src/tiles-freemarker/pom.xml | 4 ++--
.../apache/tiles/freemarker/TilesSharedVariableFactory.java | 2 +-
.../tiles/freemarker/TilesSharedVariableFactoryTest.java | 2 +-
src/tiles-jsp/pom.xml | 4 ++--
.../java/org/apache/tiles/jsp/taglib/UseAttributeTag.java | 2 +-
.../org/apache/tiles/jsp/taglib/UseAttributeTagTest.java | 2 +-
src/tiles-mvel/pom.xml | 4 ++--
.../java/org/apache/tiles/mvel/MVELAttributeEvaluator.java | 2 +-
.../apache/tiles/mvel/ReadOnlyVariableResolverFactory.java | 4 ++--
.../org/apache/tiles/mvel/ScopeVariableResolverFactory.java | 4 ++--
.../tiles/mvel/TilesContextBeanVariableResolverFactory.java | 4 ++--
.../tiles/mvel/TilesContextVariableResolverFactory.java | 6 +++---
.../org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java | 2 +-
.../tiles/mvel/ReadOnlyVariableResolverFactoryTest.java | 2 +-
.../org/apache/tiles/mvel/ReadOnlyVariableResolverTest.java | 2 +-
.../apache/tiles/mvel/ScopeVariableResolverFactoryTest.java | 2 +-
.../mvel/TilesContextBeanVariableResolverFactoryTest.java | 2 +-
.../tiles/mvel/TilesContextVariableResolverFactoryTest.java | 2 +-
src/tiles-ognl/pom.xml | 4 ++--
.../java/org/apache/tiles/ognl/AnyScopePropertyAccessor.java | 2 +-
.../java/org/apache/tiles/ognl/DelegatePropertyAccessor.java | 2 +-
.../tiles/ognl/NestedObjectDelegatePropertyAccessor.java | 2 +-
.../java/org/apache/tiles/ognl/NestedObjectExtractor.java | 2 +-
.../java/org/apache/tiles/ognl/OGNLAttributeEvaluator.java | 2 +-
.../apache/tiles/ognl/PropertyAccessorDelegateFactory.java | 2 +-
.../java/org/apache/tiles/ognl/ScopePropertyAccessor.java | 2 +-
.../ognl/TilesApplicationContextNestedObjectExtractor.java | 2 +-
.../ognl/TilesContextPropertyAccessorDelegateFactory.java | 2 +-
.../org/apache/tiles/ognl/AnyScopePropertyAccessorTest.java | 2 +-
.../org/apache/tiles/ognl/DelegatePropertyAccessorTest.java | 2 +-
.../tiles/ognl/NestedObjectDelegatePropertyAccessorTest.java | 2 +-
.../org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java | 2 +-
.../org/apache/tiles/ognl/ScopePropertyAccessorTest.java | 2 +-
.../TilesApplicationContextNestedObjectExtractorTest.java | 2 +-
.../TilesContextPropertyAccessorDelegateFactoryTest.java | 2 +-
src/tiles-servlet/pom.xml | 4 ++--
.../tiles/web/startup/AbstractTilesInitializerServlet.java | 2 +-
.../org/apache/tiles/web/startup/AbstractTilesListener.java | 2 +-
.../web/startup/simple/SimpleTilesInitializerServlet.java | 2 +-
.../apache/tiles/web/startup/simple/SimpleTilesListener.java | 2 +-
.../org/apache/tiles/web/util/AttributeContextMutator.java | 2 +-
.../org/apache/tiles/web/util/ServletContextAdapter.java | 2 +-
.../web/startup/AbstractTilesInitializerServletTest.java | 2 +-
.../apache/tiles/web/startup/AbstractTilesListenerTest.java | 2 +-
.../startup/simple/SimpleTilesInitializerServletTest.java | 2 +-
.../tiles/web/startup/simple/SimpleTilesListenerTest.java | 2 +-
.../org/apache/tiles/web/util/ServletContextAdapterTest.java | 2 +-
.../org/apache/tiles/web/util/TilesDecorationFilterTest.java | 2 +-
src/tiles-template/pom.xml | 4 ++--
.../java/org/apache/tiles/template/AddAttributeModel.java | 2 +-
.../org/apache/tiles/template/AddListAttributeModel.java | 2 +-
.../java/org/apache/tiles/template/AttributeResolver.java | 2 +-
.../java/org/apache/tiles/template/ComposeStackUtil.java | 2 +-
.../org/apache/tiles/template/DefaultAttributeResolver.java | 2 +-
.../main/java/org/apache/tiles/template/DefinitionModel.java | 2 +-
.../java/org/apache/tiles/template/GetAsStringModel.java | 2 +-
.../java/org/apache/tiles/template/ImportAttributeModel.java | 2 +-
.../java/org/apache/tiles/template/InsertAttributeModel.java | 2 +-
.../org/apache/tiles/template/InsertDefinitionModel.java | 2 +-
.../java/org/apache/tiles/template/InsertTemplateModel.java | 2 +-
.../org/apache/tiles/template/NoSuchAttributeException.java | 2 +-
.../java/org/apache/tiles/template/PutAttributeModel.java | 2 +-
.../org/apache/tiles/template/PutListAttributeModel.java | 2 +-
.../org/apache/tiles/template/SetCurrentContainerModel.java | 2 +-
.../org/apache/tiles/template/AddAttributeModelTest.java | 2 +-
.../org/apache/tiles/template/AddListAttributeModelTest.java | 2 +-
.../java/org/apache/tiles/template/ComposeStackUtilTest.java | 2 +-
.../apache/tiles/template/DefaultAttributeResolverTest.java | 2 +-
.../java/org/apache/tiles/template/DefinitionModelTest.java | 2 +-
.../java/org/apache/tiles/template/GetAsStringModelTest.java | 2 +-
.../org/apache/tiles/template/ImportAttributeModelTest.java | 2 +-
.../org/apache/tiles/template/InsertAttributeModelTest.java | 2 +-
.../org/apache/tiles/template/InsertDefinitionModelTest.java | 2 +-
.../org/apache/tiles/template/InsertTemplateModelTest.java | 2 +-
.../org/apache/tiles/template/PutAttributeModelTest.java | 2 +-
.../org/apache/tiles/template/PutListAttributeModelTest.java | 2 +-
.../apache/tiles/template/SetCurrentContainerModelTest.java | 2 +-
src/tiles-velocity/pom.xml | 4 ++--
.../org/apache/tiles/velocity/TilesVelocityException.java | 2 +-
.../velocity/template/AbstractDefaultToStringRenderable.java | 2 +-
.../org/apache/tiles/velocity/template/ContextHolder.java | 2 +-
.../tiles/velocity/template/VelocityStyleTilesTool.java | 2 +-
.../apache/tiles/velocity/TilesVelocityExceptionTest.java | 2 +-
.../tiles/velocity/template/VelocityStyleTilesToolTest.java | 2 +-
243 files changed, 281 insertions(+), 276 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/tiles.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
