You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 11:18:10 UTC
[isis] 21/21: ISIS-2259: reorg fixtures testing module.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c1c20d9a9e10f46ca1d0c6343618cd0be81e6604
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:17:04 2020 +0000
ISIS-2259: reorg fixtures testing module.
---
.../demo/src/main/java/demoapp/webapp/DemoApp.java | 4 +-
examples/smoketests/pom.xml | 2 +-
.../testdomain/conf/Configuration_usingJdo.java | 4 +-
.../conf/Configuration_usingJdoAndShiro.java | 4 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 8 +--
.../testdomain/auditing/AuditerServiceTest.java | 2 +-
.../JdoBootstrappingTest_usingFixtures.java | 2 +-
.../commandexecution/WrapperAsyncTest.java | 2 +-
.../commandexecution/WrapperSyncTest.java | 2 +-
.../publishing/PublisherServiceTest.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 2 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 2 +-
.../testdomain/timestamping/TimestampingTest.java | 2 +-
.../transactions/TransactionRollbackTest.java | 2 +-
...TransactionRollbackTest_usingTransactional.java | 2 +-
extensions/pom.xml | 2 +-
extensions/security/secman/persistence-jdo/pom.xml | 2 +-
.../secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../jdo/seed/SeedUsersAndRolesFixtureScript.java | 2 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 2 +-
.../seed/scripts/AbstractTenancyFixtureScript.java | 2 +-
.../scripts/AbstractUserAndRolesFixtureScript.java | 2 +-
.../secman/jdo/seed/scripts/GlobalTenancy.java | 2 +-
...xtFixturesFixtureResultsRoleAndPermissions.java | 2 +-
.../cors/impl/webmodule/WebModuleCors.java | 2 +-
incubator/pom.xml | 2 +-
legacy/pom.xml | 2 +-
mappings/pom.xml | 2 +-
.../applib/services/calendar/CalendarService.java | 2 +-
subdomains/excel/applib/pom.xml | 2 +-
.../subdomains/excel/applib/dom/ExcelService.java | 2 +-
subdomains/excel/fixture/pom.xml | 2 +-
.../excel/fixtures/IsisModuleSubExcelFixtures.java | 2 +-
.../demotodoitem/DemoToDoItemRowHandler.java | 2 +-
.../demotodoitem/DemoToDoItemRowHandler2.java | 2 +-
.../ExcelUploadRowHandler4ToDoItem.java | 2 +-
.../ExcelUploadServiceForDemoToDoItem.java | 6 +-
.../DemoToDoItem_create_usingExcelFixture.java | 2 +-
.../DemoToDoItem_recreate_usingExcelFixture.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 2 +-
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 2 +-
.../ExcelDemoToDoItem_tearDown2.java | 2 +-
.../integtests/ExcelModuleIntegTestAbstract.java | 2 +-
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 6 +-
.../subdomains/excel/testing/ExcelFixture.java | 6 +-
.../subdomains/excel/testing/ExcelFixture2.java | 4 +-
.../excel/testing/ExcelFixtureRowHandler.java | 2 +-
.../excel/testing/ExcelFixtureWorkbookHandler.java | 2 +-
.../excel/testing/FixtureAwareRowHandler.java | 2 +-
subdomains/pom.xml | 2 +-
.../spring/applib/service/SpringBeansService.java | 2 +-
.../fakedata/applib/services/FakeDataService.java | 2 +-
testing/fakedata/fixtures/pom.xml | 2 +-
.../fixtures/IsisModuleTstFakeDataFixtures.java | 4 +-
.../FakeDataDemoObjectWithAll_create3.java | 2 +-
.../FakeDataDemoObjectWithAll_tearDown.java | 2 +-
...eDataDemoObjectWithAll_create_withFakeData.java | 2 +-
...eDataDemoObjectWithAll_update_withFakeData.java | 2 +-
.../FakeDataModuleIntegTestAbstract.java | 2 +-
.../fakedata/integtests/tests/Smoke_IntegTest.java | 2 +-
testing/fixtures/{ => applib}/pom.xml | 14 ++--
.../IsisIntegrationTestAbstractWithFixtures.java | 14 ++--
.../applib/IsisModuleTstFixturesApplib.java} | 13 ++--
.../api/FixtureScriptWithExecutionStrategy.java | 6 +-
.../applib}/api/PersonaWithBuilderScript.java | 4 +-
.../fixtures/applib}/api/PersonaWithFinder.java | 2 +-
.../testing/fixtures/applib}/api/WithPrereqs.java | 6 +-
.../testing/fixtures/applib}/api/package-info.java | 2 +-
.../applib}/events/FixturesInstalledEvent.java | 2 +-
.../applib}/events/FixturesInstallingEvent.java | 2 +-
.../fixturescripts/BuilderScriptAbstract.java | 10 +--
.../fixturescripts/BuilderScriptWithResult.java | 2 +-
.../fixturescripts/BuilderScriptWithoutResult.java | 2 +-
.../fixturescripts/ExecutionParameters.java | 2 +-
.../fixturescripts/ExecutionParametersService.java | 8 +--
.../applib}/fixturescripts/FixtureResult.java | 2 +-
.../fixturescripts/FixtureResult.layout.xml | 0
.../applib}/fixturescripts/FixtureResultList.java | 16 ++---
.../applib}/fixturescripts/FixtureScript.java | 20 +++---
.../applib}/fixturescripts/FixtureScripts.java | 14 ++--
.../fixturespec/FixtureScriptsSpecification.java | 10 +--
.../FixtureScriptsSpecificationProvider.java | 2 +-
.../fixtures/applib}/fixturespec/package-info.java | 4 +-
.../fixtures/applib}/legacy/FixtureClock.java | 2 +-
.../applib}/legacy/TickingFixtureClock.java | 2 +-
.../applib}/legacy/clock/ClockFixture.java | 10 +--
.../applib}/legacy/clock/TickingClockFixture.java | 12 ++--
.../fixtures/applib}/legacy/package-info.java | 4 +-
.../QueryResultsCacheControlDefault.java | 8 +--
.../legacy/setup/PersonaEnumPersistAll.java | 14 ++--
.../legacy/teardown/TeardownFixtureAbstract.java | 4 +-
.../legacy/teardown/TeardownFixtureAbstract2.java | 2 +-
.../applib}/modules/ModuleWithFixtures.java | 4 +-
.../applib}/modules/ModuleWithFixturesService.java | 6 +-
.../applib/services}/FixturesLifecycleService.java | 6 +-
.../{ => applib}/src/main/resources/prism.css | 0
.../{ => applib}/src/main/resources/prism1.14.js | 0
.../fixturescripts/ExecutionContextTest.java | 2 +-
.../ExecutionParameters_AsKeyValueMap_Test.java | 2 +-
.../fixturescripts/ExecutionParameters_Test.java | 2 +-
.../legacy/FixtureClockInstantiationTest.java | 5 +-
testing/fixtures/pom.xml | 74 +++-------------------
.../h2console/ui/webmodule/WebModuleH2Console.java | 2 +-
testing/pom.xml | 4 +-
testing/specsupport/pom.xml | 2 +-
valuetypes/pom.xml | 2 +-
.../extensions/sse/services/SseServiceDefault.java | 2 +-
.../sse/webmodule/WebModuleServerSentEvents.java | 2 +-
108 files changed, 210 insertions(+), 268 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 3174851..efd4df9 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.presets.IsisPresets;
import org.apache.isis.extensions.asciidoc.ui.IsisModuleExtAsciidocUi;
-import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
@@ -100,7 +100,7 @@ public class DemoApp extends SpringBootServletInitializer {
IsisModuleSecmanPersistenceJdo.class,
IsisModuleSecmanEncryptionJbcrypt.class,
- IsisModuleExtFixtures.class,
+ IsisModuleTstFixturesApplib.class,
IsisModuleIncModelMetaModel.class, // @Model support (incubator)
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 62b6289..31cd3c2 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.mappings</groupId>
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index a0ba9eb..c48e23a 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
@@ -36,7 +36,7 @@ import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
IsisModuleSpringBoot.class,
IsisModuleSecurityBypass.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleExtFixtures.class
+ IsisModuleTstFixturesApplib.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index ef6f484..06945fb 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
@@ -44,7 +44,7 @@ import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
IsisModuleSecurityShiro.class,
IsisModuleJdoDataNucleus5.class,
- IsisModuleExtFixtures.class
+ IsisModuleTstFixturesApplib.class
})
@ComponentScan(
basePackageClasses= {
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
index 5e5bf6e..1a3e8f9 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/jdo/JdoTestDomainPersona.java
@@ -23,10 +23,10 @@ import java.util.HashSet;
import javax.inject.Inject;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptWithResult;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptWithoutResult;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptWithResult;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptWithoutResult;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
index b87ad02..031fb02 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/auditing/AuditerServiceTest.java
@@ -44,7 +44,7 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
index 0f7e346..022f513 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/JdoBootstrappingTest_usingFixtures.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Inventory;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
index f31e7ce..d2fa7c6 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperAsyncTest.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
index a967628..f30125b 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/commandexecution/WrapperSyncTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
index d7d322a..8e0ce0d 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/publishing/PublisherServiceTest.java
@@ -48,7 +48,7 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Incubating;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
index 2fe5bd1..cc5127b 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdapTest.java
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
index a424dc6..e413b27 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/shiro/ShiroSecmanLdap_restfulStressTest.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.fail;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.role.ApplicationRoleRepository;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
index 88ebe68..48fb556 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/timestamping/TimestampingTest.java
@@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
import static org.junit.Assert.assertNotNull;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.JdoTestDomainPersona;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
index 1fc15e8..b301ae1 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
index 90ac093..0599580 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/transactions/TransactionRollbackTest_usingTransactional.java
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_usingJdo;
import org.apache.isis.testdomain.jdo.Book;
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 564375c..573882c 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -129,7 +129,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/extensions/security/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
index e1a6431..fa82fba 100644
--- a/extensions/security/secman/persistence-jdo/pom.xml
+++ b/extensions/security/secman/persistence-jdo/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
index 42af90a..18c9f20 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.runtime.context.session.AppLifecycleEvent;
import lombok.val;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
index a4eca7d..f592e20 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedUsersAndRolesFixtureScript.java
@@ -20,7 +20,7 @@ package org.apache.isis.extensions.secman.jdo.seed;
import javax.inject.Inject;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.jdo.seed.scripts.GlobalTenancy;
import org.apache.isis.extensions.secman.jdo.seed.scripts.IsisExtFixturesFixtureResultsRoleAndPermissions;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
index 0603145..d7f0dc2 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractRoleAndPermissionsFixtureScript.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRepository;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
index 757ed32..b01d1f9 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractTenancyFixtureScript.java
@@ -20,7 +20,7 @@ package org.apache.isis.extensions.secman.jdo.seed.scripts;
import javax.inject.Inject;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.secman.jdo.dom.tenancy.ApplicationTenancy;
import org.apache.isis.extensions.secman.jdo.dom.tenancy.ApplicationTenancyRepository;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java
index 2c1722c..c8ac81f 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/AbstractUserAndRolesFixtureScript.java
@@ -26,7 +26,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.value.Password;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.secman.api.user.AccountType;
import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRole;
import org.apache.isis.extensions.secman.jdo.dom.role.ApplicationRoleRepository;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java
index a5f0cae..9ded73b 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/GlobalTenancy.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.extensions.secman.jdo.seed.scripts;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class GlobalTenancy extends AbstractTenancyFixtureScript {
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java
index 933104a..475ecbb 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisExtFixturesFixtureResultsRoleAndPermissions.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.extensions.secman.jdo.seed.scripts;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMode;
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
index 3f3d1d4..d9d47dc 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
@@ -43,7 +43,7 @@ import lombok.Getter;
* @since 2.0
*/
@Service
-@Named("isisExtCors.WebModuleServerCors")
+@Named("isisMapCors.WebModuleServerCors")
@Qualifier("CORS")
@Order(OrderPrecedence.HIGH)
public final class WebModuleCors extends WebModuleAbstract {
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 98ad091..055ffa8 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -74,7 +74,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/legacy/pom.xml b/legacy/pom.xml
index f156dea..a1dc7ed 100644
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -84,7 +84,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/mappings/pom.xml b/mappings/pom.xml
index 32953e7..6dc7097 100644
--- a/mappings/pom.xml
+++ b/mappings/pom.xml
@@ -77,7 +77,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
index 41ea363..0f249ab 100644
--- a/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
+++ b/subdomains/base/applib/src/main/java/org/apache/isis/subdomains/base/applib/services/calendar/CalendarService.java
@@ -14,7 +14,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.clock.ClockService;
@Service
-@Named("isisExtBase.calendarService")
+@Named("isisSubBase.calendarService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index 446cd6d..eaf0963 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
index 8d05318..aed5504 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/ExcelService.java
@@ -28,7 +28,7 @@ import org.apache.isis.subdomains.excel.applib.dom.util.Mode;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisExtExcel.ExcelService")
+@Named("isisSubExcel.ExcelService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/subdomains/excel/fixture/pom.xml b/subdomains/excel/fixture/pom.xml
index 97f7f47..3c54576 100644
--- a/subdomains/excel/fixture/pom.xml
+++ b/subdomains/excel/fixture/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<!--
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
index 787512a..b9ef710 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.excel.ExcelModule;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.modules.Module;
@Configuration
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
index c31d0ce..188f9a0 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
@@ -15,7 +15,7 @@ import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
index 70b8029..1f77de6 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
@@ -7,7 +7,7 @@ import org.apache.isis.extensions.excel.dom.ExcelMetaDataEnabled;
import org.apache.isis.extensions.excel.dom.FixtureAwareRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
index 6350780..24b1f45 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
@@ -20,7 +20,7 @@ import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index 25bddb6..c80acb2 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -7,9 +7,9 @@ import javax.inject.Inject;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@DomainService(
nature = NatureOfService.VIEW,
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
index 6f358d0..e5b9565 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
@@ -13,7 +13,7 @@ import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.extensions.excel.dom.ExcelFixture;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
index 9b750b6..794ad54 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java
@@ -6,7 +6,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown2;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class DemoToDoItem_recreate_usingExcelFixture extends FixtureScript {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
index 695747b..aea4c93 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
@@ -9,7 +9,7 @@ import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class ExcelDemoToDoItem_recreate5_for extends FixtureScript {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
index ec44dfc..a5a4f6e 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
-import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
+import org.apache.isis.testing.fixtures.applib.legacy.teardown.TeardownFixtureAbstract2;
public class ExcelDemoToDoItem_tearDown extends TeardownFixtureAbstract2 {
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
index 2d4e51a..3a6dd12 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
@@ -3,7 +3,7 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescri
import javax.inject.Inject;
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class ExcelDemoToDoItem_tearDown2 extends FixtureScript {
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
index e315b14..cc3b797 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubExcelFixtures;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
import org.apache.isis.security.bypass.IsisBootSecurityBypass;
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
index dbff01b..dbc4a3f 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java
@@ -13,9 +13,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2;
import org.apache.isis.subdomains.excel.integtests.ExcelModuleIntegTestAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.val;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
index d8835d3..03d7d5f 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture.java
@@ -22,9 +22,9 @@ import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.applib.dom.util.ExcelServiceImpl;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResultList;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResultList;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
index 07d77ff..e6b6aa0 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixture2.java
@@ -16,8 +16,8 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
index 43376c3..0b80230 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureRowHandler.java
@@ -2,7 +2,7 @@ package org.apache.isis.subdomains.excel.testing;
import java.util.List;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public interface ExcelFixtureRowHandler {
List<Object> handleRow(
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
index f656613..b5df801 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/ExcelFixtureWorkbookHandler.java
@@ -2,7 +2,7 @@ package org.apache.isis.subdomains.excel.testing;
import java.util.List;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public interface ExcelFixtureWorkbookHandler {
void workbookHandled(
diff --git a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
index ce212ac..ea8d2ab 100644
--- a/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
+++ b/subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/FixtureAwareRowHandler.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.excel.testing;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.subdomains.excel.applib.dom.RowHandler;
public interface FixtureAwareRowHandler<T extends FixtureAwareRowHandler<T>> extends RowHandler<T> {
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index f8d6d1f..1a59f6a 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -134,7 +134,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
index 9f7e326..7f091a7 100644
--- a/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
+++ b/subdomains/spring/applib/src/main/java/org/apache/isis/subdomains/spring/applib/service/SpringBeansService.java
@@ -37,7 +37,7 @@ import lombok.experimental.UtilityClass;
* Borrowed from BeansEndpoint.
*/
@Service
-@Named("isisExtSpring.SpringBeansService")
+@Named("isisSubSpring.SpringBeansService")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Default")
public class SpringBeansService {
diff --git a/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
index baff8c0..b349e1c 100644
--- a/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
@@ -21,7 +21,7 @@ import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.repository.RepositoryService;
@Service
-@Named("isisExtFakeData.FakeDataService")
+@Named("isisTstFakeData.FakeDataService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fakedata/fixtures/pom.xml b/testing/fakedata/fixtures/pom.xml
index e7ef2b9..a1f9231 100644
--- a/testing/fakedata/fixtures/pom.xml
+++ b/testing/fakedata/fixtures/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<dependency>
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
index e8bd21e..c90ac12 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/IsisModuleTstFakeDataFixtures.java
@@ -5,8 +5,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.fakedata.dom.IsisModuleExtFakeData;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.modules.ModuleWithFixtures;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_tearDown;
@Configuration
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
index 10772e8..ddf0939 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_create3.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_create_withFakeData;
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
index bfdd848..4bcf15c 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/FakeDataDemoObjectWithAll_tearDown.java
@@ -1,6 +1,6 @@
package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts;
-import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
+import org.apache.isis.testing.fixtures.applib.legacy.teardown.TeardownFixtureAbstract2;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
public class FakeDataDemoObjectWithAll_tearDown extends TeardownFixtureAbstract2 {
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
index 626f4a6..71e837e 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_create_withFakeData.java
@@ -2,7 +2,7 @@ package org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescri
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
diff --git a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
index 30f3ed3..c58f5e4 100644
--- a/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
+++ b/testing/fakedata/fixtures/src/main/java/org/apache/isis/testing/fakedata/fixtures/demoapp/demomodule/fixturescripts/data/FakeDataDemoObjectWithAll_update_withFakeData.java
@@ -17,7 +17,7 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.EnumOf3;
import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index 9d64809..d9784a0 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
+import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.jdo.IsisBootDataNucleus;
import org.apache.isis.runtime.spring.IsisBoot;
import org.apache.isis.security.bypass.IsisBootSecurityBypass;
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
index 059135f..39bf4e6 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
@@ -20,7 +20,7 @@ import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
import org.apache.isis.testing.fakedata.integtests.FakeDataModuleIntegTestAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
diff --git a/testing/fixtures/pom.xml b/testing/fixtures/applib/pom.xml
similarity index 88%
copy from testing/fixtures/pom.xml
copy to testing/fixtures/applib/pom.xml
index a296ae2..8d1d173 100644
--- a/testing/fixtures/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -16,18 +16,16 @@
<parent>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
+ <artifactId>isis-testing-fixtures</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-testing-fixtures</artifactId>
- <name>Apache Isis Testing - Fixtures</name>
- <description></description>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
+ <name>Apache Isis Testing - Fixtures (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.testing.fixtures</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/testing/fixtures</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.testing.fixtures.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/testing/fixtures/applib</git-plugin.propertiesDir>
</properties>
<build>
@@ -68,7 +66,7 @@
<version>${jdo-api.version}</version>
<!-- provided by plugins -->
<scope>provided</scope>
- </dependency>
+ </dependency>p
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
similarity index 85%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
index 4bda40b..b3520fc 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisIntegrationTestAbstractWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures;
+package org.apache.isis.testing.fixtures.applib;
import javax.inject.Inject;
@@ -24,12 +24,12 @@ import org.joda.time.LocalDate;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
-import org.apache.isis.extensions.fixtures.legacy.TickingFixtureClock;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
+import org.apache.isis.testing.fixtures.applib.legacy.TickingFixtureClock;
import org.apache.isis.integtestsupport.IsisIntegrationTestAbstract;
public abstract class IsisIntegrationTestAbstractWithFixtures extends IsisIntegrationTestAbstract {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTstFixturesApplib.java
similarity index 72%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTstFixturesApplib.java
index 4c2c7df..de8ea35 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/IsisModuleExtFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisModuleTstFixturesApplib.java
@@ -16,16 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures;
+package org.apache.isis.testing.fixtures.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.fixtures.fixturescripts.ExecutionParametersService;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.legacy.queryresultscache.QueryResultsCacheControlDefault;
-import org.apache.isis.extensions.fixtures.modules.ModuleWithFixturesService;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.ExecutionParametersService;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.legacy.queryresultscache.QueryResultsCacheControlDefault;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
import org.apache.isis.subdomains.spring.applib.IsisModuleSubSpringApplib;
+import org.apache.isis.testing.fixtures.applib.services.FixturesLifecycleService;
@Configuration
@Import({
@@ -41,6 +42,6 @@ import org.apache.isis.subdomains.spring.applib.IsisModuleSubSpringApplib;
// @DomainService's
FixtureScripts.class,
})
-public class IsisModuleExtFixtures {
+public class IsisModuleTstFixturesApplib {
}
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/FixtureScriptWithExecutionStrategy.java
similarity index 85%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/FixtureScriptWithExecutionStrategy.java
index 5121cb5..2b1ffb5 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/FixtureScriptWithExecutionStrategy.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/FixtureScriptWithExecutionStrategy.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.api;
+package org.apache.isis.testing.fixtures.applib.api;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecification;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecification;
/**
* Overrides the {@link FixtureScriptsSpecification#getMultipleExecutionStrategy() globally-defined}
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithBuilderScript.java
similarity index 87%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithBuilderScript.java
index a1f3af6..1cf7f55 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithBuilderScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithBuilderScript.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.api;
+package org.apache.isis.testing.fixtures.applib.api;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
public interface PersonaWithBuilderScript<T extends BuilderScriptAbstract<?>> {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithFinder.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithFinder.java
index 1e0a1ab..e29b1a2 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/PersonaWithFinder.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/PersonaWithFinder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.api;
+package org.apache.isis.testing.fixtures.applib.api;
import org.apache.isis.applib.services.registry.ServiceRegistry;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/WithPrereqs.java
similarity index 84%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/WithPrereqs.java
index cb3392a..b11455a 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/WithPrereqs.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/WithPrereqs.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.api;
+package org.apache.isis.testing.fixtures.applib.api;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public interface WithPrereqs<T> {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/package-info.java
similarity index 95%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/package-info.java
index 56f6153..da3e2f0 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/api/package-info.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/api/package-info.java
@@ -23,4 +23,4 @@
*
* @see <a href="http://isis.apache.org/guides/ugtst/ugtst.html#_ugtst_fixture-scripts">Testing guide</a>.
*/
-package org.apache.isis.extensions.fixtures.api;
\ No newline at end of file
+package org.apache.isis.testing.fixtures.applib.api;
\ No newline at end of file
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstalledEvent.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstalledEvent.java
index 25d191e..1de48d0 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstalledEvent.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstalledEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.fixtures.events;
+package org.apache.isis.testing.fixtures.applib.events;
import org.apache.isis.applib.events.domain.EventObjectBase;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstallingEvent.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstallingEvent.java
index 9321fc0..f34dab3 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/events/FixturesInstallingEvent.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/events/FixturesInstallingEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.fixtures.events;
+package org.apache.isis.testing.fixtures.applib.events;
import org.apache.isis.applib.events.domain.EventObjectBase;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
similarity index 90%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
index d15dce7..5d5f3b7 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptAbstract.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.api.PersonaWithFinder;
-import org.apache.isis.extensions.fixtures.api.WithPrereqs;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithFinder;
+import org.apache.isis.testing.fixtures.applib.api.WithPrereqs;
import lombok.Getter;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithResult.java
similarity index 95%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithResult.java
index e913f88..d8fbfb1 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithResult.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithResult.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithoutResult.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithoutResult.java
index 3bb0ff8..0a8f4b1 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/BuilderScriptWithoutResult.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptWithoutResult.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
/**
*
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
similarity index 99%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
index 3308dc9..e0b95ca 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParametersService.java
similarity index 83%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParametersService.java
index 8a70209..944e470 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParametersService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParametersService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import javax.inject.Named;
@@ -29,8 +29,8 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
/**
- * Acts as a factory by the {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts} when
- * instantiating the {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext}.
+ * Acts as a factory by the {@link FixtureScripts} when
+ * instantiating the {@link FixtureScript.ExecutionContext}.
*
* <p>
* Factoring this out as a service potentially allows for extensions to parsing; and also acts as an
@@ -39,7 +39,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
* </p>
*/
@Service
-@Named("isisExtFixtures.ExecutionParametersService")
+@Named("isisTstFixtures.ExecutionParametersService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java
similarity index 97%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java
index 3933718..5a696d0 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import javax.inject.Inject;
import javax.xml.bind.annotation.XmlAccessType;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.layout.xml
similarity index 100%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResult.layout.xml
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.layout.xml
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
similarity index 81%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
index ec6248b..3703149 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureResultList.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.Collections;
import java.util.List;
@@ -56,17 +56,17 @@ public class FixtureResultList {
* that any given fixture script instance is only executed once.
*
* <p>
- * (The {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.MultipleExecutionStrategy} in contrast
+ * (The {@link FixtureScripts.MultipleExecutionStrategy} in contrast
* controls whether two instances of the same class can be executed).
* </p>
*
* <p>
* REVIEW: I think this should probably be removed; it certainly does nothing if
- * {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.MultipleExecutionStrategy#IGNORE} is set,
+ * {@link FixtureScripts.MultipleExecutionStrategy#IGNORE} is set,
* and is arguably counter to the spirit of
- * {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.MultipleExecutionStrategy#EXECUTE} being set.
+ * {@link FixtureScripts.MultipleExecutionStrategy#EXECUTE} being set.
* </p>
- * {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript}s used to generate this result list.
+ * {@link FixtureScript}s used to generate this result list.
*/
private final List<FixtureScript> fixtureScriptList = _Lists.newArrayList();
@@ -77,12 +77,12 @@ public class FixtureResultList {
}
/**
- * Wraps the object within a {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult} and add to this list.
+ * Wraps the object within a {@link FixtureResult} and add to this list.
*
* <P>
* If the object is not yet persisted, then the {@link FixtureScripts#getNonPersistedObjectsStrategy() FixtureScripts}'
- * configuration will determine whether it is {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.NonPersistedObjectsStrategy#PERSIST eagerly persisted}
- * or simply {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts.NonPersistedObjectsStrategy#IGNORE ignored}.
+ * configuration will determine whether it is {@link FixtureScripts.NonPersistedObjectsStrategy#PERSIST eagerly persisted}
+ * or simply {@link FixtureScripts.NonPersistedObjectsStrategy#IGNORE ignored}.
* </P>
*/
public <T> T add(final FixtureScript fixtureScript, final String key, final T object) {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
similarity index 96%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
index ce4dad3..63db2a3 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -50,9 +50,9 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.api.WithPrereqs;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.api.WithPrereqs;
import lombok.Getter;
import lombok.Setter;
@@ -137,7 +137,7 @@ public abstract class FixtureScript {
public static class ExecutionContext {
/**
- * Null implementation, to assist with unit testing of {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript}s.
+ * Null implementation, to assist with unit testing of {@link FixtureScript}s.
*/
public static final ExecutionContext NOOP = new ExecutionContext((String)null, null) {
@Override
@@ -391,7 +391,7 @@ public abstract class FixtureScript {
/**
* Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
- * that are {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+ * that are {@link FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that is derived from the fixture's class name.
*/
@Programmatic
@@ -441,7 +441,7 @@ public abstract class FixtureScript {
/**
* Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
- * that are {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+ * that are {@link FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that is derived from the fixture's class name.
*
* @return the child fixture script.
@@ -453,7 +453,7 @@ public abstract class FixtureScript {
/**
* Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
- * that are {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+ * that are {@link FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that overriding the default name of the fixture script with one more meaningful in the context of this fixture.
*/
@Programmatic
@@ -470,7 +470,7 @@ public abstract class FixtureScript {
/**
* Executes a child {@link FixtureScript fixture script}, injecting services into it first, and (for any results
- * that are {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
+ * that are {@link FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that overriding the default name of the fixture script with one more meaningful in the context of this fixture.
*
* @return the child fixture script.
@@ -707,7 +707,7 @@ public abstract class FixtureScript {
private ExecutionContext executionContext;
/**
- * Entry point for {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts}
+ * Entry point for {@link FixtureScripts}
* service to call.
*
* <p>
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
similarity index 97%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index 219562a..b5fddf2 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.List;
import java.util.Map;
@@ -55,11 +55,11 @@ import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.events.FixturesInstalledEvent;
-import org.apache.isis.extensions.fixtures.events.FixturesInstallingEvent;
-import org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecification;
-import org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecificationProvider;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.events.FixturesInstalledEvent;
+import org.apache.isis.testing.fixtures.applib.events.FixturesInstallingEvent;
+import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecification;
+import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecificationProvider;
import lombok.Getter;
import lombok.Setter;
@@ -82,7 +82,7 @@ public class FixtureScripts extends AbstractService {
/**
* How to handle objects that are to be
* {@link FixtureScripts#newFixtureResult(FixtureScript, String, Object, boolean) added}
- * into a {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureResult} but which are not yet persisted.
+ * into a {@link FixtureResult} but which are not yet persisted.
*/
public enum NonPersistedObjectsStrategy {
PERSIST,
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecification.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecification.java
index 4efa2af..5a320c9 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecification.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecification.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturespec;
+package org.apache.isis.testing.fixtures.applib.fixturespec;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureResultList;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResultList;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
/**
* Pulls together the various state that influences the behaviour of {@link FixtureScripts} service.
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecificationProvider.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecificationProvider.java
index 39e9b64..b327fd2 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/FixtureScriptsSpecificationProvider.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/FixtureScriptsSpecificationProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturespec;
+package org.apache.isis.testing.fixtures.applib.fixturespec;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/package-info.java
similarity index 78%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/package-info.java
index 5334d2b..ed3c294 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/fixturespec/package-info.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturespec/package-info.java
@@ -18,8 +18,8 @@
*/
/**
- * The {@link org.apache.isis.extensions.fixtures.fixturespec.FixtureScriptsSpecificationProvider} SPI service configures the {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts} domain service.
+ * The {@link org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecificationProvider} SPI service configures the {@link org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts} domain service.
*
* @see <a href="http://isis.apache.org/migration-notes/migration-notes.html#_migration-notes_1.8.0-to-1.9.0_fixture-scripts-specification-provider">Reference guide</a>
*/
-package org.apache.isis.extensions.fixtures.fixturespec;
\ No newline at end of file
+package org.apache.isis.testing.fixtures.applib.fixturespec;
\ No newline at end of file
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClock.java
similarity index 99%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClock.java
index e771f7b..2e023ef 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/FixtureClock.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClock.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy;
+package org.apache.isis.testing.fixtures.applib.legacy;
import java.time.Instant;
import java.util.Calendar;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/TickingFixtureClock.java
similarity index 98%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/TickingFixtureClock.java
index d741c69..275fbc0 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/TickingFixtureClock.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/TickingFixtureClock.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy;
+package org.apache.isis.testing.fixtures.applib.legacy;
import java.sql.Timestamp;
import java.time.Instant;
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/ClockFixture.java
similarity index 91%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/ClockFixture.java
index 9374794..3537c18 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/ClockFixture.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/ClockFixture.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.clock;
+package org.apache.isis.testing.fixtures.applib.legacy.clock;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
@@ -25,10 +25,10 @@ import org.joda.time.format.DateTimeFormatter;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
@Programmatic
class ClockFixture extends FixtureScript implements FixtureScriptWithExecutionStrategy {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/TickingClockFixture.java
similarity index 90%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/TickingClockFixture.java
index 5006c2c..c031f16 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/clock/TickingClockFixture.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/clock/TickingClockFixture.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.clock;
+package org.apache.isis.testing.fixtures.applib.legacy.clock;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
@@ -25,11 +25,11 @@ import org.joda.time.format.DateTimeFormatter;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
-import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
-import org.apache.isis.extensions.fixtures.legacy.TickingFixtureClock;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
+import org.apache.isis.testing.fixtures.applib.legacy.TickingFixtureClock;
@Programmatic
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/package-info.java
similarity index 91%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/package-info.java
index 1ce74fb..a9a89e5 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/package-info.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/package-info.java
@@ -22,7 +22,7 @@
* interface and supporting classes.
*
* <p>
- * <b>NOTE THAT</b> {@link org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript} interface provides a more complete
+ * <b>NOTE THAT</b> {@link org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript} interface provides a more complete
* approach to handling fixtures, and should generally be used in preference to
* {@link org.apache.isis.extensions.fixtures.legacy.InstallableFixture}.
* </p>
@@ -42,4 +42,4 @@
* </ul>
*
*/
-package org.apache.isis.extensions.fixtures.legacy;
\ No newline at end of file
+package org.apache.isis.testing.fixtures.applib.legacy;
\ No newline at end of file
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/queryresultscache/QueryResultsCacheControlDefault.java
similarity index 87%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/queryresultscache/QueryResultsCacheControlDefault.java
index b835a7e..6a96e39 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/queryresultscache/QueryResultsCacheControlDefault.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/queryresultscache/QueryResultsCacheControlDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.queryresultscache;
+package org.apache.isis.testing.fixtures.applib.legacy.queryresultscache;
import javax.inject.Named;
@@ -29,15 +29,15 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.queryresultscache.QueryResultCacheControl;
import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
-import org.apache.isis.extensions.fixtures.events.FixturesInstalledEvent;
-import org.apache.isis.extensions.fixtures.events.FixturesInstallingEvent;
+import org.apache.isis.testing.fixtures.applib.events.FixturesInstalledEvent;
+import org.apache.isis.testing.fixtures.applib.events.FixturesInstallingEvent;
/**
* In separate class because {@link QueryResultsCache} itself is request-scoped
*/
@Service
-@Named("isisExtFixtures.QueryResultsCacheControlDefault")
+@Named("isisTstFixtures.QueryResultsCacheControlDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
similarity index 84%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
index cd67a3d..d71d045 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/setup/PersonaEnumPersistAll.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
@@ -16,21 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.setup;
+package org.apache.isis.testing.fixtures.applib.legacy.setup;
import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.extensions.fixtures.api.FixtureScriptWithExecutionStrategy;
-import org.apache.isis.extensions.fixtures.api.PersonaWithBuilderScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.BuilderScriptAbstract;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts;
+import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
+import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
@Programmatic
public class PersonaEnumPersistAll<
-E extends Enum<E> & PersonaWithBuilderScript<? extends BuilderScriptAbstract<T>>,
+E extends Enum<E> & PersonaWithBuilderScript<? extends BuilderScriptAbstract<T>>,
T>
extends FixtureScript
implements FixtureScriptWithExecutionStrategy {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
similarity index 98%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
index 3003d5a..16e186c 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.teardown;
+package org.apache.isis.testing.fixtures.applib.legacy.teardown;
import javax.inject.Inject;
import javax.jdo.PersistenceManagerFactory;
@@ -28,7 +28,7 @@ import javax.jdo.metadata.TypeMetadata;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
@Programmatic
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract2.java
similarity index 93%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract2.java
index 6b6465c..ec1deb8 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/legacy/teardown/TeardownFixtureAbstract2.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract2.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy.teardown;
+package org.apache.isis.testing.fixtures.applib.legacy.teardown;
public abstract class TeardownFixtureAbstract2 extends TeardownFixtureAbstract {
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
similarity index 94%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
index 4158106..391e859 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
@@ -1,9 +1,9 @@
-package org.apache.isis.extensions.fixtures.modules;
+package org.apache.isis.testing.fixtures.applib.modules;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
/**
* A module is a class that implements this {@link ModuleWithFixtures} interface, but in addition is expected to be annotated with
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
similarity index 97%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
index b586331..9cb0005 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/modules/ModuleWithFixturesService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.modules;
+package org.apache.isis.testing.fixtures.applib.modules;
import java.util.ArrayList;
import java.util.Arrays;
@@ -39,7 +39,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.subdomains.spring.applib.service.BeanDescriptor;
import org.apache.isis.subdomains.spring.applib.service.ContextBeans;
import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
@@ -50,7 +50,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisExtFixtures.ModuleService")
+@Named("isisTstFixtures.ModuleService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
similarity index 93%
rename from testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
rename to testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
index 5facc2b..23283e2 100644
--- a/testing/fixtures/src/main/java/org/apache/isis/extensions/fixtures/FixturesLifecycleService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures;
+package org.apache.isis.testing.fixtures.applib.services;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
@@ -31,11 +31,11 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
-import org.apache.isis.extensions.fixtures.legacy.FixtureClock;
+import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
import org.apache.isis.runtime.session.IsisSessionFactory;
@Service
-@Named("isisExtFixtures.FixturesLifecycleService")
+@Named("isisTstFixtures.FixturesLifecycleService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/testing/fixtures/src/main/resources/prism.css b/testing/fixtures/applib/src/main/resources/prism.css
similarity index 100%
rename from testing/fixtures/src/main/resources/prism.css
rename to testing/fixtures/applib/src/main/resources/prism.css
diff --git a/testing/fixtures/src/main/resources/prism1.14.js b/testing/fixtures/applib/src/main/resources/prism1.14.js
similarity index 100%
rename from testing/fixtures/src/main/resources/prism1.14.js
rename to testing/fixtures/applib/src/main/resources/prism1.14.js
diff --git a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionContextTest.java
similarity index 98%
rename from testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
rename to testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionContextTest.java
index 12cdf49..36747f8 100644
--- a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionContextTest.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionContextTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.Map;
diff --git a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
similarity index 97%
rename from testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
rename to testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
index e7183b4..3dc8ab0 100644
--- a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_AsKeyValueMap_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.Map;
diff --git a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_Test.java
similarity index 99%
rename from testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
rename to testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_Test.java
index c29ab80..44a1057 100644
--- a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/fixturescripts/ExecutionParameters_Test.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.fixtures.fixturescripts;
+package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClockInstantiationTest.java
similarity index 92%
rename from testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
rename to testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClockInstantiationTest.java
index 0d30744..f4913ad 100644
--- a/testing/fixtures/src/test/java/org/apache/isis/extensions/fixtures/legacy/FixtureClockInstantiationTest.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/legacy/FixtureClockInstantiationTest.java
@@ -17,8 +17,9 @@
* under the License.
*/
-package org.apache.isis.extensions.fixtures.legacy;
+package org.apache.isis.testing.fixtures.applib.legacy;
+import org.hamcrest.CoreMatchers;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +46,7 @@ public class FixtureClockInstantiationTest {
public void canInitializeFixtureClockMultipleTimesButAlwaysGetTheSameFixtureClock() {
final FixtureClock fixtureClock1 = FixtureClock.initialize();
final FixtureClock fixtureClock2 = FixtureClock.initialize();
- assertThat(fixtureClock1, is(fixtureClock2));
+ assertThat(fixtureClock1, CoreMatchers.is(fixtureClock2));
}
@Test
diff --git a/testing/fixtures/pom.xml b/testing/fixtures/pom.xml
index a296ae2..b02bff5 100644
--- a/testing/fixtures/pom.xml
+++ b/testing/fixtures/pom.xml
@@ -18,76 +18,18 @@
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>isis-testing-fixtures</artifactId>
- <name>Apache Isis Testing - Fixtures</name>
- <description></description>
+ <name>Apache Isis Testing - Fixtures (parent)</name>
+ <description>
+ Library to initialize the system under test, either for integration testing or for prototyping.
+ </description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.testing.fixtures</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/testing/fixtures</git-plugin.propertiesDir>
- </properties>
+ <packaging>pom</packaging>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring-applib</artifactId>
- </dependency>
-
- <!-- JDO API (non transient, provided by plugin) -->
- <dependency>
- <groupId>javax.jdo</groupId>
- <artifactId>jdo-api</artifactId>
- <version>${jdo-api.version}</version>
- <!-- provided by plugins -->
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-persistence-jdo-applib</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-integtestsupport</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>applib</module>
+ </modules>
</project>
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 7aa48b2..07a7249 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -44,7 +44,7 @@ import lombok.Getter;
import lombok.val;
@Service
-@Named("isisExtH2Console.WebModuleH2Console")
+@Named("isisTstH2Console.WebModuleH2Console")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("H2Console")
public class WebModuleH2Console extends WebModuleAbstract {
diff --git a/testing/pom.xml b/testing/pom.xml
index 6a45751..4158d04 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -118,10 +118,10 @@
<modules>
<module>fakedata</module>
+ <module>fixtures</module>
<module>h2console</module>
<module>hsqldbmgr</module>
- <module>fixtures</module>
<module>specsupport</module>
<module>unittestsupport/impl</module>
</modules>
diff --git a/testing/specsupport/pom.xml b/testing/specsupport/pom.xml
index e4457af..b464493 100644
--- a/testing/specsupport/pom.xml
+++ b/testing/specsupport/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
</dependency>
<!-- TESTING -->
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index d5314a8..d984405 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures</artifactId>
+ <artifactId>isis-testing-fixtures-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
index eac8a9a..0a9be80 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
+++ b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
@@ -63,7 +63,7 @@ import lombok.extern.log4j.Log4j2;
*
*/
@Service
-@Named("isisExtSse.SseServiceDefault")
+@Named("isisValSse.SseServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
index cb33df2..e0c03d1 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
+++ b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
@@ -42,7 +42,7 @@ import lombok.Getter;
* @since 2.0
*/
@Service
-@Named("isisExtSse.WebModuleServerSentEvents")
+@Named("isisValSse.WebModuleServerSentEvents")
@Qualifier("ServerSentEvents")
@Order(OrderPrecedence.MIDPOINT)
public final class WebModuleServerSentEvents extends WebModuleAbstract {