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 2019/11/27 20:29:46 UTC
[isis] 11/16: ISIS-2186: makes simpleapp's configuration more
consistent.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2186
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4d2b9697343f5750e05250ddf65231ba7b9a5db7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 27 12:25:43 2019 +0000
ISIS-2186: makes simpleapp's configuration more consistent.
---
.../application/fixture/scenarios/DomainAppDemo.java | 1 -
.../src/main/java/domainapp/conf/SimpleAppManifest.java | 7 +------
.../application/integtests/SpringIntegrationTest.java | 4 ++--
...ationForTesting.java => SimpleAppManifestForTesting.java} | 12 ++++--------
4 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/starters/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java b/starters/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
index 2a675a2..ecb0104 100644
--- a/starters/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/starters/simpleapp/application/src/main/java/domainapp/application/fixture/scenarios/DomainAppDemo.java
@@ -35,7 +35,6 @@ public class DomainAppDemo extends FixtureScript {
@Override
protected void execute(final ExecutionContext ec) {
- // TODO: use Module support instead...
ec.executeChild(this, new TeardownFixtureAbstract2() {
@Override
protected void execute(final ExecutionContext executionContext) {
diff --git a/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java b/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java
index 3d32c85..34dd4c9 100644
--- a/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java
+++ b/starters/simpleapp/application/src/main/java/domainapp/conf/SimpleAppManifest.java
@@ -40,7 +40,7 @@ import domainapp.application.fixture.scenarios.DomainAppDemo;
@Configuration
@PropertySources({
@PropertySource(IsisPresets.H2InMemory),
- //@PropertySource(IsisPresets.NoTranslations),
+ @PropertySource(IsisPresets.NoTranslations),
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
@@ -55,11 +55,6 @@ import domainapp.application.fixture.scenarios.DomainAppDemo;
DomainAppDemo.class // register this fixture
})
-//@ComponentScan(
-// basePackageClasses= {
-// DomainAppApplicationModule.class,
-// SimpleModule.class
-// })
public class SimpleAppManifest {
diff --git a/starters/simpleapp/application/src/test/java/domainapp/application/integtests/SpringIntegrationTest.java b/starters/simpleapp/application/src/test/java/domainapp/application/integtests/SpringIntegrationTest.java
index c69e6b8..8aad1bf 100644
--- a/starters/simpleapp/application/src/test/java/domainapp/application/integtests/SpringIntegrationTest.java
+++ b/starters/simpleapp/application/src/test/java/domainapp/application/integtests/SpringIntegrationTest.java
@@ -25,10 +25,10 @@ import org.springframework.test.context.ContextConfiguration;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import domainapp.conf.SimpleAppConfigurationForTesting;
+import domainapp.conf.SimpleAppManifestForTesting;
@SpringBootTest(
- classes = SimpleAppConfigurationForTesting.class,
+ classes = SimpleAppManifestForTesting.class,
properties = {
"logging.config=log4j2-test.xml",
})
diff --git a/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java b/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java
similarity index 89%
rename from starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java
rename to starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java
index 7302a16..fc8a742 100644
--- a/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppConfigurationForTesting.java
+++ b/starters/simpleapp/application/src/test/java/domainapp/conf/SimpleAppManifestForTesting.java
@@ -44,15 +44,11 @@ import domainapp.modules.simple.SimpleModule;
})
@Import({
IsisBoot.class,
- IsisBootSecurityBypass.class,
IsisBootDataNucleus.class,
- IsisExtFixturesModule.class
+ IsisBootSecurityBypass.class,
+ IsisExtFixturesModule.class,
+ DomainAppApplicationModule.class
})
-@ComponentScan(
- basePackageClasses= {
- DomainAppApplicationModule.class,
- SimpleModule.class
- })
-public class SimpleAppConfigurationForTesting {
+public class SimpleAppManifestForTesting {
}