Merge branch 'beanmodel-split'
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/325f5b6e Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/325f5b6e Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/325f5b6e Branch: refs/heads/master Commit: 325f5b6e7359d33ef927f2f38aee546f4c476647 Parents: 494b790 405a2f1 Author: Thiago H. de Paula Figueiredo <thiag...@apache.org> Authored: Sun Dec 21 17:55:21 2014 -0200 Committer: Thiago H. de Paula Figueiredo <thiag...@apache.org> Committed: Sun Dec 21 17:55:21 2014 -0200 ---------------------------------------------------------------------- beanmodel/.gitignore | 4 + beanmodel/build.gradle | 80 + .../internal/antlr/PropertyExpressionLexer.g | 163 ++ .../internal/antlr/PropertyExpressionParser.g | 105 ++ .../org/apache/tapestry5/PropertyConduit.java | 45 + .../org/apache/tapestry5/PropertyConduit2.java | 40 + .../apache/tapestry5/beaneditor/BeanModel.java | 169 ++ .../beaneditor/BeanModelSourceBuilder.java | 254 +++ .../tapestry5/beaneditor/PropertyModel.java | 97 ++ .../internal/InternalPropertyConduit.java | 37 + .../tapestry5/internal/antlr/BaseLexer.java | 54 + .../tapestry5/internal/antlr/BaseParser.java | 40 + .../tapestry5/internal/antlr/package-info.java | 18 + .../internal/beaneditor/BeanModelImpl.java | 289 ++++ .../internal/beaneditor/BeanModelUtils.java | 120 ++ .../internal/beaneditor/PropertyModelImpl.java | 139 ++ .../internal/services/BeanModelSourceImpl.java | 222 +++ .../CoercingPropertyConduitWrapper.java | 67 + .../tapestry5/internal/services/Invariant.java | 28 + .../services/LiteralPropertyConduit.java | 85 + .../services/PropertyConduitDelegate.java | 52 + .../services/PropertyConduitSourceImpl.java | 1565 ++++++++++++++++++ .../services/PropertyExpressionException.java | 38 + .../services/ClassPropertyAdapterImpl.java | 249 +++ .../services/PlasticClassListenerLogger.java | 47 + .../services/PlasticProxyFactoryImpl.java | 285 ++++ .../internal/services/PropertyAccessImpl.java | 217 +++ .../internal/services/PropertyAdapterImpl.java | 273 +++ .../tapestry5/services/BeanModelSource.java | 70 + .../services/PropertyConduitSource.java | 41 + commons/build.gradle | 19 + .../services/AnnotationDataTypeAnalyzer.java | 32 + .../services/DefaultDataTypeAnalyzer.java | 61 + .../internal/services/StringInterner.java | 43 + .../internal/services/StringInternerImpl.java | 54 + .../tapestry5/internal/util/IntegerRange.java | 125 ++ .../tapestry5/internal/util/MultiKey.java | 86 + .../tapestry5/ioc/AnnotationProvider.java | 33 + .../org/apache/tapestry5/ioc/Configuration.java | 53 + .../org/apache/tapestry5/ioc/Locatable.java | 27 + .../java/org/apache/tapestry5/ioc/Location.java | 38 + .../tapestry5/ioc/MappedConfiguration.java | 81 + .../apache/tapestry5/ioc/MessageFormatter.java | 32 + .../java/org/apache/tapestry5/ioc/Messages.java | 61 + .../org/apache/tapestry5/ioc/ObjectCreator.java | 27 + .../org/apache/tapestry5/ioc/ObjectLocator.java | 142 ++ .../tapestry5/ioc/OrderedConfiguration.java | 84 + .../java/org/apache/tapestry5/ioc/Resource.java | 108 ++ .../ioc/internal/BasicDataTypeAnalyzers.java | 138 ++ .../ioc/internal/BasicTypeCoercions.java | 342 ++++ .../ioc/internal/NullAnnotationProvider.java | 35 + .../AccessableObjectAnnotationProvider.java | 46 + .../services/AnnotationProviderChain.java | 59 + .../ioc/internal/services/CompoundCoercion.java | 54 + .../ioc/internal/services/ServiceMessages.java | 68 + .../ioc/internal/services/StringLocation.java | 65 + .../ioc/internal/services/TypeCoercerImpl.java | 508 ++++++ .../ioc/internal/util/CollectionFactory.java | 139 ++ .../ioc/internal/util/GenericsUtils.java | 615 +++++++ .../ioc/internal/util/InheritanceSearch.java | 159 ++ .../ioc/internal/util/InternalCommonsUtils.java | 388 +++++ .../ioc/internal/util/LockSupport.java | 89 + .../ioc/internal/util/MessageFormatterImpl.java | 65 + .../ioc/internal/util/MessagesImpl.java | 74 + .../ioc/internal/util/TapestryException.java | 75 + .../ioc/services/ClassPropertyAdapter.java | 79 + .../apache/tapestry5/ioc/services/Coercion.java | 31 + .../tapestry5/ioc/services/CoercionTuple.java | 145 ++ .../ioc/services/PlasticProxyFactory.java | 159 ++ .../tapestry5/ioc/services/PropertyAccess.java | 77 + .../tapestry5/ioc/services/PropertyAdapter.java | 121 ++ .../tapestry5/ioc/services/TypeCoercer.java | 88 + .../tapestry5/ioc/util/AbstractMessages.java | 94 ++ .../tapestry5/ioc/util/AvailableValues.java | 87 + .../tapestry5/ioc/util/CaseInsensitiveMap.java | 499 ++++++ .../tapestry5/ioc/util/ExceptionUtils.java | 115 ++ .../org/apache/tapestry5/ioc/util/Stack.java | 173 ++ .../tapestry5/ioc/util/StrategyRegistry.java | 172 ++ .../apache/tapestry5/ioc/util/TimeInterval.java | 195 +++ .../ioc/util/UnknownValueException.java | 47 + .../tapestry5/services/DataTypeAnalyzer.java | 48 + .../services/InvalidationEventHub.java | 60 + .../services/InvalidationListener.java | 33 + .../tapestry5/util/StringToEnumCoercion.java | 92 + settings.gradle | 2 +- tapestry-core/build.gradle | 43 +- .../internal/antlr/PropertyExpressionLexer.g | 163 -- .../internal/antlr/PropertyExpressionParser.g | 105 -- .../org/apache/tapestry5/PropertyConduit.java | 45 - .../org/apache/tapestry5/PropertyConduit2.java | 40 - .../apache/tapestry5/beaneditor/BeanModel.java | 169 -- .../tapestry5/beaneditor/PropertyModel.java | 97 -- .../internal/InternalPropertyConduit.java | 37 - .../internal/TapestryInternalUtils.java | 50 +- .../tapestry5/internal/antlr/BaseLexer.java | 54 - .../tapestry5/internal/antlr/BaseParser.java | 40 - .../tapestry5/internal/antlr/package-info.java | 18 - .../internal/beaneditor/BeanModelImpl.java | 289 ---- .../internal/beaneditor/BeanModelUtils.java | 119 -- .../internal/beaneditor/PropertyModelImpl.java | 139 -- .../internal/bindings/AbstractBinding.java | 2 +- .../internal/bindings/PropBinding.java | 8 +- .../services/AnnotationDataTypeAnalyzer.java | 32 - .../internal/services/BeanModelSourceImpl.java | 222 --- .../CoercingPropertyConduitWrapper.java | 67 - .../services/DefaultDataTypeAnalyzer.java | 61 - .../tapestry5/internal/services/Invariant.java | 28 - .../services/LiteralPropertyConduit.java | 85 - .../services/PropertyConduitDelegate.java | 53 - .../services/PropertyConduitSourceImpl.java | 1563 ----------------- .../services/PropertyExpressionException.java | 38 - .../internal/services/StringInterner.java | 43 - .../internal/services/StringInternerImpl.java | 53 - .../InternalComponentResourcesImpl.java | 4 +- .../tapestry5/internal/util/IntegerRange.java | 125 -- .../tapestry5/internal/util/MultiKey.java | 86 - .../tapestry5/modules/TapestryModule.java | 14 +- .../tapestry5/services/BeanModelSource.java | 70 - .../tapestry5/services/ComponentClasses.java | 35 - .../tapestry5/services/ComponentLayer.java | 37 - .../tapestry5/services/DataTypeAnalyzer.java | 48 - .../services/InvalidationEventHub.java | 60 - .../services/InvalidationListener.java | 33 - .../services/PropertyConduitSource.java | 41 - .../app1/components/GenericTypeDisplay.java | 34 +- .../integration/app1/pages/GenericTypeDemo.java | 24 +- .../pages/GridWithSubmitWithContextDemo.java | 4 +- .../integration/app2/base/ChildBasePage.java | 8 +- .../integration/app2/base/ParentBasePage.java | 2 +- .../pagelevel/OverrideMethodsTest.java | 14 +- .../AbstractBeanModelSourceImplTest.java | 757 +++++++++ .../services/BeanModelSourceBuilderTest.java | 33 + .../services/BeanModelSourceImplTest.java | 736 +------- .../services/PropertyConduitSourceImplTest.java | 34 +- tapestry-ioc/build.gradle | 1 + .../tapestry5/ioc/AnnotationProvider.java | 33 - .../org/apache/tapestry5/ioc/Configuration.java | 53 - .../org/apache/tapestry5/ioc/Locatable.java | 27 - .../java/org/apache/tapestry5/ioc/Location.java | 38 - .../tapestry5/ioc/MappedConfiguration.java | 81 - .../apache/tapestry5/ioc/MessageFormatter.java | 32 - .../java/org/apache/tapestry5/ioc/Messages.java | 61 - .../org/apache/tapestry5/ioc/ObjectCreator.java | 27 - .../org/apache/tapestry5/ioc/ObjectLocator.java | 143 -- .../tapestry5/ioc/OrderedConfiguration.java | 84 - .../java/org/apache/tapestry5/ioc/Resource.java | 108 -- .../ioc/annotations/IncompatibleChange.java | 33 - .../ioc/annotations/UsesConfiguration.java | 34 - .../annotations/UsesMappedConfiguration.java | 41 - .../annotations/UsesOrderedConfiguration.java | 33 - .../ioc/internal/NullAnnotationProvider.java | 35 - .../AccessableObjectAnnotationProvider.java | 46 - .../services/AnnotationProviderChain.java | 59 - .../services/ClassPropertyAdapterImpl.java | 250 --- .../ioc/internal/services/CompoundCoercion.java | 54 - .../services/PlasticClassListenerLogger.java | 47 - .../services/PlasticProxyFactoryImpl.java | 286 ---- .../internal/services/PropertyAccessImpl.java | 217 --- .../internal/services/PropertyAdapterImpl.java | 273 --- .../ioc/internal/services/ServiceMessages.java | 68 - .../ioc/internal/services/StringLocation.java | 65 - .../ioc/internal/services/TypeCoercerImpl.java | 508 ------ .../ioc/internal/util/CollectionFactory.java | 139 -- .../ioc/internal/util/GenericsUtils.java | 615 ------- .../ioc/internal/util/InheritanceSearch.java | 159 -- .../ioc/internal/util/InternalUtils.java | 230 +-- .../ioc/internal/util/LockSupport.java | 89 - .../ioc/internal/util/MessageFormatterImpl.java | 65 - .../ioc/internal/util/MessagesImpl.java | 74 - .../ioc/internal/util/TapestryException.java | 75 - .../ioc/modules/TapestryIOCModule.java | 297 +--- .../ioc/services/ClassPropertyAdapter.java | 79 - .../apache/tapestry5/ioc/services/Coercion.java | 31 - .../tapestry5/ioc/services/CoercionTuple.java | 145 -- .../ioc/services/PlasticProxyFactory.java | 159 -- .../tapestry5/ioc/services/PropertyAccess.java | 77 - .../tapestry5/ioc/services/PropertyAdapter.java | 121 -- .../tapestry5/ioc/services/TypeCoercer.java | 88 - .../tapestry5/ioc/util/AbstractMessages.java | 94 -- .../tapestry5/ioc/util/AvailableValues.java | 87 - .../tapestry5/ioc/util/CaseInsensitiveMap.java | 499 ------ .../tapestry5/ioc/util/ExceptionUtils.java | 115 -- .../org/apache/tapestry5/ioc/util/Stack.java | 173 -- .../tapestry5/ioc/util/StrategyRegistry.java | 172 -- .../apache/tapestry5/ioc/util/TimeInterval.java | 195 --- .../ioc/util/UnknownValueException.java | 47 - .../tapestry5/util/StringToEnumCoercion.java | 91 - .../org/apache/tapestry5/json/JSONArray.java | 2 +- .../org/apache/tapestry5/json/JSONObject.java | 2 +- tapestry5-annotations/build.gradle | 2 +- .../ioc/annotations/IncompatibleChange.java | 33 + .../ioc/annotations/UsesConfiguration.java | 34 + .../annotations/UsesMappedConfiguration.java | 41 + .../annotations/UsesOrderedConfiguration.java | 33 + .../tapestry5/services/ComponentClasses.java | 35 + .../tapestry5/services/ComponentLayer.java | 37 + 196 files changed, 12395 insertions(+), 11574 deletions(-) ----------------------------------------------------------------------