This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-13050-integration-tests-single-pom in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git
commit 0e11be21d6a9bb641f1c55e8c58254c9a9cd20f4 Author: Stefan Seifert <[email protected]> AuthorDate: Fri Jan 23 11:59:17 2026 +0100 SLING-13050 rename IT packages --- .../sling/models/{testing => it}/DecoratedIT.java | 4 ++-- .../models/{testing => it}/ImplementsExtendsIT.java | 14 +++++++------- .../InjectorSpecificAnnotationIT.java | 4 ++-- .../{testing => it}/ModelFactorySimpleIT.java | 10 +++++----- .../models/{testing => it}/PathBoundServletIT.java | 6 +++--- .../ServiceInjectionWithDifferentRankingIT.java | 8 ++++---- .../sling/models/{testing => it}/SimpleIT.java | 8 ++++---- .../apache/sling/models/{testing => it}/ViaIT.java | 6 +++--- .../{testing => it}/delegate/DelegateRequestIT.java | 10 +++++----- .../delegate/DelegateResourceIT.java | 8 ++++---- .../ViaOriginalResourceDelegationIT.java | 14 +++++++------- .../models/{testing => it}/helper/FakeRequest.java | 2 +- .../models/{testing => it}/helper/FakeResponse.java | 2 +- .../apache/sling/models/it/models/package-info.java | 21 --------------------- .../models/{testing => it}/rtbound/FakeRequest.java | 2 +- .../rtbound/ResourceTypeBindingIT.java | 8 ++++---- .../sling/models/it/rtbound/package-info.java | 21 --------------------- .../rtboundpicker/ResourceTypePickerIT.java | 8 ++++---- .../sling/models/it/rtboundpicker/package-info.java | 21 --------------------- .../sling/models/it/services/package-info.java | 21 --------------------- .../delegate/request/DelegateBaseModel.java | 2 +- .../delegate/request/DelegateExtendedModel.java | 2 +- .../delegate/request}/DelegateInterface.java | 2 +- .../delegate/request}/package-info.java | 2 +- .../delegate/resource/DelegateBaseModel.java | 2 +- .../delegate/resource/DelegateExtendedModel.java | 2 +- .../delegate/resource}/DelegateInterface.java | 2 +- .../delegate/resource}/package-info.java | 2 +- .../delegate/viaoriginalresource/A.java | 2 +- .../delegate/viaoriginalresource/A1.java | 2 +- .../delegate/viaoriginalresource/B.java | 2 +- .../delegate/viaoriginalresource/B1.java | 2 +- .../delegate/viaoriginalresource/models/A1Impl.java | 8 ++++---- .../delegate/viaoriginalresource/models/AImpl.java | 6 +++--- .../delegate/viaoriginalresource/models/B1Impl.java | 6 +++--- .../delegate/viaoriginalresource/models/BImpl.java | 4 ++-- .../viaoriginalresource/models/package-info.java | 2 +- .../delegate/viaoriginalresource}/package-info.java | 2 +- .../implpicker/CustomLastImplementationPicker.java | 2 +- .../implpicker}/package-info.java | 2 +- .../models/ConstructorInjectionTestModel.java | 2 +- .../models/FieldInjectionTestModel.java | 2 +- .../models/InterfaceInjectionTestModel.java | 2 +- .../models/JakartaRequestSelfModel.java | 2 +- .../models/JakartaRequestSelfModelImpl.java | 2 +- .../models/ModelWithOptionalImport.java | 2 +- .../{ => testbundle}/models/RequestSelfModel.java | 2 +- .../models/RequestSelfModelImpl.java | 2 +- .../it/{ => testbundle}/models/SelfModel.java | 2 +- .../models/ServiceInjectionTestModel.java | 4 ++-- .../models/SlingPropertyAnnotationTestModel.java | 2 +- .../it/{ => testbundle}/models/SourceObject.java | 2 +- .../models/it/{ => testbundle}/models/ViaModel.java | 2 +- .../implextend/ExtendsClassPropertyModel.java | 2 +- .../ImplementsInterfacePropertyModel.java | 2 +- .../ImplementsInterfacePropertyModel2.java | 2 +- .../InvalidImplementsInterfacePropertyModel.java | 2 +- .../implextend/InvalidSampleServiceInterface.java | 2 +- .../models/implextend/SampleServiceInterface.java | 2 +- .../models/implextend/SimplePropertyModel.java | 2 +- .../models/implextend}/package-info.java | 2 +- .../models}/package-info.java | 2 +- .../it/{ => testbundle}/rtbound/BaseComponent.java | 2 +- .../{ => testbundle}/rtbound/ExtendedComponent.java | 2 +- .../rtbound/FromRequestComponent.java | 2 +- .../rtbound}/package-info.java | 2 +- .../rtboundpicker/BaseComponent.java | 2 +- .../rtboundpicker/SubRTComponent.java | 2 +- .../rtboundpicker/TestComponent.java | 2 +- .../rtboundpicker}/package-info.java | 2 +- .../services/AnotherTestBindingsValuesProvider.java | 2 +- .../it/{ => testbundle}/services/SimpleService.java | 2 +- .../services/SimpleServiceWithCustomRanking.java | 2 +- .../services/TestBindingsValuesProvider.java | 2 +- .../services/TestResourceDecorator.java | 2 +- .../services}/package-info.java | 2 +- .../servlets/PathBoundJakartaServlet.java | 4 ++-- .../{ => testbundle}/servlets/PathBoundServlet.java | 4 ++-- 78 files changed, 126 insertions(+), 210 deletions(-) diff --git a/src/test/java/org/apache/sling/models/testing/DecoratedIT.java b/src/test/java/org/apache/sling/models/it/DecoratedIT.java similarity index 97% rename from src/test/java/org/apache/sling/models/testing/DecoratedIT.java rename to src/test/java/org/apache/sling/models/it/DecoratedIT.java index 8c0a39b..4092ae0 100644 --- a/src/test/java/org/apache/sling/models/testing/DecoratedIT.java +++ b/src/test/java/org/apache/sling/models/it/DecoratedIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing; +package org.apache.sling.models.it; import javax.jcr.Node; import javax.jcr.Session; @@ -28,7 +28,7 @@ import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ResourceWrapper; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.models.factory.ModelFactory; -import org.apache.sling.models.it.models.SelfModel; +import org.apache.sling.models.it.testbundle.models.SelfModel; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java b/src/test/java/org/apache/sling/models/it/ImplementsExtendsIT.java similarity index 90% rename from src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java rename to src/test/java/org/apache/sling/models/it/ImplementsExtendsIT.java index cc42661..fb1e9bf 100644 --- a/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java +++ b/src/test/java/org/apache/sling/models/it/ImplementsExtendsIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing; +package org.apache.sling.models.it; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -28,12 +28,12 @@ import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.junit.rules.TeleporterRule; -import org.apache.sling.models.it.implpicker.CustomLastImplementationPicker; -import org.apache.sling.models.it.models.implextend.ImplementsInterfacePropertyModel; -import org.apache.sling.models.it.models.implextend.ImplementsInterfacePropertyModel2; -import org.apache.sling.models.it.models.implextend.InvalidSampleServiceInterface; -import org.apache.sling.models.it.models.implextend.SampleServiceInterface; -import org.apache.sling.models.it.models.implextend.SimplePropertyModel; +import org.apache.sling.models.it.testbundle.implpicker.CustomLastImplementationPicker; +import org.apache.sling.models.it.testbundle.models.implextend.ImplementsInterfacePropertyModel; +import org.apache.sling.models.it.testbundle.models.implextend.ImplementsInterfacePropertyModel2; +import org.apache.sling.models.it.testbundle.models.implextend.InvalidSampleServiceInterface; +import org.apache.sling.models.it.testbundle.models.implextend.SampleServiceInterface; +import org.apache.sling.models.it.testbundle.models.implextend.SimplePropertyModel; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java b/src/test/java/org/apache/sling/models/it/InjectorSpecificAnnotationIT.java similarity index 95% rename from src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java rename to src/test/java/org/apache/sling/models/it/InjectorSpecificAnnotationIT.java index 3764dbc..68cdd78 100644 --- a/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java +++ b/src/test/java/org/apache/sling/models/it/InjectorSpecificAnnotationIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing; +package org.apache.sling.models.it; import javax.jcr.Node; import javax.jcr.Session; @@ -26,7 +26,7 @@ import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.junit.rules.TeleporterRule; -import org.apache.sling.models.it.models.SlingPropertyAnnotationTestModel; +import org.apache.sling.models.it.testbundle.models.SlingPropertyAnnotationTestModel; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java b/src/test/java/org/apache/sling/models/it/ModelFactorySimpleIT.java similarity index 92% rename from src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java rename to src/test/java/org/apache/sling/models/it/ModelFactorySimpleIT.java index 5468113..7e4f05b 100644 --- a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java +++ b/src/test/java/org/apache/sling/models/it/ModelFactorySimpleIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing; +package org.apache.sling.models.it; import javax.jcr.Node; import javax.jcr.Session; @@ -27,10 +27,10 @@ import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.models.factory.ModelFactory; -import org.apache.sling.models.it.models.ConstructorInjectionTestModel; -import org.apache.sling.models.it.models.FieldInjectionTestModel; -import org.apache.sling.models.it.models.implextend.InvalidImplementsInterfacePropertyModel; -import org.apache.sling.models.it.models.implextend.SampleServiceInterface; +import org.apache.sling.models.it.testbundle.models.ConstructorInjectionTestModel; +import org.apache.sling.models.it.testbundle.models.FieldInjectionTestModel; +import org.apache.sling.models.it.testbundle.models.implextend.InvalidImplementsInterfacePropertyModel; +import org.apache.sling.models.it.testbundle.models.implextend.SampleServiceInterface; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java b/src/test/java/org/apache/sling/models/it/PathBoundServletIT.java similarity index 93% rename from src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java rename to src/test/java/org/apache/sling/models/it/PathBoundServletIT.java index bec53f8..5efef2d 100644 --- a/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java +++ b/src/test/java/org/apache/sling/models/it/PathBoundServletIT.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing; +package org.apache.sling.models.it; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.engine.SlingRequestProcessor; import org.apache.sling.junit.rules.TeleporterRule; -import org.apache.sling.models.testing.helper.FakeRequest; -import org.apache.sling.models.testing.helper.FakeResponse; +import org.apache.sling.models.it.helper.FakeRequest; +import org.apache.sling.models.it.helper.FakeResponse; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java b/src/test/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingIT.java similarity index 95% rename from src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java rename to src/test/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingIT.java index 7a9b1a0..29b4894 100644 --- a/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java +++ b/src/test/java/org/apache/sling/models/it/ServiceInjectionWithDifferentRankingIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing; +package org.apache.sling.models.it; import javax.jcr.Node; import javax.jcr.Session; @@ -34,9 +34,9 @@ import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.junit.Activator; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.models.factory.ModelFactory; -import org.apache.sling.models.it.models.ServiceInjectionTestModel; -import org.apache.sling.models.it.services.SimpleService; -import org.apache.sling.models.it.services.SimpleServiceWithCustomRanking; +import org.apache.sling.models.it.testbundle.models.ServiceInjectionTestModel; +import org.apache.sling.models.it.testbundle.services.SimpleService; +import org.apache.sling.models.it.testbundle.services.SimpleServiceWithCustomRanking; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/apache/sling/models/testing/SimpleIT.java b/src/test/java/org/apache/sling/models/it/SimpleIT.java similarity index 93% rename from src/test/java/org/apache/sling/models/testing/SimpleIT.java rename to src/test/java/org/apache/sling/models/it/SimpleIT.java index 7ab3c7f..2d94f18 100644 --- a/src/test/java/org/apache/sling/models/testing/SimpleIT.java +++ b/src/test/java/org/apache/sling/models/it/SimpleIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing; +package org.apache.sling.models.it; import javax.jcr.Node; import javax.jcr.Session; @@ -26,9 +26,9 @@ import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.junit.rules.TeleporterRule; -import org.apache.sling.models.it.models.ConstructorInjectionTestModel; -import org.apache.sling.models.it.models.FieldInjectionTestModel; -import org.apache.sling.models.it.models.InterfaceInjectionTestModel; +import org.apache.sling.models.it.testbundle.models.ConstructorInjectionTestModel; +import org.apache.sling.models.it.testbundle.models.FieldInjectionTestModel; +import org.apache.sling.models.it.testbundle.models.InterfaceInjectionTestModel; import org.junit.After; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/apache/sling/models/testing/ViaIT.java b/src/test/java/org/apache/sling/models/it/ViaIT.java similarity index 94% rename from src/test/java/org/apache/sling/models/testing/ViaIT.java rename to src/test/java/org/apache/sling/models/it/ViaIT.java index 07f973e..9db5d9f 100644 --- a/src/test/java/org/apache/sling/models/testing/ViaIT.java +++ b/src/test/java/org/apache/sling/models/it/ViaIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing; +package org.apache.sling.models.it; import javax.jcr.Node; import javax.jcr.Session; @@ -27,8 +27,8 @@ import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.junit.rules.TeleporterRule; -import org.apache.sling.models.it.models.SourceObject; -import org.apache.sling.models.it.models.ViaModel; +import org.apache.sling.models.it.testbundle.models.SourceObject; +import org.apache.sling.models.it.testbundle.models.ViaModel; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java b/src/test/java/org/apache/sling/models/it/delegate/DelegateRequestIT.java similarity index 93% rename from src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java rename to src/test/java/org/apache/sling/models/it/delegate/DelegateRequestIT.java index a6b494a..dd38d09 100644 --- a/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java +++ b/src/test/java/org/apache/sling/models/it/delegate/DelegateRequestIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing.delegate; +package org.apache.sling.models.it.delegate; import java.util.HashMap; import java.util.Map; @@ -30,10 +30,10 @@ import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.models.factory.ModelFactory; -import org.apache.sling.models.it.delegate.request.DelegateBaseModel; -import org.apache.sling.models.it.delegate.request.DelegateExtendedModel; -import org.apache.sling.models.it.delegate.request.DelegateInterface; -import org.apache.sling.models.testing.rtbound.FakeRequest; +import org.apache.sling.models.it.rtbound.FakeRequest; +import org.apache.sling.models.it.testbundle.delegate.request.DelegateBaseModel; +import org.apache.sling.models.it.testbundle.delegate.request.DelegateExtendedModel; +import org.apache.sling.models.it.testbundle.delegate.request.DelegateInterface; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java b/src/test/java/org/apache/sling/models/it/delegate/DelegateResourceIT.java similarity index 94% rename from src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java rename to src/test/java/org/apache/sling/models/it/delegate/DelegateResourceIT.java index 97f8094..0a0d21c 100644 --- a/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java +++ b/src/test/java/org/apache/sling/models/it/delegate/DelegateResourceIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing.delegate; +package org.apache.sling.models.it.delegate; import java.util.HashMap; import java.util.Map; @@ -29,9 +29,9 @@ import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.junit.rules.TeleporterRule; -import org.apache.sling.models.it.delegate.resource.DelegateBaseModel; -import org.apache.sling.models.it.delegate.resource.DelegateExtendedModel; -import org.apache.sling.models.it.delegate.resource.DelegateInterface; +import org.apache.sling.models.it.testbundle.delegate.resource.DelegateBaseModel; +import org.apache.sling.models.it.testbundle.delegate.resource.DelegateExtendedModel; +import org.apache.sling.models.it.testbundle.delegate.resource.DelegateInterface; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/models/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java b/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java similarity index 91% rename from src/test/java/org/apache/sling/models/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java rename to src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java index ee119b7..b4bd6bd 100644 --- a/src/test/java/org/apache/sling/models/testing/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java +++ b/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/ViaOriginalResourceDelegationIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing.delegate.viaoriginalresource; +package org.apache.sling.models.it.delegate.viaoriginalresource; import java.util.HashMap; import java.util.Map; @@ -29,12 +29,12 @@ import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.models.factory.ModelFactory; -import org.apache.sling.models.it.delegate.viaoriginalresource.A; -import org.apache.sling.models.it.delegate.viaoriginalresource.models.A1Impl; -import org.apache.sling.models.it.delegate.viaoriginalresource.models.AImpl; -import org.apache.sling.models.it.delegate.viaoriginalresource.models.B1Impl; -import org.apache.sling.models.it.delegate.viaoriginalresource.models.BImpl; -import org.apache.sling.models.testing.rtbound.FakeRequest; +import org.apache.sling.models.it.rtbound.FakeRequest; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.A; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models.A1Impl; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models.AImpl; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models.B1Impl; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models.BImpl; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/apache/sling/models/testing/helper/FakeRequest.java b/src/test/java/org/apache/sling/models/it/helper/FakeRequest.java similarity index 99% rename from src/test/java/org/apache/sling/models/testing/helper/FakeRequest.java rename to src/test/java/org/apache/sling/models/it/helper/FakeRequest.java index 1290f8a..35f8725 100644 --- a/src/test/java/org/apache/sling/models/testing/helper/FakeRequest.java +++ b/src/test/java/org/apache/sling/models/it/helper/FakeRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing.helper; +package org.apache.sling.models.it.helper; import javax.servlet.AsyncContext; import javax.servlet.DispatcherType; diff --git a/src/test/java/org/apache/sling/models/testing/helper/FakeResponse.java b/src/test/java/org/apache/sling/models/it/helper/FakeResponse.java similarity index 98% rename from src/test/java/org/apache/sling/models/testing/helper/FakeResponse.java rename to src/test/java/org/apache/sling/models/it/helper/FakeResponse.java index fa474aa..70317cf 100644 --- a/src/test/java/org/apache/sling/models/testing/helper/FakeResponse.java +++ b/src/test/java/org/apache/sling/models/it/helper/FakeResponse.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing.helper; +package org.apache.sling.models.it.helper; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; diff --git a/src/test/java/org/apache/sling/models/it/models/package-info.java b/src/test/java/org/apache/sling/models/it/models/package-info.java deleted file mode 100644 index d387b59..0000000 --- a/src/test/java/org/apache/sling/models/it/models/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -@Version("1.0") -package org.apache.sling.models.it.models; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java b/src/test/java/org/apache/sling/models/it/rtbound/FakeRequest.java similarity index 99% rename from src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java rename to src/test/java/org/apache/sling/models/it/rtbound/FakeRequest.java index 56a8a78..d84705b 100644 --- a/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java +++ b/src/test/java/org/apache/sling/models/it/rtbound/FakeRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing.rtbound; +package org.apache.sling.models.it.rtbound; import javax.servlet.AsyncContext; import javax.servlet.DispatcherType; diff --git a/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java b/src/test/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingIT.java similarity index 96% rename from src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java rename to src/test/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingIT.java index 74ec330..a7af956 100644 --- a/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java +++ b/src/test/java/org/apache/sling/models/it/rtbound/ResourceTypeBindingIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing.rtbound; +package org.apache.sling.models.it.rtbound; import java.util.HashMap; import java.util.Map; @@ -30,9 +30,9 @@ import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.models.factory.ModelFactory; -import org.apache.sling.models.it.rtbound.BaseComponent; -import org.apache.sling.models.it.rtbound.ExtendedComponent; -import org.apache.sling.models.it.rtbound.FromRequestComponent; +import org.apache.sling.models.it.testbundle.rtbound.BaseComponent; +import org.apache.sling.models.it.testbundle.rtbound.ExtendedComponent; +import org.apache.sling.models.it.testbundle.rtbound.FromRequestComponent; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/apache/sling/models/it/rtbound/package-info.java b/src/test/java/org/apache/sling/models/it/rtbound/package-info.java deleted file mode 100644 index 19332e3..0000000 --- a/src/test/java/org/apache/sling/models/it/rtbound/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -@Version("1.0") -package org.apache.sling.models.it.rtbound; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java b/src/test/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerIT.java similarity index 93% rename from src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java rename to src/test/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerIT.java index 3faa6e9..9f5c654 100644 --- a/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java +++ b/src/test/java/org/apache/sling/models/it/rtboundpicker/ResourceTypePickerIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.testing.rtboundpicker; +package org.apache.sling.models.it.rtboundpicker; import java.util.HashMap; import java.util.Map; @@ -29,9 +29,9 @@ import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.junit.rules.TeleporterRule; -import org.apache.sling.models.it.rtboundpicker.BaseComponent; -import org.apache.sling.models.it.rtboundpicker.SubRTComponent; -import org.apache.sling.models.it.rtboundpicker.TestComponent; +import org.apache.sling.models.it.testbundle.rtboundpicker.BaseComponent; +import org.apache.sling.models.it.testbundle.rtboundpicker.SubRTComponent; +import org.apache.sling.models.it.testbundle.rtboundpicker.TestComponent; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/apache/sling/models/it/rtboundpicker/package-info.java b/src/test/java/org/apache/sling/models/it/rtboundpicker/package-info.java deleted file mode 100644 index 950815c..0000000 --- a/src/test/java/org/apache/sling/models/it/rtboundpicker/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -@Version("1.0") -package org.apache.sling.models.it.rtboundpicker; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/services/package-info.java b/src/test/java/org/apache/sling/models/it/services/package-info.java deleted file mode 100644 index 1f5740a..0000000 --- a/src/test/java/org/apache/sling/models/it/services/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -@Version("1.0") -package org.apache.sling.models.it.services; - -import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/delegate/request/DelegateBaseModel.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/DelegateBaseModel.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/delegate/request/DelegateBaseModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/request/DelegateBaseModel.java index 1e4369e..6cca66e 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/request/DelegateBaseModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/DelegateBaseModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.request; +package org.apache.sling.models.it.testbundle.delegate.request; import javax.inject.Inject; diff --git a/src/test/java/org/apache/sling/models/it/delegate/request/DelegateExtendedModel.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/DelegateExtendedModel.java similarity index 96% rename from src/test/java/org/apache/sling/models/it/delegate/request/DelegateExtendedModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/request/DelegateExtendedModel.java index c2a01a7..ad455cd 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/request/DelegateExtendedModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/DelegateExtendedModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.request; +package org.apache.sling.models.it.testbundle.delegate.request; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/delegate/resource/DelegateInterface.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/DelegateInterface.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/delegate/resource/DelegateInterface.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/request/DelegateInterface.java index 2b208e2..ddab798 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/resource/DelegateInterface.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/DelegateInterface.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.resource; +package org.apache.sling.models.it.testbundle.delegate.request; public interface DelegateInterface { diff --git a/src/test/java/org/apache/sling/models/it/implpicker/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/package-info.java similarity index 93% copy from src/test/java/org/apache/sling/models/it/implpicker/package-info.java copy to src/test/java/org/apache/sling/models/it/testbundle/delegate/request/package-info.java index c8a5b3e..ad984f5 100644 --- a/src/test/java/org/apache/sling/models/it/implpicker/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/request/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.implpicker; +package org.apache.sling.models.it.testbundle.delegate.request; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/delegate/resource/DelegateBaseModel.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/DelegateBaseModel.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/delegate/resource/DelegateBaseModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/DelegateBaseModel.java index 0b2031b..de36cce 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/resource/DelegateBaseModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/DelegateBaseModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.resource; +package org.apache.sling.models.it.testbundle.delegate.resource; import javax.inject.Inject; diff --git a/src/test/java/org/apache/sling/models/it/delegate/resource/DelegateExtendedModel.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/DelegateExtendedModel.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/delegate/resource/DelegateExtendedModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/DelegateExtendedModel.java index df901f5..b591707 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/resource/DelegateExtendedModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/DelegateExtendedModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.resource; +package org.apache.sling.models.it.testbundle.delegate.resource; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/delegate/request/DelegateInterface.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/DelegateInterface.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/delegate/request/DelegateInterface.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/DelegateInterface.java index 9826052..8d07de9 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/request/DelegateInterface.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/DelegateInterface.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.request; +package org.apache.sling.models.it.testbundle.delegate.resource; public interface DelegateInterface { diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/package-info.java similarity index 93% copy from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/package-info.java copy to src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/package-info.java index fa049a5..0b42b01 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/resource/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.delegate.viaoriginalresource; +package org.apache.sling.models.it.testbundle.delegate.resource; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/A.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/A.java similarity index 91% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/A.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/A.java index 7581fea..65f1d97 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/A.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/A.java @@ -16,6 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.viaoriginalresource; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource; public interface A {} diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/A1.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/A1.java similarity index 91% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/A1.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/A1.java index 6d3048b..67e249a 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/A1.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/A1.java @@ -16,6 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.viaoriginalresource; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource; public interface A1 extends A {} diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/B.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/B.java similarity index 91% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/B.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/B.java index 8fbbdab..fde7c55 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/B.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/B.java @@ -16,6 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.viaoriginalresource; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource; public interface B {} diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/B1.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/B1.java similarity index 91% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/B1.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/B1.java index 50fb27c..ea4f0ad 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/B1.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/B1.java @@ -16,6 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.viaoriginalresource; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource; public interface B1 extends B {} diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/A1Impl.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/A1Impl.java similarity index 82% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/A1Impl.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/A1Impl.java index 62e4b63..079f63a 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/A1Impl.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/A1Impl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.viaoriginalresource.models; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; @@ -24,9 +24,9 @@ import org.apache.sling.models.annotations.Model; import org.apache.sling.models.annotations.Via; import org.apache.sling.models.annotations.injectorspecific.Self; import org.apache.sling.models.annotations.via.ResourceSuperType; -import org.apache.sling.models.it.delegate.viaoriginalresource.A; -import org.apache.sling.models.it.delegate.viaoriginalresource.A1; -import org.apache.sling.models.it.delegate.viaoriginalresource.B1; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.A; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.A1; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.B1; @Model( adaptables = {SlingHttpServletRequest.class, Resource.class}, diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/AImpl.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/AImpl.java similarity index 85% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/AImpl.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/AImpl.java index 9622bdb..6c46eab 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/AImpl.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/AImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.viaoriginalresource.models; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; @@ -24,8 +24,8 @@ import org.apache.sling.models.annotations.Model; import org.apache.sling.models.annotations.Via; import org.apache.sling.models.annotations.injectorspecific.Self; import org.apache.sling.models.annotations.via.OriginalResourceType; -import org.apache.sling.models.it.delegate.viaoriginalresource.A; -import org.apache.sling.models.it.delegate.viaoriginalresource.B; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.A; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.B; @Model( adaptables = {SlingHttpServletRequest.class, Resource.class}, diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/B1Impl.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/B1Impl.java similarity index 85% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/B1Impl.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/B1Impl.java index 85e744f..18050ab 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/B1Impl.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/B1Impl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.viaoriginalresource.models; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; @@ -24,8 +24,8 @@ import org.apache.sling.models.annotations.Model; import org.apache.sling.models.annotations.Via; import org.apache.sling.models.annotations.injectorspecific.Self; import org.apache.sling.models.annotations.via.ResourceSuperType; -import org.apache.sling.models.it.delegate.viaoriginalresource.B; -import org.apache.sling.models.it.delegate.viaoriginalresource.B1; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.B; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.B1; @Model( adaptables = {SlingHttpServletRequest.class, Resource.class}, diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/BImpl.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/BImpl.java similarity index 88% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/BImpl.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/BImpl.java index e3b8569..86e1053 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/BImpl.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/BImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.delegate.viaoriginalresource.models; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.Model; -import org.apache.sling.models.it.delegate.viaoriginalresource.B; +import org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.B; @Model( adaptables = {SlingHttpServletRequest.class, Resource.class}, diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/package-info.java similarity index 91% copy from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/package-info.java copy to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/package-info.java index 88f82b0..e2565dc 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/models/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.delegate.viaoriginalresource.models; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource.models; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/package-info.java similarity index 91% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/package-info.java rename to src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/package-info.java index 88f82b0..d657fc9 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/models/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/delegate/viaoriginalresource/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.delegate.viaoriginalresource.models; +package org.apache.sling.models.it.testbundle.delegate.viaoriginalresource; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/implpicker/CustomLastImplementationPicker.java b/src/test/java/org/apache/sling/models/it/testbundle/implpicker/CustomLastImplementationPicker.java similarity index 96% rename from src/test/java/org/apache/sling/models/it/implpicker/CustomLastImplementationPicker.java rename to src/test/java/org/apache/sling/models/it/testbundle/implpicker/CustomLastImplementationPicker.java index 5979847..6d8faf4 100644 --- a/src/test/java/org/apache/sling/models/it/implpicker/CustomLastImplementationPicker.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/implpicker/CustomLastImplementationPicker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.implpicker; +package org.apache.sling.models.it.testbundle.implpicker; import org.apache.commons.lang3.StringUtils; import org.apache.sling.api.resource.Resource; diff --git a/src/test/java/org/apache/sling/models/it/delegate/request/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/implpicker/package-info.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/delegate/request/package-info.java rename to src/test/java/org/apache/sling/models/it/testbundle/implpicker/package-info.java index 3e7e701..f65a8f6 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/request/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/implpicker/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.delegate.request; +package org.apache.sling.models.it.testbundle.implpicker; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/models/ConstructorInjectionTestModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/ConstructorInjectionTestModel.java similarity index 97% rename from src/test/java/org/apache/sling/models/it/models/ConstructorInjectionTestModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/ConstructorInjectionTestModel.java index c80b1c5..a97870c 100644 --- a/src/test/java/org/apache/sling/models/it/models/ConstructorInjectionTestModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/ConstructorInjectionTestModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/test/java/org/apache/sling/models/it/models/FieldInjectionTestModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/FieldInjectionTestModel.java similarity index 97% rename from src/test/java/org/apache/sling/models/it/models/FieldInjectionTestModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/FieldInjectionTestModel.java index f8ed3a8..e22021d 100644 --- a/src/test/java/org/apache/sling/models/it/models/FieldInjectionTestModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/FieldInjectionTestModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/test/java/org/apache/sling/models/it/models/InterfaceInjectionTestModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/InterfaceInjectionTestModel.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/models/InterfaceInjectionTestModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/InterfaceInjectionTestModel.java index 52e2e40..d12e8bb 100644 --- a/src/test/java/org/apache/sling/models/it/models/InterfaceInjectionTestModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/InterfaceInjectionTestModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import javax.inject.Inject; import javax.servlet.Filter; diff --git a/src/test/java/org/apache/sling/models/it/models/JakartaRequestSelfModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/JakartaRequestSelfModel.java similarity index 94% rename from src/test/java/org/apache/sling/models/it/models/JakartaRequestSelfModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/JakartaRequestSelfModel.java index 24282af..ba95f8b 100644 --- a/src/test/java/org/apache/sling/models/it/models/JakartaRequestSelfModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/JakartaRequestSelfModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import org.apache.sling.api.SlingJakartaHttpServletRequest; diff --git a/src/test/java/org/apache/sling/models/it/models/JakartaRequestSelfModelImpl.java b/src/test/java/org/apache/sling/models/it/testbundle/models/JakartaRequestSelfModelImpl.java similarity index 96% rename from src/test/java/org/apache/sling/models/it/models/JakartaRequestSelfModelImpl.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/JakartaRequestSelfModelImpl.java index ab7261a..7455643 100644 --- a/src/test/java/org/apache/sling/models/it/models/JakartaRequestSelfModelImpl.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/JakartaRequestSelfModelImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import org.apache.sling.api.SlingJakartaHttpServletRequest; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java b/src/test/java/org/apache/sling/models/it/testbundle/models/ModelWithOptionalImport.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/ModelWithOptionalImport.java index d33b05b..f382425 100644 --- a/src/test/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/ModelWithOptionalImport.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import org.apache.commons.beanutils.BeanUtils; import org.apache.sling.api.resource.Resource; diff --git a/src/test/java/org/apache/sling/models/it/models/RequestSelfModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/RequestSelfModel.java similarity index 94% rename from src/test/java/org/apache/sling/models/it/models/RequestSelfModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/RequestSelfModel.java index b711431..bc1a3ea 100644 --- a/src/test/java/org/apache/sling/models/it/models/RequestSelfModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/RequestSelfModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import org.apache.sling.api.SlingHttpServletRequest; diff --git a/src/test/java/org/apache/sling/models/it/models/RequestSelfModelImpl.java b/src/test/java/org/apache/sling/models/it/testbundle/models/RequestSelfModelImpl.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/models/RequestSelfModelImpl.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/RequestSelfModelImpl.java index de9e83f..3030d39 100644 --- a/src/test/java/org/apache/sling/models/it/models/RequestSelfModelImpl.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/RequestSelfModelImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/models/SelfModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/SelfModel.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/models/SelfModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/SelfModel.java index c635c4e..9cc9f18 100644 --- a/src/test/java/org/apache/sling/models/it/models/SelfModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/SelfModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/models/ServiceInjectionTestModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/ServiceInjectionTestModel.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/models/ServiceInjectionTestModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/ServiceInjectionTestModel.java index c9f2cf3..e4ddb96 100644 --- a/src/test/java/org/apache/sling/models/it/models/ServiceInjectionTestModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/ServiceInjectionTestModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import java.util.ArrayList; import java.util.List; @@ -24,7 +24,7 @@ import java.util.List; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.Model; import org.apache.sling.models.annotations.injectorspecific.OSGiService; -import org.apache.sling.models.it.services.SimpleService; +import org.apache.sling.models.it.testbundle.services.SimpleService; @Model(adaptables = Resource.class) public class ServiceInjectionTestModel { diff --git a/src/test/java/org/apache/sling/models/it/models/SlingPropertyAnnotationTestModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/SlingPropertyAnnotationTestModel.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/models/SlingPropertyAnnotationTestModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/SlingPropertyAnnotationTestModel.java index abda77a..a192d22 100644 --- a/src/test/java/org/apache/sling/models/it/models/SlingPropertyAnnotationTestModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/SlingPropertyAnnotationTestModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/models/SourceObject.java b/src/test/java/org/apache/sling/models/it/testbundle/models/SourceObject.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/models/SourceObject.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/SourceObject.java index d31d57f..dfb39cd 100644 --- a/src/test/java/org/apache/sling/models/it/models/SourceObject.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/SourceObject.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import org.apache.sling.api.resource.Resource; diff --git a/src/test/java/org/apache/sling/models/it/models/ViaModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/ViaModel.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/models/ViaModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/ViaModel.java index a33c24e..a5182ca 100644 --- a/src/test/java/org/apache/sling/models/it/models/ViaModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/ViaModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models; +package org.apache.sling.models.it.testbundle.models; import javax.inject.Inject; diff --git a/src/test/java/org/apache/sling/models/it/models/implextend/ExtendsClassPropertyModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/ExtendsClassPropertyModel.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/models/implextend/ExtendsClassPropertyModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/implextend/ExtendsClassPropertyModel.java index 4dbb0dc..97463c9 100644 --- a/src/test/java/org/apache/sling/models/it/models/implextend/ExtendsClassPropertyModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/ExtendsClassPropertyModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models.implextend; +package org.apache.sling.models.it.testbundle.models.implextend; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/models/implextend/ImplementsInterfacePropertyModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/ImplementsInterfacePropertyModel.java similarity index 96% rename from src/test/java/org/apache/sling/models/it/models/implextend/ImplementsInterfacePropertyModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/implextend/ImplementsInterfacePropertyModel.java index 033d184..8add758 100644 --- a/src/test/java/org/apache/sling/models/it/models/implextend/ImplementsInterfacePropertyModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/ImplementsInterfacePropertyModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models.implextend; +package org.apache.sling.models.it.testbundle.models.implextend; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/test/java/org/apache/sling/models/it/models/implextend/ImplementsInterfacePropertyModel2.java b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/ImplementsInterfacePropertyModel2.java similarity index 96% rename from src/test/java/org/apache/sling/models/it/models/implextend/ImplementsInterfacePropertyModel2.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/implextend/ImplementsInterfacePropertyModel2.java index 40d05ec..9c4c275 100644 --- a/src/test/java/org/apache/sling/models/it/models/implextend/ImplementsInterfacePropertyModel2.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/ImplementsInterfacePropertyModel2.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models.implextend; +package org.apache.sling.models.it.testbundle.models.implextend; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/test/java/org/apache/sling/models/it/models/implextend/InvalidImplementsInterfacePropertyModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/InvalidImplementsInterfacePropertyModel.java similarity index 96% rename from src/test/java/org/apache/sling/models/it/models/implextend/InvalidImplementsInterfacePropertyModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/implextend/InvalidImplementsInterfacePropertyModel.java index 6f0dfdf..0ebca36 100644 --- a/src/test/java/org/apache/sling/models/it/models/implextend/InvalidImplementsInterfacePropertyModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/InvalidImplementsInterfacePropertyModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models.implextend; +package org.apache.sling.models.it.testbundle.models.implextend; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/test/java/org/apache/sling/models/it/models/implextend/InvalidSampleServiceInterface.java b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/InvalidSampleServiceInterface.java similarity index 94% rename from src/test/java/org/apache/sling/models/it/models/implextend/InvalidSampleServiceInterface.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/implextend/InvalidSampleServiceInterface.java index 18f26cb..3d98498 100644 --- a/src/test/java/org/apache/sling/models/it/models/implextend/InvalidSampleServiceInterface.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/InvalidSampleServiceInterface.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models.implextend; +package org.apache.sling.models.it.testbundle.models.implextend; /** * Example "service" interface to which sling models can adapt. diff --git a/src/test/java/org/apache/sling/models/it/models/implextend/SampleServiceInterface.java b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/SampleServiceInterface.java similarity index 94% rename from src/test/java/org/apache/sling/models/it/models/implextend/SampleServiceInterface.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/implextend/SampleServiceInterface.java index 84f1155..f2b3814 100644 --- a/src/test/java/org/apache/sling/models/it/models/implextend/SampleServiceInterface.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/SampleServiceInterface.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models.implextend; +package org.apache.sling.models.it.testbundle.models.implextend; /** * Example "service" interface to which sling models can adapt. diff --git a/src/test/java/org/apache/sling/models/it/models/implextend/SimplePropertyModel.java b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/SimplePropertyModel.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/models/implextend/SimplePropertyModel.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/implextend/SimplePropertyModel.java index a942c08..c629155 100644 --- a/src/test/java/org/apache/sling/models/it/models/implextend/SimplePropertyModel.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/SimplePropertyModel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.models.implextend; +package org.apache.sling.models.it.testbundle.models.implextend; import javax.inject.Inject; import javax.inject.Named; diff --git a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/package-info.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/package-info.java rename to src/test/java/org/apache/sling/models/it/testbundle/models/implextend/package-info.java index fa049a5..f600677 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/viaoriginalresource/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/implextend/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.delegate.viaoriginalresource; +package org.apache.sling.models.it.testbundle.models.implextend; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/implpicker/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/models/package-info.java similarity index 94% copy from src/test/java/org/apache/sling/models/it/implpicker/package-info.java copy to src/test/java/org/apache/sling/models/it/testbundle/models/package-info.java index c8a5b3e..6bf456a 100644 --- a/src/test/java/org/apache/sling/models/it/implpicker/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/models/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.implpicker; +package org.apache.sling.models.it.testbundle.models; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/rtbound/BaseComponent.java b/src/test/java/org/apache/sling/models/it/testbundle/rtbound/BaseComponent.java similarity index 96% rename from src/test/java/org/apache/sling/models/it/rtbound/BaseComponent.java rename to src/test/java/org/apache/sling/models/it/testbundle/rtbound/BaseComponent.java index b15f9f3..061ddde 100644 --- a/src/test/java/org/apache/sling/models/it/rtbound/BaseComponent.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/rtbound/BaseComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.rtbound; +package org.apache.sling.models.it.testbundle.rtbound; import javax.inject.Inject; diff --git a/src/test/java/org/apache/sling/models/it/rtbound/ExtendedComponent.java b/src/test/java/org/apache/sling/models/it/testbundle/rtbound/ExtendedComponent.java similarity index 96% rename from src/test/java/org/apache/sling/models/it/rtbound/ExtendedComponent.java rename to src/test/java/org/apache/sling/models/it/testbundle/rtbound/ExtendedComponent.java index 43cbed7..ebd91a1 100644 --- a/src/test/java/org/apache/sling/models/it/rtbound/ExtendedComponent.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/rtbound/ExtendedComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.rtbound; +package org.apache.sling.models.it.testbundle.rtbound; import java.util.Calendar; import java.util.Date; diff --git a/src/test/java/org/apache/sling/models/it/rtbound/FromRequestComponent.java b/src/test/java/org/apache/sling/models/it/testbundle/rtbound/FromRequestComponent.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/rtbound/FromRequestComponent.java rename to src/test/java/org/apache/sling/models/it/testbundle/rtbound/FromRequestComponent.java index c39b754..f6e5f0d 100644 --- a/src/test/java/org/apache/sling/models/it/rtbound/FromRequestComponent.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/rtbound/FromRequestComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.rtbound; +package org.apache.sling.models.it.testbundle.rtbound; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/delegate/resource/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/rtbound/package-info.java similarity index 94% rename from src/test/java/org/apache/sling/models/it/delegate/resource/package-info.java rename to src/test/java/org/apache/sling/models/it/testbundle/rtbound/package-info.java index a0f5c5b..bbbbeaa 100644 --- a/src/test/java/org/apache/sling/models/it/delegate/resource/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/rtbound/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.delegate.resource; +package org.apache.sling.models.it.testbundle.rtbound; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/rtboundpicker/BaseComponent.java b/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/BaseComponent.java similarity index 94% rename from src/test/java/org/apache/sling/models/it/rtboundpicker/BaseComponent.java rename to src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/BaseComponent.java index 292cef0..a88f3dd 100644 --- a/src/test/java/org/apache/sling/models/it/rtboundpicker/BaseComponent.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/BaseComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.rtboundpicker; +package org.apache.sling.models.it.testbundle.rtboundpicker; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/rtboundpicker/SubRTComponent.java b/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/SubRTComponent.java similarity index 94% rename from src/test/java/org/apache/sling/models/it/rtboundpicker/SubRTComponent.java rename to src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/SubRTComponent.java index 32011b2..5ea3346 100644 --- a/src/test/java/org/apache/sling/models/it/rtboundpicker/SubRTComponent.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/SubRTComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.rtboundpicker; +package org.apache.sling.models.it.testbundle.rtboundpicker; import org.apache.sling.api.resource.Resource; import org.apache.sling.models.annotations.Model; diff --git a/src/test/java/org/apache/sling/models/it/rtboundpicker/TestComponent.java b/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/TestComponent.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/rtboundpicker/TestComponent.java rename to src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/TestComponent.java index 3d97aea..8c3362f 100644 --- a/src/test/java/org/apache/sling/models/it/rtboundpicker/TestComponent.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/TestComponent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.rtboundpicker; +package org.apache.sling.models.it.testbundle.rtboundpicker; public interface TestComponent { diff --git a/src/test/java/org/apache/sling/models/it/implpicker/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/package-info.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/implpicker/package-info.java rename to src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/package-info.java index c8a5b3e..f9c8f4b 100644 --- a/src/test/java/org/apache/sling/models/it/implpicker/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/rtboundpicker/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.implpicker; +package org.apache.sling.models.it.testbundle.rtboundpicker; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/services/AnotherTestBindingsValuesProvider.java b/src/test/java/org/apache/sling/models/it/testbundle/services/AnotherTestBindingsValuesProvider.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/services/AnotherTestBindingsValuesProvider.java rename to src/test/java/org/apache/sling/models/it/testbundle/services/AnotherTestBindingsValuesProvider.java index 9dcce31..987bdc4 100644 --- a/src/test/java/org/apache/sling/models/it/services/AnotherTestBindingsValuesProvider.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/services/AnotherTestBindingsValuesProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.services; +package org.apache.sling.models.it.testbundle.services; import java.util.Collections; import java.util.HashMap; diff --git a/src/test/java/org/apache/sling/models/it/services/SimpleService.java b/src/test/java/org/apache/sling/models/it/testbundle/services/SimpleService.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/services/SimpleService.java rename to src/test/java/org/apache/sling/models/it/testbundle/services/SimpleService.java index aeb4ee1..94bfa89 100644 --- a/src/test/java/org/apache/sling/models/it/services/SimpleService.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/services/SimpleService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.services; +package org.apache.sling.models.it.testbundle.services; public interface SimpleService { int getRanking(); diff --git a/src/test/java/org/apache/sling/models/it/services/SimpleServiceWithCustomRanking.java b/src/test/java/org/apache/sling/models/it/testbundle/services/SimpleServiceWithCustomRanking.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/services/SimpleServiceWithCustomRanking.java rename to src/test/java/org/apache/sling/models/it/testbundle/services/SimpleServiceWithCustomRanking.java index 33a8068..a49afc9 100644 --- a/src/test/java/org/apache/sling/models/it/services/SimpleServiceWithCustomRanking.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/services/SimpleServiceWithCustomRanking.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.services; +package org.apache.sling.models.it.testbundle.services; public class SimpleServiceWithCustomRanking implements SimpleService { diff --git a/src/test/java/org/apache/sling/models/it/services/TestBindingsValuesProvider.java b/src/test/java/org/apache/sling/models/it/testbundle/services/TestBindingsValuesProvider.java similarity index 95% rename from src/test/java/org/apache/sling/models/it/services/TestBindingsValuesProvider.java rename to src/test/java/org/apache/sling/models/it/testbundle/services/TestBindingsValuesProvider.java index a7dcb68..4f871db 100644 --- a/src/test/java/org/apache/sling/models/it/services/TestBindingsValuesProvider.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/services/TestBindingsValuesProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.services; +package org.apache.sling.models.it.testbundle.services; import java.util.Collections; import java.util.HashMap; diff --git a/src/test/java/org/apache/sling/models/it/services/TestResourceDecorator.java b/src/test/java/org/apache/sling/models/it/testbundle/services/TestResourceDecorator.java similarity index 97% rename from src/test/java/org/apache/sling/models/it/services/TestResourceDecorator.java rename to src/test/java/org/apache/sling/models/it/testbundle/services/TestResourceDecorator.java index 8d2a0a1..e9d112d 100644 --- a/src/test/java/org/apache/sling/models/it/services/TestResourceDecorator.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/services/TestResourceDecorator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.services; +package org.apache.sling.models.it.testbundle.services; import javax.servlet.http.HttpServletRequest; diff --git a/src/test/java/org/apache/sling/models/it/models/implextend/package-info.java b/src/test/java/org/apache/sling/models/it/testbundle/services/package-info.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/models/implextend/package-info.java rename to src/test/java/org/apache/sling/models/it/testbundle/services/package-info.java index 3d4840c..b3c9b24 100644 --- a/src/test/java/org/apache/sling/models/it/models/implextend/package-info.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/services/package-info.java @@ -16,6 +16,6 @@ */ @Version("1.0") -package org.apache.sling.models.it.models.implextend; +package org.apache.sling.models.it.testbundle.services; import org.osgi.annotation.versioning.Version; diff --git a/src/test/java/org/apache/sling/models/it/servlets/PathBoundJakartaServlet.java b/src/test/java/org/apache/sling/models/it/testbundle/servlets/PathBoundJakartaServlet.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/servlets/PathBoundJakartaServlet.java rename to src/test/java/org/apache/sling/models/it/testbundle/servlets/PathBoundJakartaServlet.java index 4900f29..4068f13 100644 --- a/src/test/java/org/apache/sling/models/it/servlets/PathBoundJakartaServlet.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/servlets/PathBoundJakartaServlet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.servlets; +package org.apache.sling.models.it.testbundle.servlets; import java.io.IOException; @@ -25,7 +25,7 @@ import jakarta.servlet.ServletException; import org.apache.sling.api.SlingJakartaHttpServletRequest; import org.apache.sling.api.SlingJakartaHttpServletResponse; import org.apache.sling.api.servlets.SlingJakartaSafeMethodsServlet; -import org.apache.sling.models.it.models.JakartaRequestSelfModel; +import org.apache.sling.models.it.testbundle.models.JakartaRequestSelfModel; import org.apache.sling.servlets.annotations.SlingServletPaths; import org.jetbrains.annotations.NotNull; import org.osgi.service.component.annotations.Component; diff --git a/src/test/java/org/apache/sling/models/it/servlets/PathBoundServlet.java b/src/test/java/org/apache/sling/models/it/testbundle/servlets/PathBoundServlet.java similarity index 93% rename from src/test/java/org/apache/sling/models/it/servlets/PathBoundServlet.java rename to src/test/java/org/apache/sling/models/it/testbundle/servlets/PathBoundServlet.java index 7657275..9341119 100644 --- a/src/test/java/org/apache/sling/models/it/servlets/PathBoundServlet.java +++ b/src/test/java/org/apache/sling/models/it/testbundle/servlets/PathBoundServlet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.models.it.servlets; +package org.apache.sling.models.it.testbundle.servlets; import javax.servlet.Servlet; import javax.servlet.ServletException; @@ -26,7 +26,7 @@ import java.io.IOException; import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.SlingHttpServletResponse; import org.apache.sling.api.servlets.SlingSafeMethodsServlet; -import org.apache.sling.models.it.models.RequestSelfModel; +import org.apache.sling.models.it.testbundle.models.RequestSelfModel; import org.apache.sling.servlets.annotations.SlingServletPaths; import org.jetbrains.annotations.NotNull; import org.osgi.service.component.annotations.Component;
