Merge branch 'SLING-7015'
authorJustin Edelson <justin@apache.org>
Thu, 20 Jul 2017 15:14:15 +0000 (15:14 +0000)
committerJustin Edelson <justin@apache.org>
Thu, 20 Jul 2017 15:14:15 +0000 (15:14 +0000)
commitd3313cc16dc1dec1a82e58644725c11b1b987563
tree351fa21449e5d880825c25f90e816df1110e1bb9
parentdbe0d5302e6ac51b8be71a0e8e6ed9f0f1bc2365
Merge branch 'SLING-7015'

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1802505 13f79535-47bb-0310-9956-ffa450edef68
pom.xml
src/main/java/org/apache/sling/models/impl/ExportServlet.java
src/main/java/org/apache/sling/models/impl/ExporterScriptEngineFactory.java [deleted file]
src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
src/main/java/org/apache/sling/models/impl/ModelPackageBundleListener.java
src/main/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapper.java [new file with mode: 0644]
src/main/java/org/apache/sling/models/impl/SlingModelsScriptEngineFactory.java [new file with mode: 0644]
src/test/java/org/apache/sling/models/impl/RequestWrapperTest.java [new file with mode: 0644]
src/test/java/org/apache/sling/models/impl/StaticInjectionAPFLoadOrderTest.java