This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 621f072bef ISIS-3275: more provisioning fixes
621f072bef is described below
commit 621f072befc76f27b33a20fbeab978eac56257f0
Author: Andi Huber <[email protected]>
AuthorDate: Mon Nov 28 10:07:41 2022 +0100
ISIS-3275: more provisioning fixes
---
.../demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java | 5 +++++
.../jdo/integtests/CmdExecAuditSessLog_IntegTest.java | 8 +++++++-
.../jpa/integtests/CmdExecAuditSessLog_IntegTest.java | 8 +++++++-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
index e1027d6f01..11135a85bc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleCommon.java
@@ -29,6 +29,8 @@ import org.apache.causeway.applib.CausewayModuleApplibMixins;
import org.apache.causeway.core.config.presets.CausewayPresets;
import
org.apache.causeway.core.runtimeservices.CausewayModuleCoreRuntimeServices;
import
org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@Configuration
@Import({
@@ -36,6 +38,9 @@ import
org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixtures
CausewayModuleApplibMixins.class,
CausewayModuleCoreRuntimeServices.class,
CausewayModuleTestingFixturesApplib.class,
+ // Auto Configuration
+ FixtureScriptsSpecificationProviderAutoConfiguration.class,
+ ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.NoTranslations),
diff --git
a/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
b/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
index c043b06047..cea09321bd 100644
---
a/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
+++
b/regressiontests/stable-cmdexecauditsess/persistence-jdo/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jdo/integtests/CmdExecAuditSessLog_IntegTest.java
@@ -39,6 +39,8 @@ import
org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.mo
import
org.apache.causeway.regressiontests.cmdexecauditsess.jdo.integtests.model.Counter;
import
org.apache.causeway.regressiontests.cmdexecauditsess.jdo.integtests.model.CounterRepository;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = CmdExecAuditSessLog_IntegTest.AppManifest.class
@@ -57,6 +59,9 @@ public class CmdExecAuditSessLog_IntegTest extends
CmdExecAuditSessLog_IntegTest
CausewayModuleExtExecutionOutboxPersistenceJdo.class,
CausewayModuleExtAuditTrailPersistenceJdo.class,
CausewayModuleExtSessionLogPersistenceJdo.class,
+ // Auto Configuration
+ FixtureScriptsSpecificationProviderAutoConfiguration.class,
+ ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
@@ -66,7 +71,8 @@ public class CmdExecAuditSessLog_IntegTest extends
CmdExecAuditSessLog_IntegTest
}
- protected
org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.model.Counter
newCounter(String name) {
+ @Override
+ protected
org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.model.Counter
newCounter(final String name) {
return Counter.builder().name(name).build();
}
diff --git
a/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
b/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
index 1a9184ff49..d71eaba46a 100644
---
a/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
+++
b/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/java/org/apache/causeway/regressiontests/cmdexecauditsess/jpa/integtests/CmdExecAuditSessLog_IntegTest.java
@@ -39,6 +39,8 @@ import
org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.Cm
import
org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.model.CmdExecAuditSessTestDomainModel;
import
org.apache.causeway.regressiontests.cmdexecauditsess.jpa.integtests.model.Counter;
import org.apache.causeway.security.bypass.CausewayModuleSecurityBypass;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.ExecutionParametersServiceAutoConfiguration;
+import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScriptsSpecificationProviderAutoConfiguration;
@SpringBootTest(
classes = CmdExecAuditSessLog_IntegTest.AppManifest.class
@@ -57,6 +59,9 @@ public class CmdExecAuditSessLog_IntegTest extends
CmdExecAuditSessLog_IntegTest
CausewayModuleExtExecutionOutboxPersistenceJpa.class,
CausewayModuleExtAuditTrailPersistenceJpa.class,
CausewayModuleExtSessionLogPersistenceJpa.class,
+ // Auto Configuration
+ FixtureScriptsSpecificationProviderAutoConfiguration.class,
+ ExecutionParametersServiceAutoConfiguration.class,
})
@PropertySources({
@PropertySource(CausewayPresets.UseLog4j2Test)
@@ -67,7 +72,8 @@ public class CmdExecAuditSessLog_IntegTest extends
CmdExecAuditSessLog_IntegTest
}
- protected
org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.model.Counter
newCounter(String name) {
+ @Override
+ protected
org.apache.causeway.regressiontests.cmdexecauditsess.generic.integtest.model.Counter
newCounter(final String name) {
return Counter.builder().name(name).build();
}
