This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch issue/SLING-13077
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
omit 18e56fb SLING-13077 - ExportServlet cannot adapt model to javax
SlingHttpServletRequest when running in a Jakarta Servlet environment
add 8b36900 SLING-13050 Include Integration Tests (Single POM) (#75)
add 0b55bb6 SLING-13079 publish test artifact (#79)
add 7984032 use johnzon directly as testing dependency
add a0f79ab SLING-13079 add jakarta variants for fake request/response
add a66ff09 SLING-13077 - ExportServlet cannot adapt model to javax
SlingHttpServletRequest when running in a Jakarta Servlet environment
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (18e56fb)
\
N -- N -- N refs/heads/issue/SLING-13077 (a66ff09)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
pom.xml | 342 +++++++++++++-
src/test/it-features/it-launcher-repoinit.txt | 23 +
src/test/it-features/it-launcher.json | 30 ++
.../customizers/SM_TeleporterCustomizer.java | 60 +++
.../sling/models/impl/OptionalObjectsTest.java | 2 +-
.../apache/sling/models/it/GenerateTestBundle.java | 98 ++++
.../delegate/request/DelegateBaseModel.java} | 27 +-
.../delegate/request/DelegateExtendedModel.java} | 26 +-
.../delegate/request/DelegateInterface.java} | 9 +-
.../delegate/resource/DelegateBaseModel.java} | 20 +-
.../delegate/resource/DelegateExtendedModel.java} | 27 +-
.../delegate/resource/DelegateInterface.java} | 9 +-
.../delegate/viaoriginalresource/A.java} | 4 +-
.../delegate/viaoriginalresource/A1.java} | 4 +-
.../delegate/viaoriginalresource/B.java} | 4 +-
.../delegate/viaoriginalresource/B1.java} | 4 +-
.../viaoriginalresource/models/A1Impl.java} | 29 +-
.../viaoriginalresource/models/AImpl.java} | 27 +-
.../viaoriginalresource/models/B1Impl.java} | 28 +-
.../viaoriginalresource/models/BImpl.java} | 21 +-
.../CustomLastImplementationPicker.java} | 30 +-
.../models/ConstructorInjectionTestModel.java} | 37 +-
.../models/FieldInjectionTestModel.java} | 37 +-
.../models/InterfaceInjectionTestModel.java} | 17 +-
.../models/JakartaRequestSelfModel.java} | 9 +-
.../models/JakartaRequestSelfModelImpl.java} | 6 +-
.../models/ModelWithOptionalImport.java} | 24 +-
.../testbundle/models/RequestSelfModel.java} | 9 +-
.../testbundle/models/RequestSelfModelImpl.java} | 12 +-
.../testbundle/models/SelfModel.java} | 15 +-
.../models/ServiceInjectionTestModel.java} | 39 +-
.../models/SlingPropertyAnnotationTestModel.java} | 15 +-
.../testbundle/models/SourceObject.java} | 19 +-
.../classes => it/testbundle/models}/ViaModel.java | 11 +-
.../implextend/ExtendsClassPropertyModel.java | 4 +-
.../ImplementsInterfacePropertyModel.java | 5 +-
.../ImplementsInterfacePropertyModel2.java | 7 +-
.../InvalidImplementsInterfacePropertyModel.java | 7 +-
.../implextend/InvalidSampleServiceInterface.java | 2 +-
.../models}/implextend/SampleServiceInterface.java | 2 +-
.../models}/implextend/SimplePropertyModel.java | 9 +-
.../testbundle/rtbound/BaseComponent.java} | 34 +-
.../testbundle/rtbound/ExtendedComponent.java} | 35 +-
.../testbundle/rtbound/FromRequestComponent.java} | 16 +-
.../testbundle/rtboundpicker/BaseComponent.java} | 14 +-
.../testbundle/rtboundpicker/SubRTComponent.java} | 14 +-
.../testbundle/rtboundpicker/TestComponent.java} | 7 +-
.../AnotherTestBindingsValuesProvider.java} | 22 +-
.../testbundle/services/SimpleService.java} | 6 +-
.../services/SimpleServiceWithCustomRanking.java} | 15 +-
.../services/TestBindingsValuesProvider.java} | 22 +-
.../testbundle/services/TestResourceDecorator.java | 67 +++
.../servlets/PathBoundJakartaServlet.java | 46 ++
.../it/testbundle/servlets/PathBoundServlet.java | 46 ++
.../sling/models/it/testing/DecoratedIT.java | 96 ++++
.../models/it/testing/ImplementsExtendsIT.java | 150 +++++++
.../it/testing/InjectorSpecificAnnotationIT.java | 72 +++
.../models/it/testing/ModelFactorySimpleIT.java | 130 ++++++
.../models/it/testing/PathBoundServletIT.java | 65 +++
.../ServiceInjectionWithDifferentRankingIT.java | 146 ++++++
.../apache/sling/models/it/testing/SimpleIT.java | 111 +++++
.../org/apache/sling/models/it/testing/ViaIT.java | 77 ++++
.../it/testing/delegate/DelegateRequestIT.java | 114 +++++
.../it/testing/delegate/DelegateResourceIT.java | 105 +++++
.../ViaOriginalResourceDelegationIT.java | 139 ++++++
.../models/it/testing/helper/FakeRequest.java | 401 +++++++++++++++++
.../models/it/testing/helper/FakeResponse.java | 192 ++++++++
.../it/testing/helper/JakartaFakeRequest.java | 407 +++++++++++++++++
.../it/testing/helper/JakartaFakeResponse.java | 180 ++++++++
.../models/it/testing/rtbound/FakeRequest.java | 499 +++++++++++++++++++++
.../it/testing/rtbound/ResourceTypeBindingIT.java | 146 ++++++
.../rtboundpicker/ResourceTypePickerIT.java | 91 ++++
.../org/apache/sling/models/it/noclasses/foo.txt | 1 +
73 files changed, 4232 insertions(+), 344 deletions(-)
create mode 100644 src/test/it-features/it-launcher-repoinit.txt
create mode 100644 src/test/it-features/it-launcher.json
create mode 100644
src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java
create mode 100644
src/test/java/org/apache/sling/models/it/GenerateTestBundle.java
copy src/test/java/org/apache/sling/models/{testmodels/classes/ViaModel.java
=> it/testbundle/delegate/request/DelegateBaseModel.java} (63%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/IndirectCyclicSelfDependencyModelB.java
=> it/testbundle/delegate/request/DelegateExtendedModel.java} (57%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/AdapterType1.java
=> it/testbundle/delegate/request/DelegateInterface.java} (84%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/ArrayWrappersModel.java
=> it/testbundle/delegate/resource/DelegateBaseModel.java} (69%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/ChildResourceViaModel.java
=> it/testbundle/delegate/resource/DelegateExtendedModel.java} (59%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/annotations/Hidden.java
=> it/testbundle/delegate/resource/DelegateInterface.java} (84%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/AdapterType2.java
=> it/testbundle/delegate/viaoriginalresource/A.java} (89%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/AdapterType2.java
=> it/testbundle/delegate/viaoriginalresource/A1.java} (88%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/AdapterType2.java
=> it/testbundle/delegate/viaoriginalresource/B.java} (89%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/AdapterType2.java
=> it/testbundle/delegate/viaoriginalresource/B1.java} (88%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/ChildResourceViaModel.java
=> it/testbundle/delegate/viaoriginalresource/models/A1Impl.java} (53%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/ChildResourceViaModel.java
=> it/testbundle/delegate/viaoriginalresource/models/AImpl.java} (57%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/ChildResourceViaModel.java
=> it/testbundle/delegate/viaoriginalresource/models/B1Impl.java} (56%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/CachedModel.java =>
it/testbundle/delegate/viaoriginalresource/models/BImpl.java} (69%)
copy
src/{main/java/org/apache/sling/models/impl/FirstImplementationPicker.java =>
test/java/org/apache/sling/models/it/testbundle/implpicker/CustomLastImplementationPicker.java}
(51%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/ChildResourceModel.java
=> it/testbundle/models/ConstructorInjectionTestModel.java} (56%)
copy src/test/java/org/apache/sling/models/{testmodels/classes/ListModel.java
=> it/testbundle/models/FieldInjectionTestModel.java} (62%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/ListOSGiModel.java =>
it/testbundle/models/InterfaceInjectionTestModel.java} (76%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/AdapterType2.java
=> it/testbundle/models/JakartaRequestSelfModel.java} (79%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/SelfDependencyModelB.java
=> it/testbundle/models/JakartaRequestSelfModelImpl.java} (83%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/ArrayPrimitivesModel.java
=> it/testbundle/models/ModelWithOptionalImport.java} (72%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/AdapterType1.java
=> it/testbundle/models/RequestSelfModel.java} (81%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/SelfDependencyModelB.java
=> it/testbundle/models/RequestSelfModelImpl.java} (73%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/FailingPostConstructModel.java
=> it/testbundle/models/SelfModel.java} (79%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/ChildResourceModel.java
=> it/testbundle/models/ServiceInjectionTestModel.java} (54%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/FalsePostConstructModel.java
=> it/testbundle/models/SlingPropertyAnnotationTestModel.java} (76%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/ChildResourceModel.java
=> it/testbundle/models/SourceObject.java} (76%)
copy src/test/java/org/apache/sling/models/{testmodels/classes =>
it/testbundle/models}/ViaModel.java (78%)
copy src/test/java/org/apache/sling/models/{testmodels/classes =>
it/testbundle/models}/implextend/ExtendsClassPropertyModel.java (90%)
copy src/test/java/org/apache/sling/models/{testmodels/classes =>
it/testbundle/models}/implextend/ImplementsInterfacePropertyModel.java (90%)
copy src/test/java/org/apache/sling/models/{testmodels/classes =>
it/testbundle/models}/implextend/ImplementsInterfacePropertyModel2.java (90%)
copy src/test/java/org/apache/sling/models/{testmodels/classes =>
it/testbundle/models}/implextend/InvalidImplementsInterfacePropertyModel.java
(90%)
copy src/test/java/org/apache/sling/models/{testmodels/classes =>
it/testbundle/models}/implextend/InvalidSampleServiceInterface.java (94%)
copy src/test/java/org/apache/sling/models/{testmodels/classes =>
it/testbundle/models}/implextend/SampleServiceInterface.java (94%)
copy src/test/java/org/apache/sling/models/{testmodels/classes =>
it/testbundle/models}/implextend/SimplePropertyModel.java (84%)
copy src/test/java/org/apache/sling/models/{testmodels/classes/ListModel.java
=> it/testbundle/rtbound/BaseComponent.java} (63%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/CollectionDefaultsModel.java
=> it/testbundle/rtbound/ExtendedComponent.java} (61%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/ChildModel.java =>
it/testbundle/rtbound/FromRequestComponent.java} (77%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/FalsePostConstructModel.java
=> it/testbundle/rtboundpicker/BaseComponent.java} (75%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/FalsePostConstructModel.java
=> it/testbundle/rtboundpicker/SubRTComponent.java} (75%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/AdapterType1.java
=> it/testbundle/rtboundpicker/TestComponent.java} (86%)
copy
src/{main/java/org/apache/sling/models/impl/MapBackedInvocationHandler.java =>
test/java/org/apache/sling/models/it/testbundle/services/AnotherTestBindingsValuesProvider.java}
(60%)
copy
src/test/java/org/apache/sling/models/{testmodels/interfaces/AdapterType2.java
=> it/testbundle/services/SimpleService.java} (87%)
copy
src/test/java/org/apache/sling/models/{testmodels/classes/implextend/EvenSimplerPropertyModel.java
=> it/testbundle/services/SimpleServiceWithCustomRanking.java} (72%)
copy
src/{main/java/org/apache/sling/models/impl/MapBackedInvocationHandler.java =>
test/java/org/apache/sling/models/it/testbundle/services/TestBindingsValuesProvider.java}
(61%)
create mode 100644
src/test/java/org/apache/sling/models/it/testbundle/services/TestResourceDecorator.java
create mode 100644
src/test/java/org/apache/sling/models/it/testbundle/servlets/PathBoundJakartaServlet.java
create mode 100644
src/test/java/org/apache/sling/models/it/testbundle/servlets/PathBoundServlet.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/DecoratedIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/ImplementsExtendsIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/InjectorSpecificAnnotationIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/ModelFactorySimpleIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/PathBoundServletIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/ServiceInjectionWithDifferentRankingIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/SimpleIT.java
create mode 100644 src/test/java/org/apache/sling/models/it/testing/ViaIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/delegate/DelegateRequestIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/delegate/DelegateResourceIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/helper/FakeRequest.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/helper/FakeResponse.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/helper/JakartaFakeRequest.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/helper/JakartaFakeResponse.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/rtbound/FakeRequest.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/rtbound/ResourceTypeBindingIT.java
create mode 100644
src/test/java/org/apache/sling/models/it/testing/rtboundpicker/ResourceTypePickerIT.java
create mode 100644
src/test/resources/org/apache/sling/models/it/noclasses/foo.txt
