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 2022/04/14 15:22:35 UTC
[isis] branch ISIS-3001 updated: ISIS-3001: fixes some compile issues
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3001
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3001 by this push:
new 6fb960f773 ISIS-3001: fixes some compile issues
6fb960f773 is described below
commit 6fb960f773d525e49ee92b05354d3b844ccee662
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Apr 14 16:14:03 2022 +0100
ISIS-3001: fixes some compile issues
---
.../isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java | 2 +-
.../demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java | 4 ++--
.../extensions/excel/integtests/ExcelModuleIntegTestAbstract.java | 6 +-----
.../java/org/apache/isis/extensions/excel/testing/ExcelFixture.java | 4 ++--
.../org/apache/isis/extensions/excel/testing/ExcelFixture2.java | 4 ++--
.../isis/extensions/excel/testing/IsisModuleExtExcelTesting.java | 6 +++---
6 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java
index bcb9750699..60e9a82d09 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index 660b6fe2f8..ecf89c65cc 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -53,8 +53,8 @@ import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
-import static org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCategorised;
-import static org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCompleted;
+import static org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCategorised;
+import static org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem.Predicates.thoseCompleted;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
index c26e7d41be..ec93666698 100644
--- a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -29,9 +29,9 @@ import org.springframework.transaction.annotation.Transactional;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
+import org.apache.isis.extensions.excel.fixtures.IsisModuleExtExcelFixtures;
import org.apache.isis.persistence.jdo.applib.IsisModulePersistenceJdoApplib;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.extensions.excel.fixtures.IsisModuleSubdomainsExcelFixtures;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
@@ -54,10 +54,6 @@ public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAb
IsisModulePersistenceJdoApplib.class,
IsisModuleTestingFixturesApplib.class,
- /*
- new ExcelFixturesModule(),
- FakeDataModule.class
- */
IsisModuleExtExcelFixtures.class
})
public static class AppManifest {
diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
index bc2d230ddb..970642bc0e 100644
--- a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
@@ -40,7 +40,7 @@ import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
import org.apache.isis.extensions.excel.applib.dom.ExcelService;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResultList;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
@@ -61,7 +61,7 @@ import lombok.val;
)
public class ExcelFixture extends FixtureScript {
- public final static String LOGICAL_TYPE_NAME = IsisModuleSubdomainsExcelApplib.NAMESPACE + ".ExcelFixture";
+ public final static String LOGICAL_TYPE_NAME = IsisModuleExtExcelApplib.NAMESPACE + ".ExcelFixture";
@Inject SpecificationLoader specLoader;
@Inject ExcelService excelService;
diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
index d785a5b9da..e75b9c2347 100644
--- a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
import org.apache.isis.extensions.excel.applib.dom.ExcelService;
import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
@@ -50,7 +50,7 @@ import lombok.val;
)
public class ExcelFixture2 extends FixtureScript {
- public final static String LOGICAL_TYPE_NAME = IsisModuleSubdomainsExcelApplib.NAMESPACE + ".ExcelFixture2";
+ public final static String LOGICAL_TYPE_NAME = IsisModuleExtExcelApplib.NAMESPACE + ".ExcelFixture2";
/**
* Input, optional: defines the name of the resource.
diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java
index ca3e50c13e..a15c5994be 100644
--- a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java
@@ -22,13 +22,13 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.excel.applib.IsisModuleSubdomainsExcelApplib;
+import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
/**
* @since 2.0 {@index}
*/
@Configuration
-@Import({IsisModuleSubdomainsExcelApplib.class})
+@Import({IsisModuleExtExcelApplib.class})
@ComponentScan
-public class IsisModuleSubdomainsExcelTesting {
+public class IsisModuleExtExcelTesting {
}