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 18:35:37 UTC
[isis] 12/14: ISIS-2259: fixing further unit tests
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f3e2749cd17387fcf59b704cd22008e1c76be3ac
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 17:58:14 2020 +0000
ISIS-2259: fixing further unit tests
---
.../base/applib/utils/ClassUtilsTest.java | 6 +++---
subdomains/base/pom.xml | 2 +-
.../excel/fixtures/IsisModuleSubExcelFixtures.java | 12 +++++------
.../contributions/ExcelDemoToDoItem_export2.java | 2 +-
.../BulkUpdateLineItemForDemoToDoItem.java | 13 +++++++++++-
.../BulkUpdateManagerForDemoToDoItem.java | 12 ++++++++---
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 19 +++++++++++------
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 8 ++++----
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 7 ++++++-
.../demotodoitem/DemoToDoItemRowHandler.java | 4 ++--
.../demotodoitem/DemoToDoItemRowHandler2.java | 6 +++---
.../ExcelUploadRowHandler4ToDoItem.java | 4 ++--
.../ExcelUploadServiceForDemoToDoItem.java | 8 +++++++-
.../DemoFixture_extending_ExcelFixture2.java | 6 +++---
.../DemoToDoItem_create_usingExcelFixture.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 2 +-
.../ExcelDemoToDoItem_tearDown2.java | 2 +-
.../integtests/ExcelModuleIntegTestAbstract.java | 21 ++++++++++---------
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 2 +-
.../ExcelModuleDemoUploadService_IntegTest.java | 2 +-
subdomains/excel/integtests/translations.pot | 16 +++++++--------
subdomains/xdocreport/applib/pom.xml | 2 +-
.../applib/service/XDocReportServiceTest.java | 2 +-
subdomains/xdocreport/pom.xml | 2 +-
testing/fakedata/applib/pom.xml | 2 +-
testing/fakedata/fixtures/pom.xml | 2 +-
testing/fakedata/integtests/pom.xml | 2 +-
.../FakeDataModuleIntegTestAbstract.java | 24 +++++++++++-----------
.../fakedata/integtests/tests/Smoke_IntegTest.java | 12 +++++------
testing/fakedata/pom.xml | 2 +-
testing/fixtures/applib/pom.xml | 2 +-
testing/fixtures/pom.xml | 2 +-
testing/h2console/pom.xml | 2 +-
testing/h2console/ui/pom.xml | 2 +-
testing/hsqldbmgr/pom.xml | 2 +-
testing/hsqldbmgr/ui/pom.xml | 2 +-
testing/integtestsupport/applib/pom.xml | 2 +-
testing/integtestsupport/pom.xml | 2 +-
testing/specsupport/applib/pom.xml | 2 +-
testing/specsupport/pom.xml | 2 +-
testing/unittestsupport/applib/pom.xml | 2 +-
testing/unittestsupport/pom.xml | 2 +-
.../sse/applib/IsisModuleValSseApplib.java | 13 ------------
.../ListeningMarkupPanelFactoriesForWicket.java | 1 +
44 files changed, 134 insertions(+), 110 deletions(-)
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java
index 02633f0..4bfd09a 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java
@@ -34,8 +34,8 @@ public class ClassUtilsTest {
@Test
public void doesNotExist() throws Exception {
thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage("Class 'org.incode.module.base.dom.utils.SomeNonExistentClass' not found");
- final Class<? extends SomeClass> cls = ClassUtils.load("org.incode.module.base.dom.utils.SomeNonExistentClass", SomeClass.class);
+ thrown.expectMessage("Class 'org.apache.isis.subdomains.base.applib.utils.SomeNonExistentClass' not found");
+ final Class<? extends SomeClass> cls = ClassUtils.load("org.apache.isis.subdomains.base.applib.utils.SomeNonExistentClass", SomeClass.class);
assertThat(cls, is(not(nullValue())));
}
@@ -48,7 +48,7 @@ public class ClassUtilsTest {
@Test
public void existsAndIsNotASubclass() throws Exception {
thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage("Class 'org.apache.isis.extensions.base.dom.utils.ClassUtilsTest$Load$SomeOtherClass' not a subclass of org.apache.isis.extensions.base.dom.utils.ClassUtilsTest$Load$SomeClass");
+ thrown.expectMessage("Class 'org.apache.isis.subdomains.base.applib.utils.ClassUtilsTest$Load$SomeOtherClass' not a subclass of org.apache.isis.subdomains.base.applib.utils.ClassUtilsTest$Load$SomeClass");
final Class<? extends SomeClass> cls = ClassUtils.load(SomeOtherClass.class.getName(), SomeClass.class);
assertThat(cls, is(not(nullValue())));
}
diff --git a/subdomains/base/pom.xml b/subdomains/base/pom.xml
index ec52bfe..a2ec1d8 100644
--- a/subdomains/base/pom.xml
+++ b/subdomains/base/pom.xml
@@ -10,7 +10,7 @@
<artifactId>isis-subdomains-base</artifactId>
- <name>Apache Isis Sub - Base (applib)</name>
+ <name>Apache Isis Sub - Base (parent)</name>
<description>
A module providing Base utilities for other subdomain modules
</description>
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 b9ef710..a743477 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
@@ -4,19 +4,19 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.excel.ExcelModule;
+import org.apache.isis.subdomains.excel.applib.IsisModuleSubExcelApplib;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.modules.Module;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
@Configuration
@Import({
- ExcelModule.class,
- IsisExtFixturesModule.class
+ IsisModuleSubExcelApplib.class,
+ IsisModuleTstFixturesApplib.class
})
@ComponentScan
-public class IsisModuleSubExcelFixtures implements Module {
+public class IsisModuleSubExcelFixtures implements ModuleWithFixtures {
@Override public FixtureScript getTeardownFixture() {
return new ExcelDemoToDoItem_tearDown();
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
index 99d1452..e5ee13d 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
@@ -7,7 +7,7 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
index b93efed..80d3b49 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
@@ -5,7 +5,18 @@ import java.time.LocalDate;
import javax.inject.Inject;
import javax.jdo.annotations.Column;
-
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.user.UserService;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index b562f7d..2e2f930 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -5,6 +5,11 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -22,9 +27,10 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.dom.WorksheetContent;
-import org.apache.isis.extensions.excel.dom.WorksheetSpec;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
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.Subcategory;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
index ec358cf..a1da3b8 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
@@ -1,12 +1,19 @@
package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
import javax.inject.Inject;
+import javax.xml.bind.annotation.XmlTransient;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
@@ -32,10 +39,10 @@ public class BulkUpdateMenuForDemoToDoItem {
}
- @Inject private RepositoryService repositoryService;
- @Inject private FactoryService factoryService;
- @Inject private UserService userService;
- @Inject private ExcelService excelService;
- @Inject private BookmarkService bookmarkService;
+ @XmlTransient @Inject private RepositoryService repositoryService;
+ @XmlTransient @Inject private FactoryService factoryService;
+ @XmlTransient @Inject private UserService userService;
+ @XmlTransient @Inject private ExcelService excelService;
+ @XmlTransient @Inject private BookmarkService bookmarkService;
}
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
index 0cdf79a..4eb68b9 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
@@ -4,10 +4,10 @@ import java.math.BigDecimal;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.extensions.excel.dom.AggregationType;
-import org.apache.isis.extensions.excel.dom.PivotColumn;
-import org.apache.isis.extensions.excel.dom.PivotRow;
-import org.apache.isis.extensions.excel.dom.PivotValue;
+import org.apache.isis.subdomains.excel.applib.dom.AggregationType;
+import org.apache.isis.subdomains.excel.applib.dom.PivotColumn;
+import org.apache.isis.subdomains.excel.applib.dom.PivotRow;
+import org.apache.isis.subdomains.excel.applib.dom.PivotValue;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
index 3b3c022..e6b1d3f 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
@@ -5,9 +5,14 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
@DomainService(
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 188f9a0..50ec857 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
@@ -9,8 +9,8 @@ import javax.inject.Inject;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.extensions.excel.dom.ExcelFixture;
-import org.apache.isis.extensions.excel.dom.ExcelFixtureRowHandler;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture;
+import org.apache.isis.subdomains.excel.testing.ExcelFixtureRowHandler;
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;
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 1f77de6..e4e0aa3 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
@@ -2,9 +2,9 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehand
import java.math.BigDecimal;
-import org.apache.isis.extensions.excel.dom.ExcelFixture2;
-import org.apache.isis.extensions.excel.dom.ExcelMetaDataEnabled;
-import org.apache.isis.extensions.excel.dom.FixtureAwareRowHandler;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture2;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelMetaDataEnabled;
+import org.apache.isis.subdomains.excel.testing.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.testing.fixtures.applib.fixturescripts.FixtureScript;
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 24b1f45..50a1949 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
@@ -14,8 +14,8 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.extensions.excel.dom.ExcelFixture;
-import org.apache.isis.extensions.excel.dom.ExcelFixtureRowHandler;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture;
+import org.apache.isis.subdomains.excel.testing.ExcelFixtureRowHandler;
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;
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 c80acb2..40b3efa 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
@@ -4,8 +4,14 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Parameter;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelFixture;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
index 4bddf70..7a308df 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
@@ -3,10 +3,10 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescri
import com.google.common.io.Resources;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.extensions.excel.dom.ExcelFixture2;
-import org.apache.isis.extensions.excel.dom.WorksheetSpec;
-import org.apache.isis.extensions.excel.dom.util.Mode;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.subdomains.excel.applib.dom.util.Mode;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture2;
import lombok.Getter;
import lombok.Setter;
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 e5b9565..f159d50 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
@@ -10,7 +10,7 @@ import com.google.common.io.Resources;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.extensions.excel.dom.ExcelFixture;
+import org.apache.isis.subdomains.excel.testing.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.testing.fixtures.applib.fixturescripts.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 aea4c93..27841e5 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
@@ -4,7 +4,7 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
+import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
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;
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 3a6dd12..48b5ac7 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
@@ -2,7 +2,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.persistence.jdo.applib.services.IsisJdoSupport;
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 d53c135..04cdd8f 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
@@ -6,15 +6,16 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubExcelFixtures;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.core.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
@SpringBootTest(
classes = ExcelModuleIntegTestAbstract.AppManifest.class
@@ -31,13 +32,13 @@ public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAb
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisBoot.class,
- IsisBootSecurityBypass.class,
- IsisBootDataNucleus.class,
- IsisExtFixturesModule.class,
+ IsisModuleCoreWebSpringBoot.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleTstFixturesApplib.class,
/*
- new ExcelFixturesModule(),
+ new ExcelFixturesModule(),
FakeDataModule.class
*/
IsisModuleSubExcelFixtures.class
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
index 1865a0a..e8a1650 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
@@ -18,7 +18,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
index 30bd8cf..bd02fcf 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
@@ -12,7 +12,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.util.ExcelFileBlobConverter;
+import org.apache.isis.subdomains.excel.applib.dom.util.ExcelFileBlobConverter;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload.ExcelUploadServiceForDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/subdomains/excel/integtests/translations.pot b/subdomains/excel/integtests/translations.pot
index ffb722d..a973b91 100644
--- a/subdomains/excel/integtests/translations.pot
+++ b/subdomains/excel/integtests/translations.pot
@@ -263,8 +263,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.FixtureScript#downloadLayoutXml()
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript#downloadLayoutXml()
#: org.apache.isis.applib.services.config.ConfigurationProperty#downloadLayoutXml()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture#downloadLayoutXml()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture2#downloadLayoutXml()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture#downloadLayoutXml()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture2#downloadLayoutXml()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem#downloadLayoutXml()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem#downloadLayoutXml()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot.ExcelPivotByCategoryAndSubcategory#downloadLayoutXml()
@@ -533,8 +533,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript#openRestApi()
#: org.apache.isis.applib.services.config.ConfigurationProperty#openRestApi()
#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#openRestApi()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture#openRestApi()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture2#openRestApi()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture#openRestApi()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture2#openRestApi()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem#openRestApi()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem#openRestApi()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot.ExcelPivotByCategoryAndSubcategory#openRestApi()
@@ -659,8 +659,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.FixtureScript#rebuildMetamodel()
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript#rebuildMetamodel()
#: org.apache.isis.applib.services.config.ConfigurationProperty#rebuildMetamodel()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture#rebuildMetamodel()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture2#rebuildMetamodel()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture#rebuildMetamodel()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture2#rebuildMetamodel()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem#rebuildMetamodel()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem#rebuildMetamodel()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot.ExcelPivotByCategoryAndSubcategory#rebuildMetamodel()
@@ -711,8 +711,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.DiscoverableFixtureScript
#: org.apache.isis.applib.fixturescripts.FixtureScript
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript
-#: org.apache.isis.extensions.excel.dom.ExcelFixture
-#: org.apache.isis.extensions.excel.dom.ExcelFixture2
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture2
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_create_usingExcelFixture
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture
diff --git a/subdomains/xdocreport/applib/pom.xml b/subdomains/xdocreport/applib/pom.xml
index 4b12354..e98a695 100644
--- a/subdomains/xdocreport/applib/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-subdomains-xdocreport-applib</artifactId>
- <name>Apache Isis Sub - xdocreport (applib)</name>
+ <name>Apache Isis Sub - XdocReport (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.subdomains.xdocreport.applib</jar-plugin.automaticModuleName>
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
index c6df8d8..741e672 100644
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
@@ -38,7 +38,7 @@ public class XDocReportServiceTest {
public void simple() throws Exception {
// given
- InputStream in= new FileInputStream(new File("src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx"));
+ InputStream in= new FileInputStream(new File("src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx"));
final byte[] templateBytes = IOUtils.toByteArray(in);
Project project = new Project("XDocReport");
diff --git a/subdomains/xdocreport/pom.xml b/subdomains/xdocreport/pom.xml
index 8068baf..03f34b0 100644
--- a/subdomains/xdocreport/pom.xml
+++ b/subdomains/xdocreport/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-subdomains-xdocreport</artifactId>
- <name>Apache Isis Sub - xdocreport (parent)</name>
+ <name>Apache Isis Sub - XdocReport (parent)</name>
<description>Integrates XDoc Report Library</description>
<packaging>pom</packaging>
diff --git a/testing/fakedata/applib/pom.xml b/testing/fakedata/applib/pom.xml
index 257c94f..40f9559 100644
--- a/testing/fakedata/applib/pom.xml
+++ b/testing/fakedata/applib/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>isis-testing-fakedata-applib</artifactId>
- <name>Apache Isis Testing - FakeData (applib)</name>
+ <name>Apache Isis Tst - FakeData (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.fakedata.applib</jar-plugin.automaticModuleName>
diff --git a/testing/fakedata/fixtures/pom.xml b/testing/fakedata/fixtures/pom.xml
index a1f9231..cf6dcfc 100644
--- a/testing/fakedata/fixtures/pom.xml
+++ b/testing/fakedata/fixtures/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>isis-testing-fakedata-fixtures</artifactId>
- <name>Apache Isis Testing - FakeData (Fixtures)</name>
+ <name>Apache Isis Tst - FakeData (fixtures)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.fakedata.fixtures</jar-plugin.automaticModuleName>
diff --git a/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
index d8ca296..3d64a2d 100644
--- a/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -10,7 +10,7 @@
</parent>
<artifactId>isis-testing-fakedata-integtests</artifactId>
- <name>Apache Isis Testing - FakeData (Integ Tests)</name>
+ <name>Apache Isis Tst - FakeData (integ tests)</name>
<properties>
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 a26f069..ba4252e 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
@@ -7,16 +7,16 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.isis.config.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
+import org.apache.isis.testing.fakedata.fixtures.IsisModuleTstFakeDataFixtures;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.core.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
-
-import org.isisaddons.module.fakedata.fixture.FakeDataFixturesModule;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
@SpringBootTest(
classes = FakeDataModuleIntegTestAbstract.AppManifest.class
@@ -33,11 +33,11 @@ public abstract class FakeDataModuleIntegTestAbstract extends IsisIntegrationTes
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisBoot.class,
- IsisBootSecurityBypass.class,
- IsisBootDataNucleus.class,
- IsisExtFixturesModule.class,
- FakeDataFixturesModule.class
+ IsisModuleCoreWebSpringBoot.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleTstFixturesApplib.class,
+ IsisModuleTstFakeDataFixtures.class
})
public static class AppManifest {
}
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 39bf4e6..4b4648b 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
@@ -18,15 +18,15 @@ import org.junit.jupiter.api.Test;
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.extensions.fakedata.dom.services.FakeDataService;
+import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.EnumOf3;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_create3;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_update_withFakeData;
import org.apache.isis.testing.fakedata.integtests.FakeDataModuleIntegTestAbstract;
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;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_create3;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_update_withFakeData;
public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
diff --git a/testing/fakedata/pom.xml b/testing/fakedata/pom.xml
index 72862ae..c7e7275 100644
--- a/testing/fakedata/pom.xml
+++ b/testing/fakedata/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>isis-testing-fakedata</artifactId>
- <name>Apache Isis Testing - FakeData (parent)</name>
+ <name>Apache Isis Tst - FakeData (parent)</name>
<description>
A module providing a domain service to generate fake random data
diff --git a/testing/fixtures/applib/pom.xml b/testing/fixtures/applib/pom.xml
index dcc2009..1ff08a7 100644
--- a/testing/fixtures/applib/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-fixtures-applib</artifactId>
- <name>Apache Isis Testing - Fixtures (applib)</name>
+ <name>Apache Isis Tst - Fixtures (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.fixtures.applib</jar-plugin.automaticModuleName>
diff --git a/testing/fixtures/pom.xml b/testing/fixtures/pom.xml
index b02bff5..11785d7 100644
--- a/testing/fixtures/pom.xml
+++ b/testing/fixtures/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-fixtures</artifactId>
- <name>Apache Isis Testing - Fixtures (parent)</name>
+ <name>Apache Isis Tst - Fixtures (parent)</name>
<description>
Library to initialize the system under test, either for integration testing or for prototyping.
</description>
diff --git a/testing/h2console/pom.xml b/testing/h2console/pom.xml
index 9950716..324c84d 100644
--- a/testing/h2console/pom.xml
+++ b/testing/h2console/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-h2console</artifactId>
- <name>Apache Isis Testing - H2 Console (parent)</name>
+ <name>Apache Isis Tst - H2 Console (parent)</name>
<description>Menu and configuration to open up H2 Console</description>
<packaging>pom</packaging>
diff --git a/testing/h2console/ui/pom.xml b/testing/h2console/ui/pom.xml
index fee82bf..34fe560 100644
--- a/testing/h2console/ui/pom.xml
+++ b/testing/h2console/ui/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-h2console-ui</artifactId>
- <name>Apache Isis Testing - H2 Console (ui)</name>
+ <name>Apache Isis Tst - H2 Console (ui)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.h2console.ui</jar-plugin.automaticModuleName>
diff --git a/testing/hsqldbmgr/pom.xml b/testing/hsqldbmgr/pom.xml
index 43b785b..4d45c3d 100644
--- a/testing/hsqldbmgr/pom.xml
+++ b/testing/hsqldbmgr/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-hsqldbmgr</artifactId>
- <name>Apache Isis Testing - HSQLDB Manager (parent)</name>
+ <name>Apache Isis Tst - HSQLDB Manager (parent)</name>
<description>Menu and configuration to open up HSQLDB Manager</description>
<packaging>pom</packaging>
diff --git a/testing/hsqldbmgr/ui/pom.xml b/testing/hsqldbmgr/ui/pom.xml
index f3d90c7..2912469 100644
--- a/testing/hsqldbmgr/ui/pom.xml
+++ b/testing/hsqldbmgr/ui/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-hsqldbmgr-ui</artifactId>
- <name>Apache Isis Testing - HSQLDB Manager</name>
+ <name>Apache Isis Tst - HSQLDB Manager</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.hsqldbmgr.ui</jar-plugin.automaticModuleName>
diff --git a/testing/integtestsupport/applib/pom.xml b/testing/integtestsupport/applib/pom.xml
index e1322ba..0dfb3b8 100644
--- a/testing/integtestsupport/applib/pom.xml
+++ b/testing/integtestsupport/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-integtestsupport-applib</artifactId>
- <name>Apache Isis Testing - Integ Test Support (applib)</name>
+ <name>Apache Isis Tst - Integ Test Support (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.integtestsupport.applib</jar-plugin.automaticModuleName>
diff --git a/testing/integtestsupport/pom.xml b/testing/integtestsupport/pom.xml
index b1752c8..7f5c8dd 100644
--- a/testing/integtestsupport/pom.xml
+++ b/testing/integtestsupport/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-integtestsupport</artifactId>
- <name>Apache Isis Testing - Integ Test Support (parent)</name>
+ <name>Apache Isis Tst - Integ Test Support (parent)</name>
<description>
Support for writing integ tests in JUnit 5; should be added as a dependency with scope=test only
diff --git a/testing/specsupport/applib/pom.xml b/testing/specsupport/applib/pom.xml
index df9e129..f3018b2 100644
--- a/testing/specsupport/applib/pom.xml
+++ b/testing/specsupport/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-specsupport-applib</artifactId>
- <name>Apache Isis Testing - Spec/Cucumber (applib)</name>
+ <name>Apache Isis Tst - Spec/Cucumber (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.specsupport.applib</jar-plugin.automaticModuleName>
diff --git a/testing/specsupport/pom.xml b/testing/specsupport/pom.xml
index dc5f056..c71e737 100644
--- a/testing/specsupport/pom.xml
+++ b/testing/specsupport/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-specsupport</artifactId>
- <name>Apache Isis Testing - Spec/Cucumber (parent)</name>
+ <name>Apache Isis Tst - Spec/Cucumber (parent)</name>
<description>
Allows Cucumber to be used to write BDD-style specifications, generally as an alternative to integration tests.
</description>
diff --git a/testing/unittestsupport/applib/pom.xml b/testing/unittestsupport/applib/pom.xml
index 91a6301..53df518 100644
--- a/testing/unittestsupport/applib/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>isis-testing-unittestsupport-applib</artifactId>
- <name>Apache Isis Testing - Unit Test Support (applib)</name>
+ <name>Apache Isis Tst - Unit Test Support (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.unittestsupport.applib</jar-plugin.automaticModuleName>
diff --git a/testing/unittestsupport/pom.xml b/testing/unittestsupport/pom.xml
index 2bf6209..e08ed79 100644
--- a/testing/unittestsupport/pom.xml
+++ b/testing/unittestsupport/pom.xml
@@ -10,7 +10,7 @@
<artifactId>isis-testing-unittestsupport</artifactId>
- <name>Apache Isis Testing - Unit Test Support (parent)</name>
+ <name>Apache Isis Tst - Unit Test Support (parent)</name>
<description>
A module providing test utilities for unit testing of domain modules
</description>
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
index e4eb732..6cbdc6f 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
@@ -21,21 +21,8 @@ package org.apache.isis.valuetypes.sse.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.sse.markup.ListeningMarkupPanelFactoriesForWicket;
-import org.apache.isis.extensions.sse.services.SseServiceDefault;
-import org.apache.isis.extensions.sse.webmodule.WebModuleServerSentEvents;
@Configuration
-@Import({
- // @Component's
- SseMetaModelPlugin.class,
- ListeningMarkupPanelFactoriesForWicket.Parented.class,
- ListeningMarkupPanelFactoriesForWicket.Standalone.class,
-
- // @Service's
- SseServiceDefault.class,
- WebModuleServerSentEvents.class
-})
public class IsisModuleValSseApplib {
}
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
index 8695c16..f7f6cf4 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
@@ -22,6 +22,7 @@ package org.apache.isis.valuetypes.sse.ui.markup;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.value.LocalResourcePath;
+import org.apache.isis.valuetypes.sse.applib.value.ListeningMarkup;
import org.apache.isis.valuetypes.sse.metamodel.facets.SseObserveFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponentFactory;