Merge branch 'via-resource-type-force'
authorJustin Edelson <justin@apache.org>
Thu, 20 Apr 2017 15:06:03 +0000 (15:06 +0000)
committerJustin Edelson <justin@apache.org>
Thu, 20 Apr 2017 15:06:03 +0000 (15:06 +0000)
commitf00710327e90ee9f1e3e8f85ca8289a7a17eb902
treedcba2bd07bd839ce8f0ad85af6f71650900b1318
parentc6813f7c36740a8e6fea43b2ba616ea0ee54b976
Merge branch 'via-resource-type-force'

# Conflicts:
# bundles/extensions/models/api/src/main/java/org/apache/sling/models/annotations/package-info.java

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1792071 13f79535-47bb-0310-9956-ffa450edef68
12 files changed:
src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
src/main/java/org/apache/sling/models/impl/ModelConfigurationPrinter.java
src/main/java/org/apache/sling/models/impl/model/AbstractInjectableElement.java
src/main/java/org/apache/sling/models/impl/model/InjectableElement.java
src/main/java/org/apache/sling/models/impl/via/AbstractResourceTypeViaProvider.java [new file with mode: 0644]
src/main/java/org/apache/sling/models/impl/via/BeanPropertyViaProvider.java [new file with mode: 0644]
src/main/java/org/apache/sling/models/impl/via/ChildResourceViaProvider.java [new file with mode: 0644]
src/main/java/org/apache/sling/models/impl/via/ForcedResourceTypeViaProvider.java [new file with mode: 0644]
src/main/java/org/apache/sling/models/impl/via/ResourceSuperTypeViaProvider.java [new file with mode: 0644]
src/test/java/org/apache/sling/models/impl/InjectorSpecificAnnotationTest.java
src/test/java/org/apache/sling/models/impl/ViaTest.java
src/test/java/org/apache/sling/models/testmodels/classes/ChildResourceViaModel.java [new file with mode: 0644]